From c055124f1e44a072327d63b023648422ab2953c2 Mon Sep 17 00:00:00 2001 From: Ari Pollak Date: Wed, 11 Aug 2010 01:16:40 -0400 Subject: [PATCH] Imported Upstream version 2.2.12 --- ChangeLog | 144 + Makefile.in | 17 +- NEWS | 21 + aclocal.m4 | 9 +- app/Makefile.in | 17 +- app/actions/Makefile.in | 17 +- app/base/Makefile.in | 17 +- app/composite/Makefile.in | 17 +- app/composite/gimp-composite-generic.c | 31 +- app/composite/gimp-composite-mmx-installer.c | 2 +- app/composite/gimp-composite-mmx-test.c | 23 +- app/composite/gimp-composite-mmx.c | 234 - app/composite/gimp-composite-mmx.h | 1 - app/composite/gimp-composite-sse-installer.c | 1 - app/composite/gimp-composite-sse-test.c | 11 - app/composite/gimp-composite-sse.c | 233 - app/composite/gimp-composite-sse.h | 1 - app/config/Makefile.in | 17 +- app/core/Makefile.in | 17 +- app/dialogs/Makefile.in | 17 +- app/dialogs/file-save-dialog.c | 14 +- app/dialogs/user-install-dialog.c | 2 - app/display/Makefile.in | 17 +- app/file/Makefile.in | 17 +- app/gui/Makefile.in | 17 +- app/menus/Makefile.in | 17 +- app/paint-funcs/Makefile.in | 17 +- app/paint/Makefile.in | 17 +- app/pdb/Makefile.in | 17 +- app/pdb/drawable_transform_cmds.c | 84 + app/pdb/transform_tools_cmds.c | 24 + app/plug-in/Makefile.in | 17 +- app/text/Makefile.in | 17 +- app/tools/Makefile.in | 17 +- app/tools/tool_manager.c | 2 +- app/vectors/Makefile.in | 17 +- app/widgets/Makefile.in | 17 +- app/widgets/gimpdock.c | 5 + app/widgets/gimpfiledialog.c | 29 +- app/widgets/gimpsessioninfo.c | 71 +- app/xcf/Makefile.in | 17 +- app/xcf/xcf-load.c | 14 +- app/xcf/xcf-save.c | 4 - config.h.in | 2 +- configure | 15849 +++++++++------- configure.in | 4 +- cursors/Makefile.in | 17 +- data/Makefile.in | 17 +- data/brushes/Makefile.in | 17 +- data/environ/Makefile.in | 17 +- data/gradients/Makefile.in | 17 +- data/images/Makefile.in | 17 +- data/misc/Makefile.in | 17 +- data/palettes/Makefile.in | 17 +- data/patterns/Makefile.in | 17 +- devel-docs/Makefile.in | 17 +- devel-docs/app/Makefile | 79 +- devel-docs/app/Makefile.in | 29 +- devel-docs/app/version | 2 +- devel-docs/libgimp/Makefile.in | 29 +- devel-docs/libgimpbase/Makefile.in | 29 +- devel-docs/libgimpcolor/Makefile.in | 29 +- devel-docs/libgimpmath/Makefile.in | 29 +- devel-docs/libgimpmodule/Makefile.in | 29 +- devel-docs/libgimpthumb/Makefile.in | 29 +- devel-docs/libgimpwidgets/Makefile.in | 29 +- .../libgimpwidgets/html/GimpButton.html | 113 +- .../html/GimpCellRendererColor.html | 75 +- .../html/GimpCellRendererToggle.html | 115 +- .../libgimpwidgets/html/GimpChainButton.html | 91 +- .../libgimpwidgets/html/GimpColorArea.html | 105 +- .../libgimpwidgets/html/GimpColorButton.html | 109 +- .../libgimpwidgets/html/GimpColorDisplay.html | 104 +- .../html/GimpColorDisplayStack.html | 122 +- .../html/GimpColorHexEntry.html | 87 +- .../html/GimpColorNotebook.html | 89 +- .../libgimpwidgets/html/GimpColorScale.html | 75 +- .../libgimpwidgets/html/GimpColorScales.html | 59 +- .../libgimpwidgets/html/GimpColorSelect.html | 59 +- .../html/GimpColorSelection.html | 113 +- .../html/GimpColorSelector.html | 163 +- .../libgimpwidgets/html/GimpController.html | 104 +- .../libgimpwidgets/html/GimpDialog.html | 183 +- .../libgimpwidgets/html/GimpFileEntry.html | 103 +- devel-docs/libgimpwidgets/html/GimpFrame.html | 93 +- .../libgimpwidgets/html/GimpIntComboBox.html | 121 +- .../libgimpwidgets/html/GimpIntStore.html | 84 +- .../libgimpwidgets/html/GimpMemsizeEntry.html | 99 +- .../libgimpwidgets/html/GimpOffsetArea.html | 105 +- .../libgimpwidgets/html/GimpPathEditor.html | 119 +- .../libgimpwidgets/html/GimpPickButton.html | 85 +- .../libgimpwidgets/html/GimpPixmap.html | 89 +- .../libgimpwidgets/html/GimpPreview.html | 139 +- .../libgimpwidgets/html/GimpPreviewArea.html | 113 +- .../libgimpwidgets/html/GimpSizeEntry.html | 239 +- .../libgimpwidgets/html/GimpUnitMenu.html | 107 +- devel-docs/libgimpwidgets/html/index.html | 17 +- devel-docs/libgimpwidgets/html/index.sgml | 7 + .../html/libgimpwidgets-GimpHelpUI.html | 106 +- .../html/libgimpwidgets-GimpQueryBox.html | 226 +- .../libgimpwidgets-GimpScrolledPreview.html | 28 +- .../html/libgimpwidgets-GimpStock.html | 1282 +- .../html/libgimpwidgets-GimpStock.html~ | 2145 --- .../html/libgimpwidgets-GimpWidgets.html | 680 +- .../html/libgimpwidgets-cell-renderers.html | 10 +- .../html/libgimpwidgets-colordisplay.html | 10 +- .../html/libgimpwidgets-colorselector.html | 10 +- .../html/libgimpwidgets-controller.html | 10 +- .../html/libgimpwidgets-deprecated.html | 10 +- .../html/libgimpwidgets-gimpoldwidgets.html | 203 +- .../html/libgimpwidgets-hierarchy.html | 154 +- .../html/libgimpwidgets-utils.html | 10 +- .../html/libgimpwidgets-widgets.html | 10 +- .../html/libgimpwidgets.devhelp | 1 + .../html/libgimpwidgets.devhelp2 | 532 + devel-docs/libgimpwidgets/html/style.css | 28 +- devel-docs/libgimpwidgets/xml/gimpbutton.xml | 66 +- .../xml/gimpcellrenderercolor.xml | 46 +- .../xml/gimpcellrenderertoggle.xml | 72 +- .../libgimpwidgets/xml/gimpchainbutton.xml | 66 +- .../libgimpwidgets/xml/gimpcolorarea.xml | 66 +- .../libgimpwidgets/xml/gimpcolorbutton.xml | 72 +- .../libgimpwidgets/xml/gimpcolordisplay.xml | 67 +- .../xml/gimpcolordisplaystack.xml | 91 +- .../libgimpwidgets/xml/gimpcolorhexentry.xml | 56 +- .../libgimpwidgets/xml/gimpcolornotebook.xml | 56 +- .../libgimpwidgets/xml/gimpcolorscale.xml | 44 +- .../libgimpwidgets/xml/gimpcolorscales.xml | 42 +- .../libgimpwidgets/xml/gimpcolorselect.xml | 42 +- .../libgimpwidgets/xml/gimpcolorselection.xml | 72 +- .../libgimpwidgets/xml/gimpcolorselector.xml | 114 +- .../libgimpwidgets/xml/gimpcontroller.xml | 73 +- devel-docs/libgimpwidgets/xml/gimpdialog.xml | 68 +- .../libgimpwidgets/xml/gimpfileentry.xml | 66 +- devel-docs/libgimpwidgets/xml/gimpframe.xml | 56 +- devel-docs/libgimpwidgets/xml/gimphelpui.xml | 35 +- .../libgimpwidgets/xml/gimpintcombobox.xml | 64 +- .../libgimpwidgets/xml/gimpintstore.xml | 37 +- .../libgimpwidgets/xml/gimpmemsizeentry.xml | 60 +- .../libgimpwidgets/xml/gimpoffsetarea.xml | 70 +- .../libgimpwidgets/xml/gimpoldwidgets.xml | 49 +- .../libgimpwidgets/xml/gimppatheditor.xml | 74 +- .../libgimpwidgets/xml/gimppickbutton.xml | 60 +- devel-docs/libgimpwidgets/xml/gimppixmap.xml | 42 +- devel-docs/libgimpwidgets/xml/gimppreview.xml | 100 +- .../libgimpwidgets/xml/gimppreviewarea.xml | 70 +- .../libgimpwidgets/xml/gimpquerybox.xml | 41 +- .../xml/gimpscrolledpreview.xml | 19 +- .../libgimpwidgets/xml/gimpsizeentry.xml | 118 +- devel-docs/libgimpwidgets/xml/gimpstock.xml | 375 +- .../libgimpwidgets/xml/gimpunitmenu.xml | 72 +- devel-docs/libgimpwidgets/xml/gimpwidgets.xml | 125 +- docs/Makefile.in | 17 +- etc/Makefile.in | 17 +- gimp.pc.in | 1 + gtk-doc.make | 12 +- intltool-extract.in | 2 +- intltool-merge.in | 4 +- intltool-update.in | 48 +- libgimp/Makefile.in | 17 +- libgimpbase/Makefile.in | 17 +- libgimpbase/gimpversion.h | 4 +- libgimpcolor/Makefile.in | 17 +- libgimpmath/Makefile.in | 17 +- libgimpmodule/Makefile.in | 17 +- libgimpthumb/Makefile.in | 17 +- libgimpwidgets/Makefile.in | 17 +- libgimpwidgets/gimpwidgets.c | 4 +- m4macros/Makefile.in | 17 +- menus/Makefile.in | 17 +- modules/Makefile.in | 17 +- plug-ins/FractalExplorer/Makefile.in | 17 +- plug-ins/FractalExplorer/examples/Makefile.in | 17 +- plug-ins/Lighting/Makefile.in | 17 +- plug-ins/Lighting/images/Makefile.in | 17 +- plug-ins/Makefile.in | 17 +- plug-ins/MapObject/Makefile.in | 17 +- plug-ins/bmp/Makefile.in | 17 +- plug-ins/common/Makefile.in | 17 +- plug-ins/common/animationplay.c | 28 +- plug-ins/common/dicom.c | 56 +- plug-ins/common/png.c | 33 +- plug-ins/dbbrowser/Makefile.in | 17 +- plug-ins/faxg3/Makefile.in | 17 +- plug-ins/fits/Makefile.in | 17 +- plug-ins/flame/Makefile.in | 17 +- plug-ins/gfig/Makefile.in | 17 +- plug-ins/gfig/gfig-examples/Makefile.in | 17 +- plug-ins/gfig/images/Makefile.in | 17 +- plug-ins/gflare/Makefile.in | 17 +- plug-ins/gflare/gflares/Makefile.in | 17 +- plug-ins/gfli/Makefile.in | 17 +- plug-ins/gimpressionist/Brushes/Makefile.in | 17 +- plug-ins/gimpressionist/Makefile.in | 17 +- plug-ins/gimpressionist/Paper/Makefile.in | 17 +- plug-ins/gimpressionist/Presets/Makefile.in | 17 +- plug-ins/help/Makefile.in | 17 +- plug-ins/helpbrowser/Makefile.in | 17 +- plug-ins/ifscompose/Makefile.in | 17 +- plug-ins/imagemap/Makefile.in | 17 +- plug-ins/imagemap/images/Makefile.in | 17 +- plug-ins/maze/Makefile.in | 17 +- plug-ins/pagecurl/Makefile.in | 17 +- plug-ins/print/Makefile.in | 17 +- plug-ins/pygimp/Makefile.in | 17 +- plug-ins/pygimp/doc/Makefile.in | 17 +- plug-ins/pygimp/plug-ins/Makefile.in | 17 +- plug-ins/rcm/Makefile.in | 17 +- plug-ins/rcm/images/Makefile.in | 17 +- plug-ins/script-fu/Makefile.in | 17 +- plug-ins/script-fu/scripts/Makefile.in | 17 +- plug-ins/script-fu/scripts/images/Makefile.in | 17 +- plug-ins/script-fu/siod/Makefile.in | 17 +- plug-ins/sel2path/Makefile.in | 17 +- plug-ins/sgi/Makefile.in | 17 +- plug-ins/twain/Makefile.in | 17 +- plug-ins/winicon/Makefile.in | 17 +- plug-ins/winsnap/Makefile.in | 17 +- plug-ins/xjt/Makefile.in | 17 +- po-libgimp/ChangeLog | 4 + po-libgimp/eu.gmo | Bin 9453 -> 11590 bytes po-libgimp/eu.po | 134 +- po-plug-ins/ChangeLog | 24 + po-plug-ins/cs.gmo | Bin 173219 -> 173448 bytes po-plug-ins/cs.po | 444 +- po-plug-ins/de.gmo | Bin 173734 -> 173707 bytes po-plug-ins/de.po | 4 +- po-plug-ins/es.gmo | Bin 178238 -> 178394 bytes po-plug-ins/es.po | 362 +- po-plug-ins/eu.gmo | Bin 125297 -> 174470 bytes po-plug-ins/eu.po | 3618 +--- po-script-fu/ChangeLog | 20 +- po-script-fu/cs.gmo | Bin 29004 -> 29940 bytes po-script-fu/cs.po | 74 +- po-script-fu/es.gmo | Bin 30679 -> 30681 bytes po-script-fu/es.po | 39 +- po-script-fu/eu.gmo | Bin 8116 -> 30419 bytes po-script-fu/eu.po | 1205 +- po/ChangeLog | 12 + po/Makefile.in.in | 121 +- po/es.po | 813 +- po/eu.po | 10255 ++++------ regexrepl/Makefile.in | 17 +- themes/Default/Makefile.in | 17 +- themes/Default/images/Makefile.in | 17 +- themes/Default/images/preferences/Makefile.in | 17 +- themes/Makefile.in | 17 +- themes/Small/Makefile.in | 17 +- tips/Makefile.in | 17 +- tools/Makefile.in | 17 +- tools/pdbgen/Makefile.in | 17 +- tools/pdbgen/pdb/drawable_transform.pdb | 12 + tools/pdbgen/pdb/transform_tools.pdb | 24 + 253 files changed, 21361 insertions(+), 26160 deletions(-) delete mode 100644 devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html~ create mode 100644 devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 diff --git a/ChangeLog b/ChangeLog index 115e133ec9..9e30d6cecd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,147 @@ +2006-07-06 Sven Neumann + + * Made 2.2.12 release. + +2006-07-06 Sven Neumann + + Merged from HEAD branch: + + * app/xcf/xcf-save.c (xcf_save_image_props): removed redundant + call to xcf_save_prop() for PROP_PARASITES. Spotted by Henning + Makholm (bug #346754). + +2006-07-06 Sven Neumann + + * app/xcf/xcf-load.c (xcf_load_vector): applied a patch from + Henning Makholm that introduces a sanity check on the number of + axes (bug #346742). + +2006-06-22 Michael Natterer + + Merge from HEAD: + + * app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): don't + try to set "." as current_folder_uri. + +2006-06-22 Sven Neumann + + * app/composite/gimp-composite-generic.c + * app/composite/gimp-composite-mmx-installer.c + * app/composite/gimp-composite-mmx-test.c + * app/composite/gimp-composite-mmx.[ch] + * app/composite/gimp-composite-sse-installer.c + * app/composite/gimp-composite-sse-test.c + * app/composite/gimp-composite-sse.[ch]: backported changes to burn + compositing function from the HEAD branch because the MMX/SSE code + broke compilation on GCC 4.1 (bug #345473). + +2006-06-17 Michael Natterer + + Merge from HEAD: + + * app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): + always call gtk_file_chooser_set_current_folder_uri() and + gtk_file_chooser_set_current_name() instead of + gtk_file_chooser_set_uri(), since the latter only works if the + file exists and its return value is bogus. Fixes bug #343284. + +2006-06-04 Kevin Cozens + + Merge from HEAD: + + * plug-ins/common/png.c: Fixed file_png_get_defaults; wrong # of + return values. Fixed file_png_set_defaults; wrong set param count, + and off by one error in the parameter indexes. Thanks to Seth for + helping track these down. + +2006-05-29 Michael Natterer + + Merge from HEAD: + + * app/widgets/gimpdock.c (gimp_dock_key_press_event): make sure + text widgets get all key events first. Fixes bug #301006. + +2006-05-28 Manish Singh + + * gimp.pc.in: define datarootdir, so we work with newer autoconf. + +2006-05-26 Bill Skaggs + + Merge from HEAD: + + * plug-ins/common/dicom.c: applied patch from Dov Grobgeld with + several fixes for dicom loading, fixes bug #163256. + +2006-05-23 Michael Natterer + + Merge from HEAD: + + * tools/pdbgen/pdb/drawable_transform.pdb + * tools/pdbgen/pdb/transform_tools.pdb: add the drawable's offset + to the x and y returned by gimp_drawable_mask_intersect() because + all transform functions expect image coordinates. + Fixes bug #342548. + + * app/pdb/drawable_transform_cmds.c + * app/pdb/transform_tools_cmds.c: regenerated. + +2006-5-22 Bill Skaggs + + Merge from Head: + + * libgimpwidgets/gimpwidgets.c (gimp_coordinates_callback): use + ROUND() to prevent incorrect chainbutton logic. Fixes bug #336259. + +2006-05-21 Michael Natterer + + Merge from HEAD: + + * app/tools/tool_manager.c (tool_manager_image_clean_dirty): don't + try to reset the active tool by destroying and re-creating it + because this doesn't work while gimp->busy is TRUE. Call + tool_manager_control_active(HALT) instead, which is the right way + to do it anyway. Fixes bug #330083. + +2006-5-19 Bill Skaggs + + Merge from Head: + + * app/dialogs/file-save-dialog.c: make sure dialog has not been + destroyed when setting sensitive; fixes bug #322978. + +2006-04-23 Manish Singh + + * plug-ins/common/png.c: don't use long deprecated libpng API. + Fixes bug #339402. + +2006-04-20 Tor Lillqvist + + Merge from HEAD: + + * app/widgets/gimpsessioninfo.c (get_appropriate_monitor): New + helper function. Same functionality as + gdk_screen_get_monitor_at_window(), except that it takes a window + geometry as parameter and not the window itself. + (gimp_session_info_set_geometry): Make sure the window is + completely inside a monitor. (#339099, #324254) + +2006-04-19 Tor Lillqvist + + * app/dialogs/user-install-dialog.c (user_install_dialog_run): + Remove unnecessary call to gtk_widget_realize() which exposed + obscure misbehaviour in gdk/win32. Merge from HEAD. (#324254) + +2006-04-19 Sven Neumann + + Merged from HEAD branch: + + * plug-ins/common/animationplay.c: fixed bug in range calculation + that caused display errors in the last row (bug #338378). + +2006-04-13 Sven Neumann + + * configure.in: bumped version to 2.2.12, interface_age 12. + 2006-04-13 Sven Neumann * Made 2.2.11 release. diff --git a/Makefile.in b/Makefile.in index c5ad021455..0483a344b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,6 +93,7 @@ distcleancheck_listfiles = find . -type f -print AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -201,6 +202,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -362,6 +364,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -369,17 +372,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -396,6 +391,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -406,6 +404,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -417,10 +416,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/NEWS b/NEWS index 9f3a9ac338..f502740092 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,27 @@ here. New features are being added in the HEAD branch that will be released as GIMP version 2.4. +Bugs fixed in GIMP 2.2.12 +========================= + +- fixed display problem in the Animation Playback plug-in (bug #338378) +- fixed misbehaviour of the user installation dialog (bug #324254) +- make sure that session-managed windows are mapped completely inside a + monitor (bug #339099, bug #324254) +- don't use long deprecated libpng API (bug #339402) +- fixed possible segfault when closing image while saving it (bug #322978) +- halt tools when the image mode changes (bug #330083) +- fixed problem in Scale and Resize widgets (bug #336259) +- fixed wrong offset in transform PDB functions (bug #342548) +- fixed bugs in the Dicom load plug-in (bug #163256) +- make sure text widgets get all key events first (bug #301006) +- fixed problems with default values in the PNG save plug-in (bug #343284) +- fixed Save As dialog not displaying the filename (bug #343284) +- fixed compilation problem with gcc 4.1 (bug #345473) +- plugged a possible buffer overrun in the XCF parser (bug #346742) +- don't save image parasites twice in XCF files (bug #346754) + + Bugs fixed in GIMP 2.2.11 ========================= diff --git a/aclocal.m4 b/aclocal.m4 index 9c2ec6c2f5..0dda38ffbd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -825,7 +825,7 @@ main () dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 2 IT_PROG_INTLTOOL +# serial 35 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl @@ -840,9 +840,9 @@ esac if test -n "$1"; then AC_MSG_CHECKING(for intltool >= $1) - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'` + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` + [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -913,6 +913,9 @@ AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + IT_PO_SUBDIR([po]) dnl The following is very similar to diff --git a/app/Makefile.in b/app/Makefile.in index cfe2a24989..ed673f8bba 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -152,6 +152,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -260,6 +261,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -421,6 +423,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -428,17 +431,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -455,6 +450,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -465,6 +463,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -476,10 +475,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/actions/Makefile.in b/app/actions/Makefile.in index dab7bf2bf2..e47fac1a06 100644 --- a/app/actions/Makefile.in +++ b/app/actions/Makefile.in @@ -103,6 +103,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -211,6 +212,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -372,6 +374,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -379,17 +382,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -406,6 +401,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -416,6 +414,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -427,10 +426,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/base/Makefile.in b/app/base/Makefile.in index 4d847fd5cd..d29b4d3807 100644 --- a/app/base/Makefile.in +++ b/app/base/Makefile.in @@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -388,6 +383,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -398,6 +396,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -409,10 +408,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/composite/Makefile.in b/app/composite/Makefile.in index bd44b92e17..8f12f1c75a 100644 --- a/app/composite/Makefile.in +++ b/app/composite/Makefile.in @@ -170,6 +170,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -278,6 +279,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -439,6 +441,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -446,17 +449,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -473,6 +468,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -483,6 +481,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -494,10 +493,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/composite/gimp-composite-generic.c b/app/composite/gimp-composite-generic.c index 6a47cf07e5..a4cdd871d0 100644 --- a/app/composite/gimp-composite-generic.c +++ b/app/composite/gimp-composite-generic.c @@ -69,6 +69,7 @@ static guchar add_lut[511]; static gint32 random_table[RANDOM_TABLE_SIZE]; +static guchar burn_lut[256][256]; /* * @@ -873,18 +874,10 @@ gimp_composite_burn_any_any_any_generic (GimpCompositeContext * ctx) const guint alpha = (has_alpha1 || has_alpha2) ? MAX(bytes1, bytes2) - 1 : bytes1; guint b; - /* FIXME: Is the burn effect supposed to be dependant on the sign of this - * temporary variable? */ - gint tmp; - while (length--) { for (b = 0; b < alpha; b++) - { - tmp = (255 - src1[b]) << 8; - tmp /= src2[b] + 1; - dest[b] = (guchar) CLAMP(255 - tmp, 0, 255); - } + dest[b] = burn_lut[src1[b]][src2[b]]; if (has_alpha1 && has_alpha2) dest[alpha] = MIN(src1[alpha], src2[alpha]); else if (has_alpha2) @@ -1444,6 +1437,7 @@ gimp_composite_generic_init (void) { GRand *gr; guint i; + gint a, b; #define RANDOM_SEED 314159265 @@ -1455,11 +1449,28 @@ gimp_composite_generic_init (void) g_rand_free (gr); + /* generate a table for burn compositing */ + for (a = 0; a < 256; a++) + for (b = 0; b < 256; b++) + { + /* FIXME: Is the burn effect supposed to be dependant on the sign + * of this temporary variable? + */ + gint tmp; + + tmp = (255 - a) << 8; + tmp /= b + 1; + tmp = (255 - tmp); + + burn_lut[a][b] = CLAMP (tmp, 0, 255); + } + + /* generate a table for saturate add */ for (i = 0; i < 256; i++) add_lut[i] = i; for (i = 256; i <= 510; i++) add_lut[i] = 255; - return (TRUE); + return TRUE; } diff --git a/app/composite/gimp-composite-mmx-installer.c b/app/composite/gimp-composite-mmx-installer.c index 4d972b7cca..3d49e876ee 100644 --- a/app/composite/gimp-composite-mmx-installer.c +++ b/app/composite/gimp-composite-mmx-installer.c @@ -21,11 +21,11 @@ static struct install_table { { GIMP_COMPOSITE_MULTIPLY, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_multiply_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_SCREEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_screen_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_DIFFERENCE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_difference_rgba8_rgba8_rgba8_mmx }, + { GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, gimp_composite_addition_va8_va8_va8_mmx }, { GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_addition_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_mmx }, - { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_mmx }, { GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_mmx }, diff --git a/app/composite/gimp-composite-mmx-test.c b/app/composite/gimp-composite-mmx-test.c index 5d213634b6..6842071b05 100644 --- a/app/composite/gimp-composite-mmx-test.c +++ b/app/composite/gimp-composite-mmx-test.c @@ -64,6 +64,18 @@ gimp_composite_mmx_test (int iterations, int n_pixels) va8M[i].a = i; } + + gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, n_pixels, (unsigned char *) va8A, (unsigned char *) va8B, (unsigned char *) va8B, (unsigned char *) va8D2); + gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, GIMP_PIXELFORMAT_VA8, n_pixels, (unsigned char *) va8A, (unsigned char *) va8B, (unsigned char *) va8B, (unsigned char *) va8D1); + ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); + ft1 = gimp_composite_regression_time_function (iterations, gimp_composite_addition_va8_va8_va8_mmx, &special_ctx); + if (gimp_composite_regression_compare_contexts ("addition", &generic_ctx, &special_ctx)) + { + printf("addition_va8_va8_va8 failed\n"); + return (1); + } + gimp_composite_regression_timer_report ("addition_va8_va8_va8", ft0, ft1); + gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D2); gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_ADDITION, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D1); ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); @@ -75,17 +87,6 @@ gimp_composite_mmx_test (int iterations, int n_pixels) } gimp_composite_regression_timer_report ("addition_rgba8_rgba8_rgba8", ft0, ft1); - gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D2); - gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D1); - ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); - ft1 = gimp_composite_regression_time_function (iterations, gimp_composite_burn_rgba8_rgba8_rgba8_mmx, &special_ctx); - if (gimp_composite_regression_compare_contexts ("burn", &generic_ctx, &special_ctx)) - { - printf("burn_rgba8_rgba8_rgba8 failed\n"); - return (1); - } - gimp_composite_regression_timer_report ("burn_rgba8_rgba8_rgba8", ft0, ft1); - gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D2); gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D1); ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); diff --git a/app/composite/gimp-composite-mmx.c b/app/composite/gimp-composite-mmx.c index 8f69ad6507..d3f7c9c587 100644 --- a/app/composite/gimp-composite-mmx.c +++ b/app/composite/gimp-composite-mmx.c @@ -135,123 +135,6 @@ gimp_composite_addition_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) asm("emms"); } -void -gimp_composite_burn_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) -{ - uint64 *d = (uint64 *) _op->D; - uint64 *a = (uint64 *) _op->A; - uint64 *b = (uint64 *) _op->B; - gulong n_pixels = _op->n_pixels; - - for (; n_pixels >= 2; n_pixels -= 2) - { - asm volatile (" movq %1,%%mm0\n" - "\tmovq %2,%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" /* mm6 = rgba8_alpha_mask_64 */ - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovq %%mm7,%0\n" - : "=m" (*d) - : "m" (*a), "m" (*b), "m" (*rgba8_b255_64), "m" (*rgba8_w1_64), "m" (*rgba8_w255_64), "m" (*rgba8_alpha_mask_64) - : pdivwqX_clobber, "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - d++; - b++; - a++; - } - - if (n_pixels > 0) - { - asm volatile (" movd %1,%%mm0\n" - "\tmovd %2,%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovd %%mm7,%0\n" - : "=m" (*d) - : "m" (*a), "m" (*b), "m" (*rgba8_b255_64), "m" (*rgba8_w1_64), "m" (*rgba8_w255_64), "m" (*rgba8_alpha_mask_64) - : pdivwqX_clobber, "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - } - - asm("emms"); -} - - void gimp_composite_darken_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) { @@ -1375,123 +1258,6 @@ gimp_composite_addition_va8_va8_va8_mmx (GimpCompositeContext *_op) } #if 0 -void -gimp_composite_burn_va8_va8_va8_mmx (GimpCompositeContext *_op) -{ - GimpCompositeContext op = *_op; - - asm("movq %0,%%mm1" - : - : "m" (*va8_alpha_mask) - : "%mm1"); - - for (; op.n_pixels >= 4; op.n_pixels -= 4) - { - asm volatile (" movq %0,%%mm0\n" - "\tmovq %1,%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovq %%mm7,%2\n" - : /* empty */ - : "+m" (*op.A), "+m" (*op.B), "+m" (*op.D), "m" (*va8_b255), "m" (*va8_w1), "m" (*va8_w255_64), "m" (*va8_alpha_mask) - : "%mm1", "%mm2", "%mm3", "%mm4"); - op.A += 8; - op.B += 8; - op.D += 8; - } - - if (op.n_pixels) - { - asm volatile (" movd %0,%%mm0\n" - "\tmovd %1,%%mm1\n" - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovd %%mm7,%2\n" - : /* empty */ - : "m" (*op.A), "m" (*op.B), "m" (*op.D), "m" (*va8_b255), "m" (*va8_w1), "m" (*va8_w255_64), "m" (*va8_alpha_mask) - : "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - } - - asm("emms"); -} - void xxxgimp_composite_coloronly_va8_va8_va8_mmx (GimpCompositeContext *_op) { diff --git a/app/composite/gimp-composite-mmx.h b/app/composite/gimp-composite-mmx.h index c3f8ca65bc..347715eec7 100644 --- a/app/composite/gimp-composite-mmx.h +++ b/app/composite/gimp-composite-mmx.h @@ -33,7 +33,6 @@ extern gboolean gimp_composite_mmx_install (void); * */ extern void gimp_composite_addition_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *ctx); -extern void gimp_composite_burn_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *ctx); extern void gimp_composite_coloronly_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *ctx); extern void gimp_composite_darken_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *ctx); extern void gimp_composite_difference_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *ctx); diff --git a/app/composite/gimp-composite-sse-installer.c b/app/composite/gimp-composite-sse-installer.c index 7f87a7f589..d5fc69fc35 100644 --- a/app/composite/gimp-composite-sse-installer.c +++ b/app/composite/gimp-composite-sse-installer.c @@ -25,7 +25,6 @@ static struct install_table { { GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_sse }, { GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_sse }, { GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_sse }, - { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_sse }, { GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_sse }, { GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_sse }, { GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_sse }, diff --git a/app/composite/gimp-composite-sse-test.c b/app/composite/gimp-composite-sse-test.c index 08d7614c92..d1019e294d 100644 --- a/app/composite/gimp-composite-sse-test.c +++ b/app/composite/gimp-composite-sse-test.c @@ -76,17 +76,6 @@ gimp_composite_sse_test (int iterations, int n_pixels) } gimp_composite_regression_timer_report ("addition_rgba8_rgba8_rgba8", ft0, ft1); - gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D2); - gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D1); - ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); - ft1 = gimp_composite_regression_time_function (iterations, gimp_composite_burn_rgba8_rgba8_rgba8_sse, &special_ctx); - if (gimp_composite_regression_compare_contexts ("burn", &generic_ctx, &special_ctx)) - { - printf("burn_rgba8_rgba8_rgba8 failed\n"); - return (1); - } - gimp_composite_regression_timer_report ("burn_rgba8_rgba8_rgba8", ft0, ft1); - gimp_composite_context_init (&special_ctx, GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D2); gimp_composite_context_init (&generic_ctx, GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, n_pixels, (unsigned char *) rgba8A, (unsigned char *) rgba8B, (unsigned char *) rgba8B, (unsigned char *) rgba8D1); ft0 = gimp_composite_regression_time_function (iterations, gimp_composite_dispatch, &generic_ctx); diff --git a/app/composite/gimp-composite-sse.c b/app/composite/gimp-composite-sse.c index cfb7f49f21..3308b2dfc2 100644 --- a/app/composite/gimp-composite-sse.c +++ b/app/composite/gimp-composite-sse.c @@ -113,124 +113,6 @@ gimp_composite_addition_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op) asm("emms"); } - -void -gimp_composite_burn_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op) -{ - uint64 *d = (uint64 *) _op->D; - uint64 *a = (uint64 *) _op->A; - uint64 *b = (uint64 *) _op->B; - gulong n_pixels = _op->n_pixels; - - for (; n_pixels >= 2; n_pixels -= 2) - { - asm volatile (" movq %1,%%mm0\n" - "\tmovq %2,%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" /* mm6 = rgba8_alpha_mask_64 */ - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovq %%mm7,%0\n" - : "=m" (*d) - : "m" (*a), "m" (*b), "m" (*rgba8_b255_64), "m" (*rgba8_w1_64), "m" (*rgba8_w255_64), "m" (*rgba8_alpha_mask_64) - : pdivwqX_clobber, "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - d++; - b++; - a++; - } - - if (n_pixels > 0) - { - asm volatile (" movd %1,%%mm0\n" - "\tmovd %2,%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovd %%mm7,%0\n" - : "=m" (*d) - : "m" (*a), "m" (*b), "m" (*rgba8_b255_64), "m" (*rgba8_w1_64), "m" (*rgba8_w255_64), "m" (*rgba8_alpha_mask_64) - : pdivwqX_clobber, "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - } - - asm("emms"); -} - - void gimp_composite_darken_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op) { @@ -1331,121 +1213,6 @@ xxxgimp_composite_addition_va8_va8_va8_sse (GimpCompositeContext *_op) asm("popl %edi"); } -void -xxxgimp_composite_burn_va8_va8_va8_sse (GimpCompositeContext *_op) -{ - GimpCompositeContext op = *_op; - - asm("movq %0,%%mm1" - : - : "m" (*va8_alpha_mask) - : "%mm1"); - - for (; op.n_pixels >= 4; op.n_pixels -= 4) - { - asm volatile (" movq (%0),%%mm0; addl $8,%0\n" - "\tmovq (%1),%%mm1; addl $8,%1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovq %%mm7,(%2); addl $8,%2\n" - : "+r" (op.A), "+r" (op.B), "+r" (op.D) - : "m" (*va8_b255), "m" (*va8_w1), "m" (*va8_w255), "m" (*va8_alpha_mask) - : "%mm1", "%mm2", "%mm3", "%mm4"); - } - - if (op.n_pixels) - { - asm volatile (" movd (%0),%%mm0\n" - "\tmovd (%1),%%mm1\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpcklbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpcklbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - - "\t" pdivwqX(mm4,mm5,mm7) "\n" - - "\tmovq %3,%%mm2\n" - "\tpsubb %%mm0,%%mm2\n" /* mm2 = 255 - A */ - "\tpxor %%mm4,%%mm4\n" - "\tpunpckhbw %%mm2,%%mm4\n" /* mm4 = (255- A) * 256 */ - - "\tmovq %%mm1,%%mm3\n" - "\tpxor %%mm5,%%mm5\n" - "\tpunpckhbw %%mm5,%%mm3\n" - "\tmovq %4,%%mm5\n" - "\tpaddusw %%mm3,%%mm5\n" /* mm5 = B + 1 */ - "\t" pdivwqX(mm4,mm5,mm6) "\n" - - "\tmovq %5,%%mm4\n" - "\tmovq %%mm4,%%mm5\n" - "\tpsubusw %%mm6,%%mm4\n" - "\tpsubusw %%mm7,%%mm5\n" - - "\tpackuswb %%mm4,%%mm5\n" - - "\t" pminub(mm0,mm1,mm3) "\n" /* mm1 = min(mm0,mm1) clobber mm3 */ - - "\tmovq %6,%%mm7\n" - "\tpand %%mm7,%%mm1\n" /* mm1 = mm7 & alpha_mask */ - - "\tpandn %%mm5,%%mm7\n" /* mm7 = ~mm7 & mm5 */ - "\tpor %%mm1,%%mm7\n" /* mm7 = mm7 | mm1 */ - - "\tmovd %%mm7,(%2)\n" - : /* empty */ - : "r" (op.A), "r" (op.B), "r" (op.D), "m" (*va8_b255), "m" (*va8_w1), "m" (*va8_w255), "m" (*va8_alpha_mask) - : "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"); - } - - asm("emms"); -} - void xxxgimp_composite_coloronly_va8_va8_va8_sse (GimpCompositeContext *_op) { diff --git a/app/composite/gimp-composite-sse.h b/app/composite/gimp-composite-sse.h index 24ecdb7bee..b65f8fb6a1 100644 --- a/app/composite/gimp-composite-sse.h +++ b/app/composite/gimp-composite-sse.h @@ -26,7 +26,6 @@ extern gboolean gimp_composite_sse_install (void); * */ extern void gimp_composite_addition_rgba8_rgba8_rgba8_sse (GimpCompositeContext *ctx); -extern void gimp_composite_burn_rgba8_rgba8_rgba8_sse (GimpCompositeContext *ctx); extern void gimp_composite_coloronly_rgba8_rgba8_rgba8_sse (GimpCompositeContext *ctx); extern void gimp_composite_darken_rgba8_rgba8_rgba8_sse (GimpCompositeContext *ctx); extern void gimp_composite_difference_rgba8_rgba8_rgba8_sse (GimpCompositeContext *ctx); diff --git a/app/config/Makefile.in b/app/config/Makefile.in index 26071b44aa..047032bef5 100644 --- a/app/config/Makefile.in +++ b/app/config/Makefile.in @@ -86,6 +86,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -194,6 +195,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -355,6 +357,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -362,17 +365,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -389,6 +384,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -399,6 +397,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -410,10 +409,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/core/Makefile.in b/app/core/Makefile.in index 930f8a47e1..d0b4990c27 100644 --- a/app/core/Makefile.in +++ b/app/core/Makefile.in @@ -124,6 +124,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -232,6 +233,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -393,6 +395,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -400,17 +403,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -427,6 +422,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -437,6 +435,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -448,10 +447,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/dialogs/Makefile.in b/app/dialogs/Makefile.in index 59681df9ae..9db01a205b 100644 --- a/app/dialogs/Makefile.in +++ b/app/dialogs/Makefile.in @@ -90,6 +90,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -198,6 +199,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -359,6 +361,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -366,17 +369,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -393,6 +388,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -403,6 +401,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -414,10 +413,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c index 3de873f510..73f436c423 100644 --- a/app/dialogs/file-save-dialog.c +++ b/app/dialogs/file-save-dialog.c @@ -139,7 +139,12 @@ file_save_dialog_response (GtkWidget *save_dialog, } else { + gulong handler_id; + gimp_file_dialog_set_sensitive (dialog, FALSE); + handler_id = g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &dialog); if (file_save_dialog_save_image (save_dialog, dialog->gimage, @@ -148,10 +153,15 @@ file_save_dialog_response (GtkWidget *save_dialog, dialog->file_proc, dialog->save_a_copy)) { - gtk_widget_hide (save_dialog); + if (dialog) + gtk_widget_hide (save_dialog); } - gimp_file_dialog_set_sensitive (dialog, TRUE); + if (dialog) + { + gimp_file_dialog_set_sensitive (dialog, TRUE); + g_signal_handler_disconnect (dialog, handler_id); + } } g_free (filename); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index a02d877b5b..e77bbe7a3c 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -637,8 +637,6 @@ user_install_dialog_run (const gchar *alternate_system_gimprc, gdk_color_parse ("white", &white_color); gdk_color_parse ("dark orange", &title_color); - gtk_widget_realize (dialog); - /* B/W Style for the page contents */ page_style = gtk_widget_get_modifier_style (dialog); g_object_ref (page_style); diff --git a/app/display/Makefile.in b/app/display/Makefile.in index b7d068a7d8..9c22fb94ba 100644 --- a/app/display/Makefile.in +++ b/app/display/Makefile.in @@ -93,6 +93,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -201,6 +202,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -362,6 +364,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -369,17 +372,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -396,6 +391,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -406,6 +404,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -417,10 +416,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/file/Makefile.in b/app/file/Makefile.in index 40c6cc22e6..10b5d800fb 100644 --- a/app/file/Makefile.in +++ b/app/file/Makefile.in @@ -73,6 +73,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -181,6 +182,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -342,6 +344,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -349,17 +352,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -376,6 +371,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -386,6 +384,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -397,10 +396,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/gui/Makefile.in b/app/gui/Makefile.in index d05a690472..5fe5a4af6f 100644 --- a/app/gui/Makefile.in +++ b/app/gui/Makefile.in @@ -73,6 +73,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -181,6 +182,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -342,6 +344,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -349,17 +352,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -376,6 +371,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -386,6 +384,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -397,10 +396,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/menus/Makefile.in b/app/menus/Makefile.in index 8751748702..76f2931d82 100644 --- a/app/menus/Makefile.in +++ b/app/menus/Makefile.in @@ -73,6 +73,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -181,6 +182,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -342,6 +344,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -349,17 +352,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -376,6 +371,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -386,6 +384,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -397,10 +396,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/paint-funcs/Makefile.in b/app/paint-funcs/Makefile.in index 3d0e481122..a383283116 100644 --- a/app/paint-funcs/Makefile.in +++ b/app/paint-funcs/Makefile.in @@ -71,6 +71,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -179,6 +180,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -340,6 +342,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -347,17 +350,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -374,6 +369,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -384,6 +382,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -395,10 +394,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/paint/Makefile.in b/app/paint/Makefile.in index 1992b21cc9..e9884d4c6d 100644 --- a/app/paint/Makefile.in +++ b/app/paint/Makefile.in @@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -388,6 +383,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -398,6 +396,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -409,10 +408,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/pdb/Makefile.in b/app/pdb/Makefile.in index a9a400dc85..933b5fe408 100644 --- a/app/pdb/Makefile.in +++ b/app/pdb/Makefile.in @@ -93,6 +93,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -201,6 +202,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -362,6 +364,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -369,17 +372,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -396,6 +391,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -406,6 +404,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -417,10 +416,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/pdb/drawable_transform_cmds.c b/app/pdb/drawable_transform_cmds.c index 9859f3199e..f86c993960 100644 --- a/app/pdb/drawable_transform_cmds.c +++ b/app/pdb/drawable_transform_cmds.c @@ -239,6 +239,12 @@ drawable_transform_flip_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_flip_free (x, y, width, height, @@ -391,6 +397,12 @@ drawable_transform_flip_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_flip_free (x, y, width, height, @@ -550,6 +562,12 @@ drawable_transform_perspective_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_perspective (x, y, width, height, @@ -730,6 +748,12 @@ drawable_transform_perspective_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_perspective (x, y, width, height, @@ -1022,6 +1046,12 @@ drawable_transform_rotate_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ if (auto_center) @@ -1177,6 +1207,12 @@ drawable_transform_rotate_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ if (auto_center) @@ -1333,6 +1369,12 @@ drawable_transform_scale_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_scale (x, y, width, height, @@ -1487,6 +1529,12 @@ drawable_transform_scale_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_scale (x, y, width, height, @@ -1640,6 +1688,12 @@ drawable_transform_shear_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_shear (x, y, width, height, @@ -1778,6 +1832,12 @@ drawable_transform_shear_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_shear (x, y, width, height, @@ -1931,6 +1991,12 @@ drawable_transform_2d_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_matrix3_identity (&matrix); @@ -2109,6 +2175,12 @@ drawable_transform_2d_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_matrix3_identity (&matrix); @@ -2295,6 +2367,12 @@ drawable_transform_matrix_invoker (Gimp *gimp, gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) { GimpMatrix3 matrix; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ matrix.coeff[0][0] = coeff_0_0; @@ -2493,6 +2571,12 @@ drawable_transform_matrix_default_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ matrix.coeff[0][0] = coeff_0_0; diff --git a/app/pdb/transform_tools_cmds.c b/app/pdb/transform_tools_cmds.c index 90f472e5b1..8f8a2de471 100644 --- a/app/pdb/transform_tools_cmds.c +++ b/app/pdb/transform_tools_cmds.c @@ -181,6 +181,12 @@ perspective_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_perspective (x, y, width, height, @@ -327,6 +333,12 @@ rotate_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_rotate (x, y, width, height, @@ -442,6 +454,12 @@ scale_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_scale (x, y, width, height, @@ -573,6 +591,12 @@ shear_invoker (Gimp *gimp, { GimpMatrix3 matrix; GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE; + gint off_x, off_y; + + gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y); + + x += off_x; + y += off_y; /* Assemble the transformation matrix */ gimp_transform_matrix_shear (x, y, width, height, diff --git a/app/plug-in/Makefile.in b/app/plug-in/Makefile.in index 17fb249401..9400442035 100644 --- a/app/plug-in/Makefile.in +++ b/app/plug-in/Makefile.in @@ -77,6 +77,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -185,6 +186,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -346,6 +348,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -353,17 +356,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -380,6 +375,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -390,6 +388,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -401,10 +400,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/text/Makefile.in b/app/text/Makefile.in index f1ad56f05f..5f04eb50fb 100644 --- a/app/text/Makefile.in +++ b/app/text/Makefile.in @@ -80,6 +80,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -188,6 +189,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -349,6 +351,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -356,17 +359,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -383,6 +378,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -393,6 +391,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -404,10 +403,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/tools/Makefile.in b/app/tools/Makefile.in index 39e3d5296e..88f902ad99 100644 --- a/app/tools/Makefile.in +++ b/app/tools/Makefile.in @@ -107,6 +107,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -215,6 +216,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -376,6 +378,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -383,17 +386,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -410,6 +405,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -420,6 +418,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -431,10 +430,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c index 7959334c66..7ce3a0e2b3 100644 --- a/app/tools/tool_manager.c +++ b/app/tools/tool_manager.c @@ -558,6 +558,6 @@ tool_manager_image_clean_dirty (GimpImage *gimage, gdisp = GIMP_DRAW_TOOL (active_tool)->gdisp; if (gdisp && gdisp->gimage == gimage) - gimp_context_tool_changed (gimp_get_user_context (gimage->gimp)); + tool_manager_control_active (gimage->gimp, HALT, gdisp); } } diff --git a/app/vectors/Makefile.in b/app/vectors/Makefile.in index c6f3afd70f..ca1ba3c4f5 100644 --- a/app/vectors/Makefile.in +++ b/app/vectors/Makefile.in @@ -75,6 +75,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -183,6 +184,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -344,6 +346,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -351,17 +354,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -378,6 +373,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -388,6 +386,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -399,10 +398,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/widgets/Makefile.in b/app/widgets/Makefile.in index 90d726b5ed..cfbe8db0f5 100644 --- a/app/widgets/Makefile.in +++ b/app/widgets/Makefile.in @@ -145,6 +145,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -253,6 +254,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -414,6 +416,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -421,17 +424,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -448,6 +443,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -458,6 +456,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -469,10 +468,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index 8cf10beb9a..650d374be2 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -374,6 +374,7 @@ gimp_dock_key_press_event (GtkWidget *widget, GdkEventKey *event) { GtkWindow *window = GTK_WINDOW (widget); + GtkWidget *focus = gtk_window_get_focus (window); gboolean handled = FALSE; /* we're overriding the GtkWindow implementation here to give @@ -381,6 +382,10 @@ gimp_dock_key_press_event (GtkWidget *widget, * before the accelerator activation scheme. */ + /* text widgets get all key events first */ + if (G_UNLIKELY (GTK_IS_EDITABLE (focus) || GTK_IS_TEXT_VIEW (focus))) + handled = gtk_window_propagate_key_event (window, event); + /* invoke control/alt accelerators */ if (! handled && event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) handled = gtk_window_activate_key (window, event); diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c index 8dd16dfe4a..d816b0b742 100644 --- a/app/widgets/gimpfiledialog.c +++ b/app/widgets/gimpfiledialog.c @@ -393,8 +393,9 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog, GimpImage *gimage, gboolean save_a_copy) { - const gchar *uri = NULL; - gboolean uri_set = FALSE; + const gchar *uri = NULL; + gchar *dirname; + gchar *basename; g_return_if_fail (GIMP_IS_FILE_DIALOG (dialog)); g_return_if_fail (GIMP_IS_IMAGE (gimage)); @@ -406,25 +407,21 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog, uri = g_object_get_data (G_OBJECT (gimage), "gimp-image-save-a-copy"); if (! uri) - uri = gimp_object_get_name (GIMP_OBJECT (gimage)); - - if (uri) - uri_set = gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), uri); + uri = gimp_image_get_uri (gimage); gimp_file_dialog_set_file_proc (dialog, NULL); - if (! uri_set) - { - const gchar *name = gimp_image_get_uri (gimage); - gchar *current; + dirname = g_path_get_dirname (uri); + basename = g_path_get_basename (uri); - if (! name) - name = ""; + if (dirname && strlen (dirname) && strcmp (dirname, ".")) + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), + dirname); - current = g_path_get_basename (name); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), current); - g_free (current); - } + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename); + + g_free (dirname); + g_free (basename); } diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c index fbbaff3b32..05fd658bac 100644 --- a/app/widgets/gimpsessioninfo.c +++ b/app/widgets/gimpsessioninfo.c @@ -828,24 +828,79 @@ gimp_session_info_restore (GimpSessionInfo *info, info->aux_info = NULL; } +/* This function mostly lifted from + * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() + */ +static gint +get_appropriate_monitor (GdkScreen *screen, + gint x, + gint y, + gint w, + gint h) +{ + gint num_monitors, i, area = 0, monitor = -1; + GdkRectangle rect; + + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; + + num_monitors = gdk_screen_get_n_monitors (screen); + + for (i = 0; i < num_monitors; i++) + { + GdkRectangle tmp_monitor, intersect; + + gdk_screen_get_monitor_geometry (screen, i, &tmp_monitor); + gdk_rectangle_intersect (&rect, &tmp_monitor, &intersect); + + if (intersect.width * intersect.height > area) + { + area = intersect.width * intersect.height; + monitor = i; + } + } + if (monitor >= 0) + return monitor; + else + return gdk_screen_get_monitor_at_point (screen, + rect.x + rect.width / 2, + rect.y + rect.height / 2); +} + void gimp_session_info_set_geometry (GimpSessionInfo *info) { - GdkScreen *screen; - gint screen_width; - gint screen_height; - gchar geom[32]; + GdkScreen *screen; + GdkRectangle monitor; + gchar geom[32]; g_return_if_fail (info != NULL); g_return_if_fail (GTK_IS_WINDOW (info->widget)); screen = gtk_widget_get_screen (info->widget); - screen_width = gdk_screen_get_width (screen); - screen_height = gdk_screen_get_height (screen); + if ((!info->toplevel_entry || info->toplevel_entry->remember_size) && + info->width > 0 && info->height > 0) + { + gdk_screen_get_monitor_geometry (screen, + get_appropriate_monitor (screen, + info->x, info->y, + info->width, info->height), + &monitor); + info->x = CLAMP (info->x, monitor.x, monitor.x + monitor.width - info->width); + info->y = CLAMP (info->y, monitor.y, monitor.y + monitor.height - info->height); + } + else + { + gdk_screen_get_monitor_geometry (screen, + gdk_screen_get_monitor_at_point (screen, info->x, info->y), + &monitor); - info->x = CLAMP (info->x, 0, screen_width - 128); - info->y = CLAMP (info->y, 0, screen_height - 128); + info->x = CLAMP (info->x, monitor.x, monitor.x + monitor.width - 128); + info->y = CLAMP (info->y, monitor.y, monitor.y + monitor.height - 128); + } g_snprintf (geom, sizeof (geom), "+%d+%d", info->x, info->y); diff --git a/app/xcf/Makefile.in b/app/xcf/Makefile.in index a7396f76e0..62b8d0c38f 100644 --- a/app/xcf/Makefile.in +++ b/app/xcf/Makefile.in @@ -73,6 +73,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -181,6 +182,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -342,6 +344,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -349,17 +352,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -376,6 +371,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -386,6 +384,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -397,10 +396,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c index 6aaa9cefcf..7eaab3cfd3 100644 --- a/app/xcf/xcf-load.c +++ b/app/xcf/xcf-load.c @@ -1593,8 +1593,8 @@ xcf_load_vector (XcfInfo *info, info->cp += xcf_read_int32 (info->fp, &num_strokes, 1); #ifdef GIMP_XCF_PATH_DEBUG - g_printerr ("name: %s, tattoo: %d, visible: %d, linked: %d, num_parasites %d, " - "num_strokes %d\n", + g_printerr ("name: %s, tattoo: %d, visible: %d, linked: %d, " + "num_parasites %d, num_strokes %d\n", name, tattoo, visible, linked, num_parasites, num_strokes); #endif @@ -1608,9 +1608,7 @@ xcf_load_vector (XcfInfo *info, for (i = 0; i < num_parasites; i++) { - GimpParasite *parasite; - - parasite = xcf_load_parasite (info); + GimpParasite *parasite = xcf_load_parasite (info); if (! parasite) return FALSE; @@ -1661,6 +1659,12 @@ xcf_load_vector (XcfInfo *info, continue; } + if (num_axes < 2 || num_axes > 6) + { + g_printerr ("bad number of axes in stroke description\n"); + return FALSE; + } + control_points = g_value_array_new (num_control_points); anchor.selected = FALSE; diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c index 56ac8dd014..16e148a1cc 100644 --- a/app/xcf/xcf-save.c +++ b/app/xcf/xcf-save.c @@ -435,10 +435,6 @@ xcf_save_image_props (XcfInfo *info, xcf_check_error (xcf_save_prop (info, gimage, PROP_TATTOO, error, gimage->tattoo_state)); - if (gimp_parasite_list_length (gimage->parasites) > 0) - xcf_check_error (xcf_save_prop (info, gimage, PROP_PARASITES, - error, gimage->parasites)); - if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp)) xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit)); diff --git a/config.h.in b/config.h.in index 2a40171863..7770771086 100644 --- a/config.h.in +++ b/config.h.in @@ -215,7 +215,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff --git a/configure b/configure index 18fff08435..6b9e90d0fc 100755 --- a/configure +++ b/configure @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GIMP 2.2.11. +# Generated by GNU Autoconf 2.59e for GIMP 2.2.12. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -18,66 +19,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -98,124 +48,464 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells which exist, to save several forks. + if test -f "$as_shell" && + { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -224,7 +514,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -233,15 +535,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -397,34 +690,31 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME='GIMP' PACKAGE_TARNAME='gimp' -PACKAGE_VERSION='2.2.11' -PACKAGE_STRING='GIMP 2.2.11' +PACKAGE_VERSION='2.2.12' +PACKAGE_STRING='GIMP 2.2.12' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP' ac_unique_file="app/core/gimp.c" @@ -456,17 +746,391 @@ ac_includes_default="\ #endif #if HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif +#endif +#if HAVE_STDINT_H +# include #endif #if HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GIMP_MAJOR_VERSION GIMP_MINOR_VERSION GIMP_MICRO_VERSION GIMP_INTERFACE_AGE GIMP_BINARY_AGE GIMP_API_VERSION GIMP_VERSION GIMP_REAL_VERSION GIMP_APP_VERSION GIMP_PLUGIN_VERSION GIMP_TOOL_VERSION GIMP_PKGCONFIG_VERSION GIMP_DATA_VERSION GIMP_SYSCONF_VERSION GIMP_USER_VERSION GIMP_UNSTABLE GIMP_FULL_NAME GIMP_DESKTOP_ICON LT_VERSION_INFO LT_CURRENT_MINUS_AGE GLIB_REQUIRED_VERSION GTK_REQUIRED_VERSION GDK_PIXBUF_REQUIRED_VERSION PANGOFT2_REQUIRED_VERSION FONTCONFIG_REQUIRED_VERSION GTKDOC_REQUIRED_VERSION GTKHTML2_REQUIRED_VERSION GIMPPRINT_REQUIRED_VERSION GIMPPRINT_TOONEW_VERSION RSVG_REQUIRED_VERSION WMF_REQUIRED_VERSION GETTEXT_PACKAGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE PATHSEP OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE ms_librarian WINDRES ac_ct_WINDRES MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE HAVE_WINDRES_TRUE HAVE_WINDRES_FALSE ALLOCA INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG GMODULE_CFLAGS GMODULE_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS GDK_PIXBUF_CSOURCE LIBART_CFLAGS LIBART_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS FREETYPE_CONFIG FREETYPE_LIBS HAVE_FINITE HAVE_ISFINITE SOCKET_LIBS MMX_EXTRA_CFLAGS SSE_EXTRA_CFLAGS RT_LIBS SYMPREFIX HAVE_GLIBC_REGEX_TRUE HAVE_GLIBC_REGEX_FALSE HAVE_GLIBC_REGEX GIMP_THREAD_FLAGS GIMP_THREAD_LIBS GIMP_MP_FLAGS GIMP_MP_LIBS LIBXMU LIBSCREENSHOT GIMP_REMOTE TIFF LIBTIFF JPEG LIBJPEG BUILD_XJT_TRUE BUILD_XJT_FALSE LIBZ PSP PNG LIBPNG MNG LIBMNG EXIF_CFLAGS EXIF_LIBS AA LIBAA XPM LIBXPM GTKHTML2_CFLAGS GTKHTML2_LIBS BUILD_HELPBROWSER_TRUE BUILD_HELPBROWSER_FALSE SVG_CFLAGS SVG_LIBS SVG LIBSVG GIMPPRINT_CONFIG GIMPPRINT_CFLAGS GIMPPRINT_LIBS PRINT_LIBS PRINT_CFLAGS BUILD_PRINT_TRUE BUILD_PRINT_FALSE WMF_CONFIG LIBWMF WMF_CFLAGS LCMS_LIBS HAVE_LCMS_TRUE HAVE_LCMS_FALSE ALSA_CFLAGS ALSA_LIBS HAVE_LINUX_INPUT_TRUE HAVE_LINUX_INPUT_FALSE SENDMAIL PERL WITH_PDBGEN_TRUE WITH_PDBGEN_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYGTK_CFLAGS PYGTK_LIBS PYGIMP_EXTRA_CFLAGS BUILD_PYTHON_TRUE BUILD_PYTHON_FALSE MAIL SCREENSHOT URL WINCLIPBOARD WINPRINT WMF HAVE_MAC_TWAIN_TRUE HAVE_MAC_TWAIN_FALSE DESKTOP_DATADIR_TRUE DESKTOP_DATADIR_FALSE DESKTOP_DATADIR XMLLINT HAVE_XMLLINT_TRUE HAVE_XMLLINT_FALSE XSLTPROC HAVE_XSLTPROC_TRUE HAVE_XSLTPROC_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE DEFAULT_BINARY_TRUE DEFAULT_BINARY_FALSE ENABLE_GIMP_CONSOLE_TRUE ENABLE_GIMP_CONSOLE_FALSE gimpdir gimpdatadir gimpplugindir gimpsysconfdir localedir GIMPINSTALL STATICLIBS_TRUE STATICLIBS_FALSE GIMP_MKENUMS GIMP_PLUGINS GIMP_MODULES LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +GIMP_MAJOR_VERSION +GIMP_MINOR_VERSION +GIMP_MICRO_VERSION +GIMP_INTERFACE_AGE +GIMP_BINARY_AGE +GIMP_API_VERSION +GIMP_VERSION +GIMP_REAL_VERSION +GIMP_APP_VERSION +GIMP_PLUGIN_VERSION +GIMP_TOOL_VERSION +GIMP_PKGCONFIG_VERSION +GIMP_DATA_VERSION +GIMP_SYSCONF_VERSION +GIMP_USER_VERSION +GIMP_UNSTABLE +GIMP_FULL_NAME +GIMP_DESKTOP_ICON +LT_VERSION_INFO +LT_CURRENT_MINUS_AGE +GLIB_REQUIRED_VERSION +GTK_REQUIRED_VERSION +GDK_PIXBUF_REQUIRED_VERSION +PANGOFT2_REQUIRED_VERSION +FONTCONFIG_REQUIRED_VERSION +GTKDOC_REQUIRED_VERSION +GTKHTML2_REQUIRED_VERSION +GIMPPRINT_REQUIRED_VERSION +GIMPPRINT_TOONEW_VERSION +RSVG_REQUIRED_VERSION +WMF_REQUIRED_VERSION +GETTEXT_PACKAGE +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +GREP +EGREP +LN_S +ECHO +AR +RANLIB +DLLTOOL +AS +OBJDUMP +CPP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +CCAS +CCASFLAGS +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +PLATFORM_WIN32_TRUE +PLATFORM_WIN32_FALSE +PATHSEP +OS_WIN32_TRUE +OS_WIN32_FALSE +OS_UNIX_TRUE +OS_UNIX_FALSE +ms_librarian +WINDRES +MS_LIB_AVAILABLE_TRUE +MS_LIB_AVAILABLE_FALSE +HAVE_WINDRES_TRUE +HAVE_WINDRES_FALSE +ALLOCA +INTLTOOL_DESKTOP_RULE +INTLTOOL_DIRECTORY_RULE +INTLTOOL_KEYS_RULE +INTLTOOL_PROP_RULE +INTLTOOL_OAF_RULE +INTLTOOL_PONG_RULE +INTLTOOL_SERVER_RULE +INTLTOOL_SHEET_RULE +INTLTOOL_SOUNDLIST_RULE +INTLTOOL_UI_RULE +INTLTOOL_XAM_RULE +INTLTOOL_KBD_RULE +INTLTOOL_XML_RULE +INTLTOOL_XML_NOMERGE_RULE +INTLTOOL_CAVES_RULE +INTLTOOL_SCHEMAS_RULE +INTLTOOL_THEME_RULE +INTLTOOL_SERVICE_RULE +INTLTOOL_EXTRACT +INTLTOOL_MERGE +INTLTOOL_UPDATE +INTLTOOL_PERL +INTLTOOL_ICONV +INTLTOOL_MSGFMT +INTLTOOL_MSGMERGE +INTLTOOL_XGETTEXT +ALL_LINGUAS +USE_NLS +MSGFMT +GMSGFMT +XGETTEXT +CATALOGS +CATOBJEXT +DATADIRNAME +GMOFILES +INSTOBJEXT +INTLLIBS +PO_IN_DATADIR_TRUE +PO_IN_DATADIR_FALSE +POFILES +POSUB +MKINSTALLDIRS +PKG_CONFIG +GLIB_CFLAGS +GLIB_LIBS +GLIB_GENMARSHAL +GOBJECT_QUERY +GLIB_MKENUMS +GMODULE_CFLAGS +GMODULE_LIBS +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +GTK_CFLAGS +GTK_LIBS +GDK_PIXBUF_CFLAGS +GDK_PIXBUF_LIBS +GDK_PIXBUF_CSOURCE +LIBART_CFLAGS +LIBART_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS +PANGOFT2_CFLAGS +PANGOFT2_LIBS +FREETYPE_CONFIG +FREETYPE_LIBS +HAVE_FINITE +HAVE_ISFINITE +SOCKET_LIBS +MMX_EXTRA_CFLAGS +SSE_EXTRA_CFLAGS +RT_LIBS +SYMPREFIX +HAVE_GLIBC_REGEX_TRUE +HAVE_GLIBC_REGEX_FALSE +HAVE_GLIBC_REGEX +GIMP_THREAD_FLAGS +GIMP_THREAD_LIBS +GIMP_MP_FLAGS +GIMP_MP_LIBS +LIBXMU +LIBSCREENSHOT +GIMP_REMOTE +TIFF +LIBTIFF +JPEG +LIBJPEG +BUILD_XJT_TRUE +BUILD_XJT_FALSE +LIBZ +PSP +PNG +LIBPNG +MNG +LIBMNG +EXIF_CFLAGS +EXIF_LIBS +AA +LIBAA +XPM +LIBXPM +GTKHTML2_CFLAGS +GTKHTML2_LIBS +BUILD_HELPBROWSER_TRUE +BUILD_HELPBROWSER_FALSE +SVG_CFLAGS +SVG_LIBS +SVG +LIBSVG +GIMPPRINT_CONFIG +GIMPPRINT_CFLAGS +GIMPPRINT_LIBS +PRINT_LIBS +PRINT_CFLAGS +BUILD_PRINT_TRUE +BUILD_PRINT_FALSE +WMF_CONFIG +LIBWMF +WMF_CFLAGS +LCMS_LIBS +HAVE_LCMS_TRUE +HAVE_LCMS_FALSE +ALSA_CFLAGS +ALSA_LIBS +HAVE_LINUX_INPUT_TRUE +HAVE_LINUX_INPUT_FALSE +SENDMAIL +PERL +WITH_PDBGEN_TRUE +WITH_PDBGEN_FALSE +PYTHON +PYTHON_VERSION +PYTHON_PREFIX +PYTHON_EXEC_PREFIX +PYTHON_PLATFORM +pythondir +pkgpythondir +pyexecdir +pkgpyexecdir +PYTHON_INCLUDES +PYGTK_CFLAGS +PYGTK_LIBS +PYGIMP_EXTRA_CFLAGS +BUILD_PYTHON_TRUE +BUILD_PYTHON_FALSE +MAIL +SCREENSHOT +URL +WINCLIPBOARD +WINPRINT +WMF +HAVE_MAC_TWAIN_TRUE +HAVE_MAC_TWAIN_FALSE +DESKTOP_DATADIR_TRUE +DESKTOP_DATADIR_FALSE +DESKTOP_DATADIR +XMLLINT +HAVE_XMLLINT_TRUE +HAVE_XMLLINT_FALSE +XSLTPROC +HAVE_XSLTPROC_TRUE +HAVE_XSLTPROC_FALSE +HTML_DIR +ENABLE_GTK_DOC_TRUE +ENABLE_GTK_DOC_FALSE +GTK_DOC_USE_LIBTOOL_TRUE +GTK_DOC_USE_LIBTOOL_FALSE +DEFAULT_BINARY_TRUE +DEFAULT_BINARY_FALSE +ENABLE_GIMP_CONSOLE_TRUE +ENABLE_GIMP_CONSOLE_FALSE +gimpdir +gimpdatadir +gimpplugindir +gimpsysconfdir +GIMPINSTALL +STATICLIBS_TRUE +STATICLIBS_FALSE +GIMP_MKENUMS +GIMP_PLUGINS +GIMP_MODULES +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +CCAS +CCASFLAGS +PKG_CONFIG +GMODULE_CFLAGS +GMODULE_LIBS +XMKMF +GDK_PIXBUF_CFLAGS +GDK_PIXBUF_LIBS +LIBART_CFLAGS +LIBART_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS +PANGOFT2_CFLAGS +PANGOFT2_LIBS +EXIF_CFLAGS +EXIF_LIBS +GTKHTML2_CFLAGS +GTKHTML2_LIBS +SVG_CFLAGS +SVG_LIBS +PYGTK_CFLAGS +PYGTK_LIBS' + # Initialize some variables set by options. ac_init_help= @@ -493,34 +1157,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -542,12 +1220,18 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -555,7 +1239,17 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` @@ -564,11 +1258,7 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -595,6 +1285,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -619,13 +1315,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -690,6 +1389,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -746,11 +1455,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -759,7 +1464,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -790,8 +1495,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -811,27 +1515,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -858,178 +1554,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS -ac_env_CCAS_set=${CCAS+set} -ac_env_CCAS_value=$CCAS -ac_cv_env_CCAS_set=${CCAS+set} -ac_cv_env_CCAS_value=$CCAS -ac_env_CCASFLAGS_set=${CCASFLAGS+set} -ac_env_CCASFLAGS_value=$CCASFLAGS -ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set} -ac_cv_env_CCASFLAGS_value=$CCASFLAGS -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_GMODULE_CFLAGS_set=${GMODULE_CFLAGS+set} -ac_env_GMODULE_CFLAGS_value=$GMODULE_CFLAGS -ac_cv_env_GMODULE_CFLAGS_set=${GMODULE_CFLAGS+set} -ac_cv_env_GMODULE_CFLAGS_value=$GMODULE_CFLAGS -ac_env_GMODULE_LIBS_set=${GMODULE_LIBS+set} -ac_env_GMODULE_LIBS_value=$GMODULE_LIBS -ac_cv_env_GMODULE_LIBS_set=${GMODULE_LIBS+set} -ac_cv_env_GMODULE_LIBS_value=$GMODULE_LIBS -ac_env_GDK_PIXBUF_CFLAGS_set=${GDK_PIXBUF_CFLAGS+set} -ac_env_GDK_PIXBUF_CFLAGS_value=$GDK_PIXBUF_CFLAGS -ac_cv_env_GDK_PIXBUF_CFLAGS_set=${GDK_PIXBUF_CFLAGS+set} -ac_cv_env_GDK_PIXBUF_CFLAGS_value=$GDK_PIXBUF_CFLAGS -ac_env_GDK_PIXBUF_LIBS_set=${GDK_PIXBUF_LIBS+set} -ac_env_GDK_PIXBUF_LIBS_value=$GDK_PIXBUF_LIBS -ac_cv_env_GDK_PIXBUF_LIBS_set=${GDK_PIXBUF_LIBS+set} -ac_cv_env_GDK_PIXBUF_LIBS_value=$GDK_PIXBUF_LIBS -ac_env_LIBART_CFLAGS_set=${LIBART_CFLAGS+set} -ac_env_LIBART_CFLAGS_value=$LIBART_CFLAGS -ac_cv_env_LIBART_CFLAGS_set=${LIBART_CFLAGS+set} -ac_cv_env_LIBART_CFLAGS_value=$LIBART_CFLAGS -ac_env_LIBART_LIBS_set=${LIBART_LIBS+set} -ac_env_LIBART_LIBS_value=$LIBART_LIBS -ac_cv_env_LIBART_LIBS_set=${LIBART_LIBS+set} -ac_cv_env_LIBART_LIBS_value=$LIBART_LIBS -ac_env_FONTCONFIG_CFLAGS_set=${FONTCONFIG_CFLAGS+set} -ac_env_FONTCONFIG_CFLAGS_value=$FONTCONFIG_CFLAGS -ac_cv_env_FONTCONFIG_CFLAGS_set=${FONTCONFIG_CFLAGS+set} -ac_cv_env_FONTCONFIG_CFLAGS_value=$FONTCONFIG_CFLAGS -ac_env_FONTCONFIG_LIBS_set=${FONTCONFIG_LIBS+set} -ac_env_FONTCONFIG_LIBS_value=$FONTCONFIG_LIBS -ac_cv_env_FONTCONFIG_LIBS_set=${FONTCONFIG_LIBS+set} -ac_cv_env_FONTCONFIG_LIBS_value=$FONTCONFIG_LIBS -ac_env_PANGOFT2_CFLAGS_set=${PANGOFT2_CFLAGS+set} -ac_env_PANGOFT2_CFLAGS_value=$PANGOFT2_CFLAGS -ac_cv_env_PANGOFT2_CFLAGS_set=${PANGOFT2_CFLAGS+set} -ac_cv_env_PANGOFT2_CFLAGS_value=$PANGOFT2_CFLAGS -ac_env_PANGOFT2_LIBS_set=${PANGOFT2_LIBS+set} -ac_env_PANGOFT2_LIBS_value=$PANGOFT2_LIBS -ac_cv_env_PANGOFT2_LIBS_set=${PANGOFT2_LIBS+set} -ac_cv_env_PANGOFT2_LIBS_value=$PANGOFT2_LIBS -ac_env_EXIF_CFLAGS_set=${EXIF_CFLAGS+set} -ac_env_EXIF_CFLAGS_value=$EXIF_CFLAGS -ac_cv_env_EXIF_CFLAGS_set=${EXIF_CFLAGS+set} -ac_cv_env_EXIF_CFLAGS_value=$EXIF_CFLAGS -ac_env_EXIF_LIBS_set=${EXIF_LIBS+set} -ac_env_EXIF_LIBS_value=$EXIF_LIBS -ac_cv_env_EXIF_LIBS_set=${EXIF_LIBS+set} -ac_cv_env_EXIF_LIBS_value=$EXIF_LIBS -ac_env_GTKHTML2_CFLAGS_set=${GTKHTML2_CFLAGS+set} -ac_env_GTKHTML2_CFLAGS_value=$GTKHTML2_CFLAGS -ac_cv_env_GTKHTML2_CFLAGS_set=${GTKHTML2_CFLAGS+set} -ac_cv_env_GTKHTML2_CFLAGS_value=$GTKHTML2_CFLAGS -ac_env_GTKHTML2_LIBS_set=${GTKHTML2_LIBS+set} -ac_env_GTKHTML2_LIBS_value=$GTKHTML2_LIBS -ac_cv_env_GTKHTML2_LIBS_set=${GTKHTML2_LIBS+set} -ac_cv_env_GTKHTML2_LIBS_value=$GTKHTML2_LIBS -ac_env_SVG_CFLAGS_set=${SVG_CFLAGS+set} -ac_env_SVG_CFLAGS_value=$SVG_CFLAGS -ac_cv_env_SVG_CFLAGS_set=${SVG_CFLAGS+set} -ac_cv_env_SVG_CFLAGS_value=$SVG_CFLAGS -ac_env_SVG_LIBS_set=${SVG_LIBS+set} -ac_env_SVG_LIBS_value=$SVG_LIBS -ac_cv_env_SVG_LIBS_set=${SVG_LIBS+set} -ac_cv_env_SVG_LIBS_value=$SVG_LIBS -ac_env_PYGTK_CFLAGS_set=${PYGTK_CFLAGS+set} -ac_env_PYGTK_CFLAGS_value=$PYGTK_CFLAGS -ac_cv_env_PYGTK_CFLAGS_set=${PYGTK_CFLAGS+set} -ac_cv_env_PYGTK_CFLAGS_value=$PYGTK_CFLAGS -ac_env_PYGTK_LIBS_set=${PYGTK_LIBS+set} -ac_env_PYGTK_LIBS_value=$PYGTK_LIBS -ac_cv_env_PYGTK_LIBS_set=${PYGTK_LIBS+set} -ac_cv_env_PYGTK_LIBS_value=$PYGTK_LIBS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -1038,7 +1632,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.2.11 to adapt to many kinds of systems. +\`configure' configures GIMP 2.2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1058,9 +1652,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -1078,15 +1669,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/gimp] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1108,7 +1706,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GIMP 2.2.11:";; + short | recursive ) echo "Configuration of GIMP 2.2.12:";; esac cat <<\_ACEOF @@ -1117,10 +1715,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-static[=PKGS] - build static libraries [default=no] - --enable-shared[=PKGS] - build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1151,8 +1747,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] --with-x use the X Window System --with-shm=none|sysv|posix|auto shared memory transport type (default=auto) --without-libtiff build without TIFF support @@ -1182,8 +1777,8 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags @@ -1197,6 +1792,7 @@ Some influential environment variables: C compiler flags for GMODULE, overriding pkg-config GMODULE_LIBS linker flags for GMODULE, overriding pkg-config + XMKMF Path to xmkmf, Makefile generator for X Window System GDK_PIXBUF_CFLAGS C compiler flags for GDK_PIXBUF, overriding pkg-config GDK_PIXBUF_LIBS @@ -1229,120 +1825,86 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GIMP configure 2.2.11 -generated by GNU Autoconf 2.59 +GIMP configure 2.2.12 +generated by GNU Autoconf 2.59e -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +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.2.11, which was -generated by GNU Autoconf 2.59. Invocation command line was +It was created by GIMP $as_me 2.2.12, which was +generated by GNU Autoconf 2.59e. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1361,7 +1923,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1375,6 +1937,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1396,7 +1959,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1407,7 +1969,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1429,9 +1991,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1442,8 +2002,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1456,20 +2016,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1480,22 +2054,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1507,26 +2087,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1557,14 +2135,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1580,8 +2161,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1593,12 +2174,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1623,8 +2203,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1641,6 +2220,30 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi + + + + + + + + + + + + + + + + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1651,56 +2254,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - - - - am__api_version="1.9" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1715,8 +2299,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1738,7 +2322,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1757,21 +2341,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1781,8 +2366,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1824,20 +2409,20 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1889,8 +2474,8 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1903,54 +2488,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1983,7 +2571,7 @@ fi # Define the identity of the package. PACKAGE='gimp' - VERSION='2.2.11' + VERSION='2.2.12' # Some tools Automake needs. @@ -2012,8 +2600,8 @@ 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2026,32 +2614,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$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 - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2064,27 +2654,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -2104,16 +2708,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" GIMP_MAJOR_VERSION=2 GIMP_MINOR_VERSION=2 -GIMP_MICRO_VERSION=11 -GIMP_INTERFACE_AGE=11 -GIMP_BINARY_AGE=211 -GIMP_VERSION=2.2.11 -GIMP_REAL_VERSION=2.2.11 +GIMP_MICRO_VERSION=12 +GIMP_INTERFACE_AGE=12 +GIMP_BINARY_AGE=212 +GIMP_VERSION=2.2.12 +GIMP_REAL_VERSION=2.2.12 GIMP_API_VERSION=2.0 GIMP_APP_VERSION=2.2 GIMP_PLUGIN_VERSION=2.0 @@ -2165,7 +2769,7 @@ fi -LT_VERSION_INFO="200:11:200" +LT_VERSION_INFO="200:12:200" LT_CURRENT_MINUS_AGE=0 @@ -2210,8 +2814,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2224,32 +2828,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2262,36 +2868,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2304,74 +2925,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2385,7 +2966,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2396,6 +2977,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2413,22 +2995,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2441,36 +3024,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2483,29 +3068,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2518,21 +3119,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2557,46 +3172,70 @@ ac_clean_files="$ac_clean_files a.out 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. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2609,19 +3248,23 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2640,22 +3283,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2666,9 +3314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2682,14 +3329,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2709,14 +3356,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2734,12 +3387,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2762,23 +3415,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2787,24 +3453,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2820,23 +3490,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2845,12 +3528,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2866,12 +3668,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2905,10 +3707,10 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; int test (int i, double x); @@ -2925,201 +3727,74 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3127,7 +3802,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -3137,8 +3812,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -3165,15 +3840,15 @@ if test "$am__include" = "#"; then fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -3193,8 +3868,8 @@ fi depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3283,8 +3958,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3300,10 +3975,9 @@ else fi -# Check whether --enable-static or --disable-static was given. +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -3322,15 +3996,15 @@ if test "${enable_static+set}" = set; then esac else enable_static=no -fi; +fi -# Check whether --enable-shared or --disable-shared was given. + +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -3349,12 +4023,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi -# Check whether --enable-fast-install or --disable-fast-install was given. + +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -3373,64 +4047,94 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3483,37 +4187,184 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -3542,11 +4393,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3579,17 +4430,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3603,20 +4454,20 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -3633,8 +4484,8 @@ case $host_os in ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3682,23 +4533,23 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3873,8 +4724,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3892,11 +4743,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -3923,7 +4774,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3926 "configure"' > conftest.$ac_ext + echo '#line 4777 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4008,8 +4859,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4035,23 +4886,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4060,8 +4924,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c @@ -4071,8 +4936,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -4102,8 +4967,8 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4116,32 +4981,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4154,27 +5021,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - DLLTOOL=$ac_ct_DLLTOOL + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi else DLLTOOL="$ac_cv_prog_DLLTOOL" fi @@ -4182,8 +5063,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4196,32 +5077,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4234,27 +5117,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AS=$ac_ct_AS + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi else AS="$ac_cv_prog_AS" fi @@ -4262,8 +5159,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4276,32 +5173,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4314,27 +5213,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - OBJDUMP=$ac_ct_OBJDUMP + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi else OBJDUMP="$ac_cv_prog_OBJDUMP" fi @@ -4351,8 +5264,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4386,8 +5299,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4412,9 +5330,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4424,8 +5343,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4452,6 +5376,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4469,8 +5394,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -4493,8 +5418,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4519,9 +5449,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4531,8 +5462,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4559,6 +5495,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4581,8 +5518,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4606,23 +5543,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4631,8 +5581,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -4689,6 +5640,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -4708,18 +5660,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4732,12 +5693,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -4760,9 +5723,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4776,23 +5739,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4801,12 +5777,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -4821,18 +5799,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4843,23 +5822,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4868,15 +5860,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4885,8 +5878,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4910,9 +5908,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -4936,25 +5935,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -4966,18 +5964,22 @@ fi done -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4990,36 +5992,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5032,55 +6036,85 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5103,23 +6137,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5128,24 +6175,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5161,23 +6212,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5186,12 +6250,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -5207,111 +6390,7 @@ else CXXFLAGS= fi fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5319,8 +6398,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5409,8 +6488,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -5431,13 +6510,13 @@ fi if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5467,8 +6546,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5493,9 +6577,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5505,8 +6590,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5533,6 +6623,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5550,8 +6641,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5574,8 +6665,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5600,9 +6696,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5612,8 +6709,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5640,6 +6742,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5655,7 +6758,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5669,12 +6772,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5687,36 +6790,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5729,48 +6834,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:5759:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -5780,8 +6915,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5794,23 +6929,36 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5819,20 +6967,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5843,23 +6992,36 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5868,13 +7030,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -5903,8 +7066,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6012,19 +7175,19 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6228,15 +7391,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6250,8 +7413,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6302,8 +7465,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6316,32 +7479,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6354,27 +7519,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -6382,8 +7561,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6396,32 +7575,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6434,27 +7615,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -6462,8 +7657,8 @@ fi 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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6476,32 +7671,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$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 - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6514,27 +7711,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -6593,8 +7804,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6646,17 +7857,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6708,11 +7919,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -6727,21 +7938,21 @@ esac enable_dlopen=no enable_win32_dll=yes -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -6799,8 +8010,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6817,11 +8028,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:6820: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8031: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6824: \$? = $ac_status" >&5 + echo "$as_me:8035: \$? = $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. @@ -6834,8 +8045,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -6849,8 +8060,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7059,16 +8270,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7085,11 +8296,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:7088: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8299: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7092: \$? = $ac_status" >&5 + echo "$as_me:8303: \$? = $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. @@ -7102,8 +8313,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7130,8 +8341,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7158,8 +8369,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -7168,8 +8379,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7189,11 +8400,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:7192: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8403: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7196: \$? = $ac_status" >&5 + echo "$as_me:8407: \$? = $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 @@ -7215,23 +8426,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -7241,8 +8452,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -7658,23 +8869,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7688,7 +8912,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7718,23 +8944,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7748,7 +8987,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8198,8 +9439,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -8219,8 +9460,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8257,16 +9498,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -8841,8 +10082,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -8850,8 +10091,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -8875,8 +10116,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -8889,29 +10130,29 @@ fi striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -8943,8 +10184,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8957,39 +10198,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8998,14 +10252,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -9019,8 +10274,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9047,52 +10302,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9101,18 +10363,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9125,39 +10388,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9166,19 +10442,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9205,52 +10482,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9259,18 +10543,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9283,39 +10568,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9324,19 +10622,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9349,39 +10648,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9390,19 +10702,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9415,39 +10728,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9456,14 +10782,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -9503,8 +10830,8 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9514,7 +10841,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9614,7 +10941,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -9721,13 +11048,13 @@ fi # Report which library types will actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -9747,15 +11074,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -10247,11 +11574,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10305,7 +11632,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10424,18 +11751,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -10464,11 +11791,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10501,17 +11828,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10525,8 +11852,8 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10576,8 +11903,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -10689,23 +12016,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10719,7 +12059,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10750,23 +12092,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10780,7 +12135,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11512,8 +12869,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -11652,8 +13009,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -11926,16 +13283,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11952,11 +13309,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:11955: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13312: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11959: \$? = $ac_status" >&5 + echo "$as_me:13316: \$? = $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. @@ -11969,8 +13326,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -11997,8 +13354,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12025,8 +13382,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } if test x"$lt_prog_compiler_static_works_CXX" = xyes; then : @@ -12035,8 +13392,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12056,11 +13413,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:12059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13416: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12063: \$? = $ac_status" >&5 + echo "$as_me:13420: \$? = $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 @@ -12082,23 +13439,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -12108,8 +13465,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -12136,8 +13493,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -12157,8 +13514,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12195,16 +13552,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -12779,8 +14136,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -12788,8 +14145,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -12813,8 +14170,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -13339,13 +14696,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -13364,15 +14721,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -13381,8 +14738,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -13591,16 +14948,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13617,11 +14974,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:13620: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14977: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13624: \$? = $ac_status" >&5 + echo "$as_me:14981: \$? = $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. @@ -13634,8 +14991,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -13662,8 +15019,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13690,8 +15047,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } if test x"$lt_prog_compiler_static_works_F77" = xyes; then : @@ -13700,8 +15057,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13721,11 +15078,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:13724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15081: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13728: \$? = $ac_status" >&5 + echo "$as_me:15085: \$? = $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 @@ -13747,23 +15104,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -13773,8 +15130,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -14180,23 +15537,36 @@ _LT_EOF end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14210,7 +15580,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14230,23 +15602,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14260,7 +15645,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14710,8 +16097,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -14731,8 +16118,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -14769,16 +16156,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -15353,8 +16740,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15362,8 +16749,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -15387,8 +16774,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -15825,7 +17212,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -15893,8 +17279,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15911,11 +17297,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:15914: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17300: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15918: \$? = $ac_status" >&5 + echo "$as_me:17304: \$? = $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. @@ -15928,8 +17314,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -15943,8 +17329,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -16153,16 +17539,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16179,11 +17565,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:16182: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17568: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16186: \$? = $ac_status" >&5 + echo "$as_me:17572: \$? = $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. @@ -16196,8 +17582,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -16224,8 +17610,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16252,8 +17638,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then : @@ -16262,8 +17648,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16283,11 +17669,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:16286: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17672: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16290: \$? = $ac_status" >&5 + echo "$as_me:17676: \$? = $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 @@ -16309,23 +17695,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16335,8 +17721,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -16752,23 +18138,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -16782,7 +18181,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16812,23 +18213,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -16842,7 +18256,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17292,8 +18708,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -17313,8 +18729,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17351,16 +18767,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -17935,8 +19351,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -17944,8 +19360,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -17969,8 +19385,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -18406,7 +19822,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -18946,17 +20361,17 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no -fi; - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then @@ -18976,16 +20391,16 @@ fi # Check target architecture ########################### -echo "$as_me:$LINENO: checking for target architecture" >&5 -echo $ECHO_N "checking for target architecture... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for target architecture" >&5 +echo $ECHO_N "checking for target architecture... $ECHO_C" >&6; } case x"$target" in xNONE | x) target_or_host="$host" ;; *) target_or_host="$target" ;; esac -echo "$as_me:$LINENO: result: $target_or_host" >&5 -echo "${ECHO_T}$target_or_host" >&6 +{ echo "$as_me:$LINENO: result: $target_or_host" >&5 +echo "${ECHO_T}$target_or_host" >&6; } case "$target_or_host" in i*86-*-*) @@ -19026,8 +20441,8 @@ esac # Check for Win32 ################# -echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } case "$target_or_host" in *-*-mingw* | *-*-cygwin*) platform_win32=yes @@ -19036,8 +20451,8 @@ case "$target_or_host" in platform_win32=no ;; esac -echo "$as_me:$LINENO: result: $platform_win32" >&5 -echo "${ECHO_T}$platform_win32" >&6 +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } if test "$platform_win32" = "yes"; then @@ -19049,8 +20464,8 @@ else fi -echo "$as_me:$LINENO: checking for native Win32" >&5 -echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } case "$target_or_host" in *-*-mingw*) os_win32=yes @@ -19061,8 +20476,8 @@ case "$target_or_host" in PATHSEP=':' ;; esac -echo "$as_me:$LINENO: result: $os_win32" >&5 -echo "${ECHO_T}$os_win32" >&6 +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } @@ -19088,8 +20503,8 @@ fi if test "$os_win32" = "yes"; then # Extract the first word of "lib.exe", so it can be a program name with args. set dummy lib.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ms_librarian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19102,31 +20517,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ms_librarian="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" fi fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then - echo "$as_me:$LINENO: result: $ms_librarian" >&5 -echo "${ECHO_T}$ms_librarian" >&6 + { echo "$as_me:$LINENO: result: $ms_librarian" >&5 +echo "${ECHO_T}$ms_librarian" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19139,32 +20556,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6 + { echo "$as_me:$LINENO: result: $WINDRES" >&5 +echo "${ECHO_T}$WINDRES" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19177,27 +20596,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_WINDRES="windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_WINDRES" && ac_cv_prog_ac_ct_WINDRES=":" fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then - echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 +echo "${ECHO_T}$ac_ct_WINDRES" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - WINDRES=$ac_ct_WINDRES + if test "x$ac_ct_WINDRES" = x; then + WINDRES=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + WINDRES=$ac_ct_WINDRES + fi else WINDRES="$ac_cv_prog_WINDRES" fi @@ -19233,13 +20666,12 @@ fi # Generic stuff ############### -echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19247,113 +20679,89 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char strerror (); int main () { -strerror (); +return strerror (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_strerror="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_strerror" = no; then - for ac_lib in cposix; do +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strerror (); -int -main () -{ -strerror (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_strerror="-l$ac_lib" -break + ac_cv_search_strerror=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break fi +done +if test "${ac_cv_search_strerror+set}" = set; then + : +else + ac_cv_search_strerror=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6 -if test "$ac_cv_search_strerror" != no; then - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6; } +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -19365,8 +20773,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19379,32 +20787,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19417,36 +20827,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19459,74 +20884,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19540,7 +20925,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -19551,6 +20936,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -19568,22 +20954,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19596,36 +20983,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19638,29 +21027,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -19673,27 +21078,41 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19716,23 +21135,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19741,24 +21173,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19774,23 +21210,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19799,12 +21248,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -19820,12 +21388,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19859,10 +21427,10 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; int test (int i, double x); @@ -19879,201 +21447,74 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -20082,8 +21523,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20172,8 +21613,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -20205,8 +21646,8 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20228,7 +21669,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -20247,21 +21688,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -20271,45 +21713,46 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -# Check whether --enable-largefile or --disable-largefile was given. +# Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" + enableval=$enable_largefile; +fi -fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20317,8 +21760,8 @@ else if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20342,24 +21785,37 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20368,27 +21824,42 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20397,7 +21868,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext break done @@ -20405,14 +21878,14 @@ rm -f conftest.err conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20442,23 +21915,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20467,7 +21953,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20494,23 +21982,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20519,13 +22020,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } if test "$ac_cv_sys_file_offset_bits" != no; then cat >>confdefs.h <<_ACEOF @@ -20534,8 +22037,8 @@ _ACEOF fi rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20565,23 +22068,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20590,7 +22106,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20617,23 +22135,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20642,13 +22173,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } if test "$ac_cv_sys_large_files" != no; then cat >>confdefs.h <<_ACEOF @@ -20660,51 +22193,51 @@ rm -f conftest* fi -echo "$as_me:$LINENO: checking whether to turn on debugging" >&5 -echo $ECHO_N "checking whether to turn on debugging... $ECHO_C" >&6 -# Check whether --enable-debug or --disable-debug was given. +{ echo "$as_me:$LINENO: checking whether to turn on debugging" >&5 +echo $ECHO_N "checking whether to turn on debugging... $ECHO_C" >&6; } +# Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - if eval "test x$enable_debug = xyes"; then + enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then DEBUGFLAG="-g" fi -fi; +fi + if test -n "$DEBUGFLAG"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CFLAGS="$DEBUGFLAG $CFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking whether to turn on profiling" >&5 -echo $ECHO_N "checking whether to turn on profiling... $ECHO_C" >&6 -# Check whether --enable-profile or --disable-profile was given. +{ echo "$as_me:$LINENO: checking whether to turn on profiling" >&5 +echo $ECHO_N "checking whether to turn on profiling... $ECHO_C" >&6; } +# Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then - enableval="$enable_profile" - if eval "test x$enable_profile = xyes"; then + enableval=$enable_profile; if eval "test x$enable_profile = xyes"; then PROFFLAG="-pg" fi -fi; - -if test -n "$PROFFLAG"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - CFLAGS="$PROFFLAG $CFLAGS" -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 fi -# Check whether --enable-ansi or --disable-ansi was given. -if test "${enable_ansi+set}" = set; then - enableval="$enable_ansi" +if test -n "$PROFFLAG"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + CFLAGS="$PROFFLAG $CFLAGS" +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +# Check whether --enable-ansi was given. +if test "${enable_ansi+set}" = set; then + enableval=$enable_ansi; else enable_ansi=no -fi; +fi + if eval "test x$GCC = xyes"; then case " $CFLAGS " in @@ -20732,8 +22265,8 @@ fi if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' - echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 -echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else @@ -20752,14 +22285,14 @@ echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 ;; esac if test x"$msnative_struct" = x ; then - echo "$as_me:$LINENO: result: no way" >&5 -echo "${ECHO_T}no way" >&6 + { echo "$as_me:$LINENO: result: no way" >&5 +echo "${ECHO_T}no way" >&6; } { echo "$as_me:$LINENO: WARNING: build will be incompatible with GTK+ DLLs" >&5 echo "$as_me: WARNING: build will be incompatible with GTK+ DLLs" >&2;} else CFLAGS="$CFLAGS $msnative_struct" - echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 -echo "${ECHO_T}${msnative_struct}" >&6 + { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +echo "${ECHO_T}${msnative_struct}" >&6; } fi fi fi @@ -20776,9 +22309,9 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -20800,23 +22333,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20825,12 +22371,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -20842,13 +22390,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20856,124 +22403,99 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20981,120 +22503,96 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21118,23 +22616,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21143,8 +22654,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -21201,6 +22713,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -21220,18 +22733,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21244,12 +22766,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -21258,8 +22782,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21272,7 +22796,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif #ifndef WIFEXITED # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) @@ -21289,23 +22813,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21314,12 +22851,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -21328,8 +22866,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21353,23 +22891,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21378,12 +22929,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -21401,18 +22953,19 @@ fi for ac_header in sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21423,23 +22976,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21448,15 +23014,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21465,8 +23032,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21490,9 +23062,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21516,25 +23089,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21547,8 +23119,8 @@ fi done -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21559,35 +23131,49 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef pid_t ac__type_new_; int main () { -if ((pid_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (pid_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21596,12 +23182,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no + ac_cv_type_pid_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } if test $ac_cv_type_pid_t = yes; then : else @@ -21612,8 +23199,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21625,55 +23212,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif int main () { -int i; +return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void + ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_signal=int + ac_cv_type_signal=void fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal @@ -21684,9 +23277,9 @@ _ACEOF for ac_func in vprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21712,52 +23305,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21766,20 +23366,22 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for _doprnt" >&5 +echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } if test "${ac_cv_func__doprnt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21806,52 +23408,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef _doprnt -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char _doprnt (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub__doprnt) || defined (__stub____doprnt) +#if defined __stub__doprnt || defined __stub____doprnt choke me -#else -char (*f) () = _doprnt; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != _doprnt; +return _doprnt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21860,13 +23469,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func__doprnt=no + ac_cv_func__doprnt=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 +echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } if test $ac_cv_func__doprnt = yes; then cat >>confdefs.h <<\_ACEOF @@ -21882,8 +23492,8 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21903,23 +23513,36 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21928,13 +23551,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -21943,8 +23567,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21984,23 +23608,36 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22009,13 +23646,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then @@ -22029,15 +23667,15 @@ else # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. -ALLOCA=alloca.$ac_objext +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 _ACEOF -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22047,7 +23685,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray @@ -22063,14 +23701,14 @@ fi rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22096,52 +23734,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22150,13 +23795,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF @@ -22169,8 +23816,8 @@ fi done fi -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22183,6 +23830,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default int find_stack_direction () { @@ -22200,17 +23848,26 @@ find_stack_direction () int main () { - exit (find_stack_direction () < 0); + return find_stack_direction () < 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22223,11 +23880,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction @@ -22243,9 +23902,9 @@ fi for ac_func in difftime putenv mmap do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22271,52 +23930,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22325,13 +23991,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -22360,15 +24028,15 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} esac if test -n ""; then - echo "$as_me:$LINENO: checking for intltool >= " >&5 -echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for intltool >= " >&5 +echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; } - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 100 + $ 2; }'` + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` - echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 +echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5 echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;} @@ -22423,8 +24091,8 @@ INTLTOOL_UPDATE='$(top_builddir)/intltool-update' # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22439,27 +24107,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL - if test -n "$INTLTOOL_PERL"; then - echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 +echo "${ECHO_T}$INTLTOOL_PERL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -z "$INTLTOOL_PERL"; then { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 echo "$as_me: error: perl not found; required for intltool" >&2;} @@ -22471,11 +24140,11 @@ echo "$as_me: error: perl 5.x required for intltool" >&2;} { (exit 1); exit 1; }; } fi if test "x" != "xno-xml"; then - echo "$as_me:$LINENO: checking for XML::Parser" >&5 -echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XML::Parser" >&5 +echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } else { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} @@ -22485,8 +24154,8 @@ fi # Extract the first word of "iconv", so it can be a program name with args. set dummy iconv; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22501,32 +24170,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv" ;; esac fi INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV - if test -n "$INTLTOOL_ICONV"; then - echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 -echo "${ECHO_T}$INTLTOOL_ICONV" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 +echo "${ECHO_T}$INTLTOOL_ICONV" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22541,32 +24211,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt" ;; esac fi INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT - if test -n "$INTLTOOL_MSGFMT"; then - echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 -echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 +echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22581,32 +24252,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge" ;; esac fi INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE - if test -n "$INTLTOOL_MSGMERGE"; then - echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 +echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22621,33 +24293,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext" ;; esac fi INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT - if test -n "$INTLTOOL_XGETTEXT"; then - echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 -echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6 + { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 +echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi +# Substitute ALL_LINGUAS so we can use it in po/Makefile - ac_config_commands="$ac_config_commands intltool" + + + +ac_config_commands="$ac_config_commands intltool" @@ -22656,18 +24332,19 @@ fi for ac_header in locale.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22678,23 +24355,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22703,15 +24393,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22720,8 +24411,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22745,9 +24441,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22771,25 +24468,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22802,8 +24498,8 @@ fi done if test $ac_cv_header_locale_h = yes; then - echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22823,23 +24519,36 @@ return LC_MESSAGES } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22848,13 +24557,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF @@ -22873,17 +24583,17 @@ _ACEOF INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then - echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libintl.h" >&5 +echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 +echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22894,23 +24604,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22919,15 +24642,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 +echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22936,8 +24660,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22961,9 +24690,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22987,25 +24717,23 @@ echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libintl.h" >&5 +echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } if test "${ac_cv_header_libintl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_libintl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } fi if test $ac_cv_header_libintl_h = yes; then @@ -23015,8 +24743,8 @@ if test $ac_cv_header_libintl_h = yes; then # # First check in libc # - echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } if test "${gt_cv_func_ngettext_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23038,23 +24766,36 @@ return !ngettext ("","", 1) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23063,18 +24804,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6 +{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } if test "${gt_cv_func_dgettext_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23096,23 +24838,36 @@ return !dgettext ("","") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23121,14 +24876,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_dgettext_libc=no + gt_cv_func_dgettext_libc=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 +{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } fi if test "$gt_cv_func_ngettext_libc" = "yes" ; then @@ -23136,9 +24892,9 @@ echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 for ac_func in bind_textdomain_codeset do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23164,52 +24920,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23218,13 +24981,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -23242,8 +25007,8 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23256,39 +25021,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char bindtextdomain (); int main () { -bindtextdomain (); +return bindtextdomain (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23297,17 +25075,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } if test $ac_cv_lib_intl_bindtextdomain = yes; then - echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_ngettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23320,39 +25099,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ngettext (); int main () { -ngettext (); +return ngettext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23361,17 +25153,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } if test $ac_cv_lib_intl_ngettext = yes; then - echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23384,39 +25177,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dgettext (); int main () { -dgettext (); +return dgettext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23425,14 +25231,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes fi @@ -23443,12 +25250,12 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 - echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_ngettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23461,39 +25268,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ngettext (); int main () { -ngettext (); +return ngettext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23502,17 +25322,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } if test $ac_cv_lib_intl_ngettext = yes; then - echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_dcgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23525,39 +25346,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dcgettext (); int main () { -dcgettext (); +return dcgettext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23566,14 +25400,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv @@ -23600,9 +25435,9 @@ fi for ac_func in bind_textdomain_codeset do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23628,52 +25463,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23682,13 +25524,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -23727,8 +25571,8 @@ _ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23754,11 +25598,11 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" @@ -23767,9 +25611,9 @@ fi for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23795,52 +25639,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23849,13 +25700,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -23866,8 +25719,8 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23882,32 +25735,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT - if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23933,11 +25787,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi cat >conftest.$ac_ext <<_ACEOF @@ -23957,23 +25811,36 @@ extern int _nl_msg_cat_cntr; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23983,10 +25850,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -case $host in + case $host in *-*-solaris*) - echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24013,52 +25880,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef bind_textdomain_codeset -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char bind_textdomain_codeset (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) +#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset choke me -#else -char (*f) () = bind_textdomain_codeset; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != bind_textdomain_codeset; +return bind_textdomain_codeset (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24067,13 +25941,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_bind_textdomain_codeset=no + ac_cv_func_bind_textdomain_codeset=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } if test $ac_cv_func_bind_textdomain_codeset = yes; then CATOBJEXT=.gmo DATADIRNAME=share @@ -24089,6 +25964,7 @@ fi ;; esac fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" @@ -24114,8 +25990,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 + { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -24123,7 +25999,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 # We need to process the po/ directory. POSUB=po - ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" for lang in $ALL_LINGUAS; do @@ -24147,8 +26023,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -24172,8 +26048,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 fi done LINGUAS=$NEW_LINGUAS - echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6 + { echo "$as_me:$LINENO: result: $LINGUAS" >&5 +echo "${ECHO_T}$LINGUAS" >&6; } fi if test -n "$LINGUAS"; then @@ -24210,13 +26086,13 @@ echo "${ECHO_T}$LINGUAS" >&6 # Checks for required libraries ############################### -# Check whether --enable-glibtest or --disable-glibtest was given. +# Check whether --enable-glibtest was given. if test "${enable_glibtest+set}" = set; then - enableval="$enable_glibtest" - + enableval=$enable_glibtest; else enable_glibtest=yes -fi; +fi + pkg_config_args=glib-2.0 for module in . gobject @@ -24239,8 +26115,8 @@ fi; # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24255,29 +26131,30 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + no_glib="" if test x$PKG_CONFIG != xno ; then @@ -24293,8 +26170,8 @@ fi fi min_glib_version=2.4.5 - echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 -echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -24412,13 +26289,22 @@ main () _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24431,19 +26317,21 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) no_glib=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_glib" = x ; then - echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 -echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6 + { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } : else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://www.freedesktop.org/software/pkgconfig/" @@ -24475,23 +26363,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24508,9 +26409,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GLIB is incorrectly installed." fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" @@ -24540,8 +26442,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24556,34 +26458,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24598,28 +26501,42 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - PKG_CONFIG=$ac_pt_PKG_CONFIG + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi @@ -24627,22 +26544,22 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -echo "$as_me:$LINENO: checking for GMODULE" >&5 -echo $ECHO_N "checking for GMODULE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GMODULE" >&5 +echo $ECHO_N "checking for GMODULE... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GMODULE_CFLAGS"; then @@ -24746,22 +26663,22 @@ See \`config.log' for more details." >&2;} else GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi -echo "$as_me:$LINENO: checking if GLib is version 2.7.0 or newer" >&5 -echo $ECHO_N "checking if GLib is version 2.7.0 or newer... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if GLib is version 2.7.0 or newer" >&5 +echo $ECHO_N "checking if GLib is version 2.7.0 or newer... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-version=2.7.0 glib-2.0; then have_glib_2_7=yes else have_glib_2_7=no fi -echo "$as_me:$LINENO: result: $have_glib_2_7" >&5 -echo "${ECHO_T}$have_glib_2_7" >&6 +{ echo "$as_me:$LINENO: result: $have_glib_2_7" >&5 +echo "${ECHO_T}$have_glib_2_7" >&6; } gimp_save_LIBS=$LIBS LIBS="$LIBS $GLIB_LIBS" @@ -24769,9 +26686,9 @@ LIBS="$LIBS $GLIB_LIBS" for ac_func in bind_textdomain_codeset do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24797,52 +26714,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24851,13 +26775,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -24869,47 +26795,49 @@ done LIBS=$gimp_save_LIBS +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes - -# Check whether --with-x or --without-x was given. +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" + withval=$with_x; +fi -fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -24917,7 +26845,7 @@ _ACEOF # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -24926,7 +26854,7 @@ _ACEOF esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi # Standard set of common directories for X headers. @@ -24967,7 +26895,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -24977,8 +26905,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -25008,6 +26941,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -25016,7 +26950,7 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25033,23 +26967,36 @@ XrmInitialize () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25060,56 +27007,56 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then + if test -r "$ac_dir/libXt.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done done fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi -fi - - fi +;; #( + *) have_x=yes;; + esac eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi -fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -25130,8 +27077,8 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -25149,23 +27096,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25174,13 +27134,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_nospace=no + ac_R_nospace=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" @@ -25200,23 +27161,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25225,17 +27199,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_space=no + ac_R_space=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi fi LIBS=$ac_xsave_LIBS @@ -25260,39 +27235,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -XOpenDisplay (); +return XOpenDisplay (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25301,8 +27289,8 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25315,39 +27303,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25356,21 +27357,22 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25383,39 +27385,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25424,20 +27439,22 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -25450,8 +27467,8 @@ rm -f conftest.err conftest.$ac_objext \ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25478,52 +27495,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef gethostbyname -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +#if defined __stub_gethostbyname || defined __stub___gethostbyname choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != gethostbyname; +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25532,17 +27556,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_gethostbyname=no + ac_cv_func_gethostbyname=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25555,39 +27580,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25596,21 +27634,22 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25623,39 +27662,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25664,14 +27716,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -25686,8 +27739,8 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25714,52 +27767,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef connect -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) +#if defined __stub_connect || defined __stub___connect choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != connect; +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25768,17 +27828,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_connect=no + ac_cv_func_connect=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25791,39 +27852,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); int main () { -connect (); +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25832,14 +27906,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no + ac_cv_lib_socket_connect=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -25847,8 +27922,8 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25875,52 +27950,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef remove -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) +#if defined __stub_remove || defined __stub___remove choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != remove; +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25929,17 +28011,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_remove=no + ac_cv_func_remove=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25952,39 +28035,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); int main () { -remove (); +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25993,14 +28089,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -26008,8 +28105,8 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26036,52 +28133,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shmat -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shmat; +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26090,17 +28194,18 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shmat=no + ac_cv_func_shmat=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26113,39 +28218,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); int main () { -shmat (); +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26154,14 +28272,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -26178,8 +28297,8 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26192,39 +28311,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -IceConnectionNumber (); +return IceConnectionNumber (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26233,14 +28365,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -26250,13 +28383,13 @@ fi fi -# Check whether --enable-gtktest or --disable-gtktest was given. +# Check whether --enable-gtktest was given. if test "${enable_gtktest+set}" = set; then - enableval="$enable_gtktest" - + enableval=$enable_gtktest; else enable_gtktest=yes -fi; +fi + pkg_config_args=gtk+-2.0 for module in . @@ -26272,8 +28405,8 @@ fi; # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26288,29 +28421,30 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test x$PKG_CONFIG != xno ; then if pkg-config --atleast-pkgconfig-version 0.7 ; then : @@ -26324,8 +28458,8 @@ fi fi min_gtk_version=2.4.4 - echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 +echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -26439,13 +28573,22 @@ main () _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26458,19 +28601,21 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) no_gtk=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gtk" = x ; then - echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6 + { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 +echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } : else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://pkgconfig.sourceforge.net" @@ -26502,23 +28647,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26535,9 +28693,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" @@ -26555,20 +28714,20 @@ echo "$as_me: error: Test for GTK+ failed. See the file 'INSTALL' for help." >&2 rm -f conf.gtktest -echo "$as_me:$LINENO: checking if GTK+ is version 2.7.0 or newer" >&5 -echo $ECHO_N "checking if GTK+ is version 2.7.0 or newer... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if GTK+ is version 2.7.0 or newer" >&5 +echo $ECHO_N "checking if GTK+ is version 2.7.0 or newer... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-version=2.7.0 gtk+-2.0; then have_gtk_2_7=yes else have_gtk_2_7=no fi -echo "$as_me:$LINENO: result: $have_gtk_2_7" >&5 -echo "${ECHO_T}$have_gtk_2_7" >&6 +{ echo "$as_me:$LINENO: result: $have_gtk_2_7" >&5 +echo "${ECHO_T}$have_gtk_2_7" >&6; } pkg_failed=no -echo "$as_me:$LINENO: checking for GDK_PIXBUF" >&5 -echo $ECHO_N "checking for GDK_PIXBUF... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GDK_PIXBUF" >&5 +echo $ECHO_N "checking for GDK_PIXBUF... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GDK_PIXBUF_CFLAGS"; then @@ -26672,8 +28831,8 @@ See \`config.log' for more details." >&2;} else GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi @@ -26681,8 +28840,8 @@ fi # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. set dummy gdk-pixbuf-csource; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26697,28 +28856,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" ;; esac fi GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE - if test -n "$GDK_PIXBUF_CSOURCE"; then - echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 -echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6 + { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 +echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test x$GDK_PIXBUF_CSOURCE = xno; then { { echo "$as_me:$LINENO: error: Could not find gdk-pixbuf-csource in your PATH" >&5 echo "$as_me: error: Could not find gdk-pixbuf-csource in your PATH" >&2;} @@ -26727,8 +28887,8 @@ fi pkg_failed=no -echo "$as_me:$LINENO: checking for LIBART" >&5 -echo $ECHO_N "checking for LIBART... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for LIBART" >&5 +echo $ECHO_N "checking for LIBART... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$LIBART_CFLAGS"; then @@ -26832,8 +28992,8 @@ See \`config.log' for more details." >&2;} else LIBART_CFLAGS=$pkg_cv_LIBART_CFLAGS LIBART_LIBS=$pkg_cv_LIBART_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi @@ -26841,8 +29001,8 @@ fi pkg_failed=no -echo "$as_me:$LINENO: checking for FONTCONFIG" >&5 -echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for FONTCONFIG" >&5 +echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$FONTCONFIG_CFLAGS"; then @@ -26946,15 +29106,15 @@ See \`config.log' for more details." >&2;} else FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi pkg_failed=no -echo "$as_me:$LINENO: checking for PANGOFT2" >&5 -echo $ECHO_N "checking for PANGOFT2... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for PANGOFT2" >&5 +echo $ECHO_N "checking for PANGOFT2... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$PANGOFT2_CFLAGS"; then @@ -27028,28 +29188,28 @@ echo "$as_me: error: Test for PangoFT2 failed. else PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi -echo "$as_me:$LINENO: checking if Pango is version 1.9.0 or newer" >&5 -echo $ECHO_N "checking if Pango is version 1.9.0 or newer... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Pango is version 1.9.0 or newer" >&5 +echo $ECHO_N "checking if Pango is version 1.9.0 or newer... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-version=1.9.0 pango; then have_pango_1_9=yes else have_pango_1_9=no fi -echo "$as_me:$LINENO: result: $have_pango_1_9" >&5 -echo "${ECHO_T}$have_pango_1_9" >&6 +{ echo "$as_me:$LINENO: result: $have_pango_1_9" >&5 +echo "${ECHO_T}$have_pango_1_9" >&6; } gimp_save_CFLAGS=$CFLAGS CFLAGS="$PANGOFT2_CFLAGS $CFLAGS" -echo "$as_me:$LINENO: checking if Pango is built with a recent fontconfig" >&5 -echo $ECHO_N "checking if Pango is built with a recent fontconfig... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Pango is built with a recent fontconfig" >&5 +echo $ECHO_N "checking if Pango is built with a recent fontconfig... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27066,23 +29226,36 @@ FcObjectSet *os; os = FcObjectSetBuild (FC_FAMILY, FC_WIDTH); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27091,11 +29264,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fontconfig_ok=no + fontconfig_ok=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $fontconfig_ok" >&5 -echo "${ECHO_T}$fontconfig_ok" >&6 +{ echo "$as_me:$LINENO: result: $fontconfig_ok" >&5 +echo "${ECHO_T}$fontconfig_ok" >&6; } CFLAGS=$gimp_save_CFLAGS @@ -27127,8 +29301,8 @@ fi # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27143,34 +29317,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_FREETYPE_CONFIG" && ac_cv_path_FREETYPE_CONFIG="no" ;; esac fi FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG - if test -n "$FREETYPE_CONFIG"; then - echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5 -echo "${ECHO_T}$FREETYPE_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5 +echo "${ECHO_T}$FREETYPE_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$FREETYPE_CONFIG" != "xno" ; then - echo "$as_me:$LINENO: checking for freetype libraries" >&5 -echo $ECHO_N "checking for freetype libraries... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for freetype libraries" >&5 +echo $ECHO_N "checking for freetype libraries... $ECHO_C" >&6; } FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 -echo "${ECHO_T}$FREETYPE_LIBS" >&6 + { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6; } fi @@ -27184,18 +29359,19 @@ fi for ac_header in math.h ieeefp.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27206,23 +29382,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27231,15 +29420,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27248,8 +29438,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27273,9 +29468,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -27299,25 +29495,24 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -27330,13 +29525,13 @@ fi done -echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 -echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 +echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } gimp_save_LIBS=$LIBS LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27348,18 +29543,27 @@ cat >>conftest.$ac_ext <<_ACEOF int main (void) { return (log(1) != log(1.)); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -27369,8 +29573,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 gimp_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -std1" if test "$cross_compiling" = yes; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27382,43 +29586,56 @@ cat >>conftest.$ac_ext <<_ACEOF int main (void) { return (log(1) != log(1.)); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: -std1" >&5 -echo "${ECHO_T}-std1" >&6 + { echo "$as_me:$LINENO: result: -std1" >&5 +echo "${ECHO_T}-std1" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } CFLAGS=$gimp_save_CFLAGS { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + for ac_func in finite do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27444,52 +29661,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27498,13 +29722,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -27512,8 +29738,8 @@ _ACEOF else - echo "$as_me:$LINENO: checking for finite in " >&5 -echo $ECHO_N "checking for finite in ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for finite in " >&5 +echo $ECHO_N "checking for finite in ... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27530,23 +29756,36 @@ double f = 0.0; finite (f) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27555,17 +29794,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 #define HAVE_FINITE 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking for isfinite in " >&5 -echo $ECHO_N "checking for isfinite in ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for isfinite in " >&5 +echo $ECHO_N "checking for isfinite in ... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27582,23 +29821,36 @@ float f = 0.0; isfinite(f) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27608,18 +29860,20 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_ISFINITE 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -27631,8 +29885,8 @@ done LIBS=$gimp_save_LIBS -echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 -echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 +echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27649,33 +29903,46 @@ DIR *dir; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gimp_save_CFLAGS=$CFLAGS + gimp_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -posix" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27693,44 +29960,59 @@ DIR *dir; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: -posix" >&5 -echo "${ECHO_T}-posix" >&6 + { echo "$as_me:$LINENO: result: -posix" >&5 +echo "${ECHO_T}-posix" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } CFLAGS=$gimp_save_CFLAGS { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking for rint" >&5 -echo $ECHO_N "checking for rint... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for rint" >&5 +echo $ECHO_N "checking for rint... $ECHO_C" >&6; } if test "${ac_cv_func_rint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27757,52 +30039,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef rint -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char rint (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_rint) || defined (__stub___rint) +#if defined __stub_rint || defined __stub___rint choke me -#else -char (*f) () = rint; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != rint; +return rint (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27811,13 +30100,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_rint=no + ac_cv_func_rint=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_rint" >&5 -echo "${ECHO_T}$ac_cv_func_rint" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_rint" >&5 +echo "${ECHO_T}$ac_cv_func_rint" >&6; } if test $ac_cv_func_rint = yes; then cat >>confdefs.h <<\_ACEOF @@ -27826,8 +30116,8 @@ _ACEOF else - echo "$as_me:$LINENO: checking for rint in -lm" >&5 -echo $ECHO_N "checking for rint in -lm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for rint in -lm" >&5 +echo $ECHO_N "checking for rint in -lm... $ECHO_C" >&6; } if test "${ac_cv_lib_m_rint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27840,39 +30130,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char rint (); int main () { -rint (); +return rint (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27881,14 +30184,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_rint=no + ac_cv_lib_m_rint=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_rint" >&5 -echo "${ECHO_T}$ac_cv_lib_m_rint" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_rint" >&5 +echo "${ECHO_T}$ac_cv_lib_m_rint" >&6; } if test $ac_cv_lib_m_rint = yes; then cat >>confdefs.h <<\_ACEOF @@ -27912,9 +30216,9 @@ LIBS="" for ac_func in inet_ntoa do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27940,52 +30244,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27994,13 +30305,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -28008,8 +30321,8 @@ _ACEOF else -echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 -echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28022,39 +30335,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char inet_ntoa (); int main () { -inet_ntoa (); +return inet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28063,14 +30389,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_inet_ntoa=no + ac_cv_lib_nsl_inet_ntoa=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; } if test $ac_cv_lib_nsl_inet_ntoa = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 @@ -28084,8 +30411,8 @@ fi done -echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28098,39 +30425,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char socket (); int main () { -socket (); +return socket (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28139,14 +30479,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } if test $ac_cv_lib_socket_socket = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 @@ -28167,21 +30508,21 @@ LIBS=$gimp_save_LIBS # Check for MMX assembly ######################## -# Check whether --enable-mmx or --disable-mmx was given. +# Check whether --enable-mmx was given. if test "${enable_mmx+set}" = set; then - enableval="$enable_mmx" - + enableval=$enable_mmx; else enable_mmx=$have_x86 -fi; +fi -# Check whether --enable-sse or --disable-sse was given. + +# Check whether --enable-sse was given. if test "${enable_sse+set}" = set; then - enableval="$enable_sse" - + enableval=$enable_sse; else enable_sse=$enable_mmx -fi; +fi + if test "x$enable_mmx" = xyes; then @@ -28190,8 +30531,8 @@ if test "x$enable_mmx" = xyes; then if test -z "$MMX_EXTRA_CFLAGS"; then MMX_EXTRA_CFLAGS_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28208,23 +30549,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28233,11 +30587,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -MMX_EXTRA_CFLAGS_works=no + MMX_EXTRA_CFLAGS_works=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $MMX_EXTRA_CFLAGS_works" >&5 -echo "${ECHO_T}$MMX_EXTRA_CFLAGS_works" >&6 + { echo "$as_me:$LINENO: result: $MMX_EXTRA_CFLAGS_works" >&5 +echo "${ECHO_T}$MMX_EXTRA_CFLAGS_works" >&6; } CFLAGS="$MMX_EXTRA_CFLAGS_save_CFLAGS" if test "x$MMX_EXTRA_CFLAGS_works" = "xyes"; then MMX_EXTRA_CFLAGS="$flag" @@ -28247,8 +30602,8 @@ echo "${ECHO_T}$MMX_EXTRA_CFLAGS_works" >&6 SSE_EXTRA_CFLAGS= - echo "$as_me:$LINENO: checking whether we can compile MMX code" >&5 -echo $ECHO_N "checking whether we can compile MMX code... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether we can compile MMX code" >&5 +echo $ECHO_N "checking whether we can compile MMX code... $ECHO_C" >&6; } mmx_save_CFLAGS="$CFLAGS" CFLAGS="$mmx_save_CFLAGS $MMX_EXTRA_CFLAGS" @@ -28257,23 +30612,36 @@ echo $ECHO_N "checking whether we can compile MMX code... $ECHO_C" >&6 asm ("movq 0, %mm0"); _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28282,8 +30650,8 @@ cat >>confdefs.h <<\_ACEOF #define USE_MMX 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "x$enable_sse" = xyes; then @@ -28292,8 +30660,8 @@ echo "${ECHO_T}yes" >&6 if test -z "$sse_flag"; then sse_flag_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28310,23 +30678,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28335,11 +30716,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -sse_flag_works=no + sse_flag_works=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $sse_flag_works" >&5 -echo "${ECHO_T}$sse_flag_works" >&6 + { echo "$as_me:$LINENO: result: $sse_flag_works" >&5 +echo "${ECHO_T}$sse_flag_works" >&6; } CFLAGS="$sse_flag_save_CFLAGS" if test "x$sse_flag_works" = "xyes"; then sse_flag="$flag" @@ -28349,8 +30731,8 @@ echo "${ECHO_T}$sse_flag_works" >&6 SSE_EXTRA_CFLAGS="$MMX_EXTRA_CFLAGS $sse_flag" - echo "$as_me:$LINENO: checking whether we can compile SSE code" >&5 -echo $ECHO_N "checking whether we can compile SSE code... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether we can compile SSE code" >&5 +echo $ECHO_N "checking whether we can compile SSE code... $ECHO_C" >&6; } CFLAGS="$CFLAGS $sse_flag" @@ -28358,23 +30740,36 @@ echo $ECHO_N "checking whether we can compile SSE code... $ECHO_C" >&6 asm ("movntps %xmm0, 0"); _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28383,20 +30778,21 @@ cat >>confdefs.h <<\_ACEOF #define USE_SSE 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -enable_sse=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + enable_sse=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: WARNING: The assembler does not support the SSE command set." >&5 echo "$as_me: WARNING: The assembler does not support the SSE command set." >&2;} fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -28405,13 +30801,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -enable_mmx=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + enable_mmx=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: WARNING: The assembler does not support the MMX command set." >&5 echo "$as_me: WARNING: The assembler does not support the MMX command set." >&2;} fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$mmx_save_CFLAGS" @@ -28425,40 +30822,53 @@ fi # Check for Altivec assembly ############################ -# Check whether --enable-altivec or --disable-altivec was given. +# Check whether --enable-altivec was given. if test "${enable_altivec+set}" = set; then - enableval="$enable_altivec" - + enableval=$enable_altivec; else enable_altivec=$have_ppc -fi; +fi + if test "x$enable_altivec" = xyes; then - echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5 -echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5 +echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF asm ("vand %v0, %v0, %v0"); _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28467,20 +30877,21 @@ cat >>confdefs.h <<\_ACEOF #define USE_ALTIVEC 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -enable_altivec=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + enable_altivec=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5 echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;} fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -28501,11 +30912,11 @@ esac shmtype=auto -# Check whether --with-shm or --without-shm was given. +# Check whether --with-shm was given. if test "${with_shm+set}" = set; then - withval="$with_shm" - shmtype=$with_shm -fi; + withval=$with_shm; shmtype=$with_shm +fi + case $shmtype in none|sysv|posix) ;; @@ -28520,17 +30931,17 @@ if test "x$platform_win32" = "xyes"; then shmtype=win32 elif test "x$shmtype" = "xsysv"; then if test "${ac_cv_header_sys_ipc_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_ipc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 -echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 +echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28541,23 +30952,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28566,15 +30990,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 -echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 +echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28583,8 +31008,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28608,9 +31038,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -28634,25 +31065,23 @@ echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_ipc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sys_ipc_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } fi if test $ac_cv_header_sys_ipc_h = yes; then @@ -28667,17 +31096,17 @@ fi if test "${ac_cv_header_sys_shm_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_shm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 -echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 +echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28688,23 +31117,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28713,15 +31155,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 -echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 +echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28730,8 +31173,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28755,9 +31203,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -28781,25 +31230,23 @@ echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_shm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sys_shm_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } fi if test $ac_cv_header_sys_shm_h = yes; then @@ -28815,11 +31262,11 @@ fi if test "$ac_cv_header_sys_shm_h" = "yes"; then - echo "$as_me:$LINENO: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 -echo $ECHO_N "checking whether shmctl IPC_RMID allowes subsequent attaches... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 +echo $ECHO_N "checking whether shmctl IPC_RMID allowes subsequent attaches... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - echo "$as_me:$LINENO: result: assuming no" >&5 -echo "${ECHO_T}assuming no" >&6 + { echo "$as_me:$LINENO: result: assuming no" >&5 +echo "${ECHO_T}assuming no" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -28852,13 +31299,22 @@ cat >>conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28867,21 +31323,23 @@ cat >>confdefs.h <<\_ACEOF #define IPC_RMID_DEFERRED_RELEASE 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + cat >>confdefs.h <<\_ACEOF #define USE_SYSV_SHM 1 _ACEOF @@ -28892,8 +31350,8 @@ _ACEOF elif test "x$shmtype" = "xposix"; then have_shm_open=no - echo "$as_me:$LINENO: checking for shm_open" >&5 -echo $ECHO_N "checking for shm_open... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shm_open" >&5 +echo $ECHO_N "checking for shm_open... $ECHO_C" >&6; } if test "${ac_cv_func_shm_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28920,52 +31378,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shm_open -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shm_open (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shm_open) || defined (__stub___shm_open) +#if defined __stub_shm_open || defined __stub___shm_open choke me -#else -char (*f) () = shm_open; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shm_open; +return shm_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28974,13 +31439,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shm_open=no + ac_cv_func_shm_open=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shm_open" >&5 -echo "${ECHO_T}$ac_cv_func_shm_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shm_open" >&5 +echo "${ECHO_T}$ac_cv_func_shm_open" >&6; } if test $ac_cv_func_shm_open = yes; then have_shm_open=yes fi @@ -28988,8 +31454,8 @@ fi RT_LIBS= if test "$have_shm_open" != "yes"; then - echo "$as_me:$LINENO: checking for shm_open in -lrt" >&5 -echo $ECHO_N "checking for shm_open in -lrt... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shm_open in -lrt" >&5 +echo $ECHO_N "checking for shm_open in -lrt... $ECHO_C" >&6; } if test "${ac_cv_lib_rt_shm_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29002,39 +31468,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shm_open (); int main () { -shm_open (); +return shm_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29043,14 +31522,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_rt_shm_open=no + ac_cv_lib_rt_shm_open=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_rt_shm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_shm_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_shm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_shm_open" >&6; } if test $ac_cv_lib_rt_shm_open = yes; then RT_LIBS="-lrt" have_shm_open=yes fi @@ -29059,17 +31539,17 @@ fi if test "${ac_cv_header_sys_mman_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/mman.h" >&5 -echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/mman.h" >&5 +echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_mman_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sys/mman.h usability" >&5 -echo $ECHO_N "checking sys/mman.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/mman.h usability" >&5 +echo $ECHO_N "checking sys/mman.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29080,23 +31560,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29105,15 +31598,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sys/mman.h presence" >&5 -echo $ECHO_N "checking sys/mman.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/mman.h presence" >&5 +echo $ECHO_N "checking sys/mman.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29122,8 +31616,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29147,9 +31646,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -29173,25 +31673,23 @@ echo "$as_me: WARNING: sys/mman.h: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for sys/mman.h" >&5 -echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/mman.h" >&5 +echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_mman_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sys_mman_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; } fi if test $ac_cv_header_sys_mman_h = yes; then @@ -29219,18 +31717,18 @@ _ACEOF fi fi -echo "$as_me:$LINENO: checking for shared memory transport type" >&5 -echo $ECHO_N "checking for shared memory transport type... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $shmtype" >&5 -echo "${ECHO_T}$shmtype" >&6 +{ echo "$as_me:$LINENO: checking for shared memory transport type" >&5 +echo $ECHO_N "checking for shared memory transport type... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $shmtype" >&5 +echo "${ECHO_T}$shmtype" >&6; } ######################## # Define a symbol prefix ######################## -echo "$as_me:$LINENO: checking whether symbols are prefixed" >&5 -echo $ECHO_N "checking whether symbols are prefixed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether symbols are prefixed" >&5 +echo $ECHO_N "checking whether symbols are prefixed... $ECHO_C" >&6; } case "$host_os" in mingw*) @@ -29244,11 +31742,11 @@ case "$host_os" in esac if test -n "$SYMPREFIX"; then - echo "$as_me:$LINENO: result: yes, with a $SYMPREFIX" >&5 -echo "${ECHO_T}yes, with a $SYMPREFIX" >&6 + { echo "$as_me:$LINENO: result: yes, with a $SYMPREFIX" >&5 +echo "${ECHO_T}yes, with a $SYMPREFIX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -29258,11 +31756,11 @@ fi # Check for regex support in glibc ################################## -echo "$as_me:$LINENO: checking checking for regex in glibc" >&5 -echo $ECHO_N "checking checking for regex in glibc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking checking for regex in glibc" >&5 +echo $ECHO_N "checking checking for regex in glibc... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - echo "$as_me:$LINENO: result: assuming no" >&5 -echo "${ECHO_T}assuming no" >&6 + { echo "$as_me:$LINENO: result: assuming no" >&5 +echo "${ECHO_T}assuming no" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -29284,13 +31782,22 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29300,21 +31807,23 @@ cat >>confdefs.h <<\_ACEOF _ACEOF have_glibc_regex=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test x$have_glibc_regex = xyes; then HAVE_GLIBC_REGEX_TRUE= HAVE_GLIBC_REGEX_FALSE='#' @@ -29332,8 +31841,8 @@ fi ############################ if test x"$os_win32" != xyes; then - echo "$as_me:$LINENO: checking fd_set and sys/select" >&5 -echo $ECHO_N "checking fd_set and sys/select... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking fd_set and sys/select" >&5 +echo $ECHO_N "checking fd_set and sys/select... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29350,23 +31859,36 @@ fd_set readMask, writeMask; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29375,8 +31897,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gimp_ok=no + gimp_ok=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $gimp_ok = no; then cat >conftest.$ac_ext <<_ACEOF @@ -29402,8 +31925,8 @@ _ACEOF fi fi - echo "$as_me:$LINENO: result: $gimp_ok" >&5 -echo "${ECHO_T}$gimp_ok" >&6 + { echo "$as_me:$LINENO: result: $gimp_ok" >&5 +echo "${ECHO_T}$gimp_ok" >&6; } if test $gimp_ok = no; then cat >>confdefs.h <<\_ACEOF @@ -29422,14 +31945,14 @@ fi -# Check whether --enable-mp or --disable-mp was given. +# Check whether --enable-mp was given. if test "${enable_mp+set}" = set; then - enableval="$enable_mp" + enableval=$enable_mp; +fi -fi; if test "x$enable_mp" = "xyes"; then - echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5 -echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5 +echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29442,39 +31965,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_attr_init (); int main () { -pthread_attr_init (); +return pthread_attr_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29483,14 +32019,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_attr_init=no + ac_cv_lib_pthread_pthread_attr_init=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6; } if test $ac_cv_lib_pthread_pthread_attr_init = yes; then cat >>confdefs.h <<\_ACEOF @@ -29501,8 +32038,8 @@ _ACEOF GIMP_MP_FLAGS="-D_REENTRANT" else # AIX has libpthreads, cause they're special. Special friends (TM) - echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5 -echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5 +echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6; } if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29515,39 +32052,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_attr_init (); int main () { -pthread_attr_init (); +return pthread_attr_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29556,14 +32106,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthreads_pthread_attr_init=no + ac_cv_lib_pthreads_pthread_attr_init=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5 -echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5 +echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6; } if test $ac_cv_lib_pthreads_pthread_attr_init = yes; then cat >>confdefs.h <<\_ACEOF #define ENABLE_MP 1 @@ -29592,8 +32143,8 @@ if test "$gdk_target" = x11; then gimp_save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" - echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5 -echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XmuClientWindow in -lXmu" >&5 +echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6; } if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29606,39 +32157,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XmuClientWindow (); int main () { -XmuClientWindow (); +return XmuClientWindow (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29647,22 +32211,23 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xmu_XmuClientWindow=no + ac_cv_lib_Xmu_XmuClientWindow=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 -echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6; } if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then for ac_header in X11/Xmu/WinUtil.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -29676,23 +32241,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29701,12 +32279,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -29743,14 +32323,14 @@ fi ################### -# Check whether --with-libtiff or --without-libtiff was given. +# Check whether --with-libtiff was given. if test "${with_libtiff+set}" = set; then - withval="$with_libtiff" + withval=$with_libtiff; +fi -fi; if test x$with_libtiff != xno && test -z "$LIBTIFF"; then - echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5 -echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5 +echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6; } if test "${ac_cv_lib_tiff_TIFFReadScanline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29763,39 +32343,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char TIFFReadScanline (); int main () { -TIFFReadScanline (); +return TIFFReadScanline (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29804,27 +32397,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tiff_TIFFReadScanline=no + ac_cv_lib_tiff_TIFFReadScanline=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6; } if test $ac_cv_lib_tiff_TIFFReadScanline = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29835,23 +32429,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29860,15 +32467,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29877,8 +32485,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -29902,9 +32515,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -29928,25 +32542,23 @@ echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tiffio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi if test $ac_cv_header_tiffio_h = yes; then @@ -29958,8 +32570,8 @@ fi else - echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 -echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 +echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29972,39 +32584,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char TIFFWriteScanline (); int main () { -TIFFWriteScanline (); +return TIFFWriteScanline (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30013,27 +32638,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tiff_TIFFWriteScanline=no + ac_cv_lib_tiff_TIFFWriteScanline=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30044,23 +32670,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30069,15 +32708,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30086,8 +32726,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30111,9 +32756,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -30137,25 +32783,23 @@ echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tiffio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi if test $ac_cv_header_tiffio_h = yes; then @@ -30167,8 +32811,8 @@ fi else - echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 -echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 +echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30181,39 +32825,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char TIFFFlushData (); int main () { -TIFFFlushData (); +return TIFFFlushData (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30222,27 +32879,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tiff34_TIFFFlushData=no + ac_cv_lib_tiff34_TIFFFlushData=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30253,23 +32911,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30278,15 +32949,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30295,8 +32967,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30320,9 +32997,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -30346,25 +33024,23 @@ echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tiffio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi if test $ac_cv_header_tiffio_h = yes; then @@ -30405,14 +33081,14 @@ echo "$as_me: error: ################### -# Check whether --with-libjpeg or --without-libjpeg was given. +# Check whether --with-libjpeg was given. if test "${with_libjpeg+set}" = set; then - withval="$with_libjpeg" + withval=$with_libjpeg; +fi -fi; if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then - echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30425,39 +33101,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char jpeg_destroy_decompress (); int main () { -jpeg_destroy_decompress (); +return jpeg_destroy_decompress (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30466,14 +33155,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_destroy_decompress=no + ac_cv_lib_jpeg_jpeg_destroy_decompress=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then jpeg_ok=yes else @@ -30485,8 +33175,8 @@ echo "$as_me: WARNING: *** XJT plug-in will not be built (JPEG library not found fi if test "$jpeg_ok" = yes; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30501,8 +33191,13 @@ cat >>conftest.$ac_ext <<_ACEOF #undef VERSION #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30526,13 +33221,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 jpeg_ok=no fi + rm -f conftest.err conftest.$ac_ext - echo "$as_me:$LINENO: result: $jpeg_ok" >&5 -echo "${ECHO_T}$jpeg_ok" >&6 + { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 +echo "${ECHO_T}$jpeg_ok" >&6; } if test "$jpeg_ok" = yes; then JPEG='jpeg$(EXEEXT)'; LIBJPEG='-ljpeg' - echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30545,39 +33241,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char jpeg_simple_progression (); int main () { -jpeg_simple_progression (); +return jpeg_simple_progression (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30586,14 +33295,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_simple_progression=no + ac_cv_lib_jpeg_jpeg_simple_progression=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then cat >>confdefs.h <<\_ACEOF @@ -30646,8 +33356,8 @@ fi ################ if test -z "$LIBZ"; then - echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5 -echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5 +echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6; } if test "${ac_cv_lib_z_gzsetparams+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30660,39 +33370,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gzsetparams (); int main () { -gzsetparams (); +return gzsetparams (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30701,27 +33424,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_z_gzsetparams=no + ac_cv_lib_z_gzsetparams=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzsetparams" >&5 -echo "${ECHO_T}$ac_cv_lib_z_gzsetparams" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzsetparams" >&5 +echo "${ECHO_T}$ac_cv_lib_z_gzsetparams" >&6; } if test $ac_cv_lib_z_gzsetparams = yes; then if test "${ac_cv_header_zlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 +echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30732,23 +33456,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30757,15 +33494,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 +echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30774,8 +33512,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -30799,9 +33542,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -30825,25 +33569,23 @@ echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" > echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_zlib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } fi if test $ac_cv_header_zlib_h = yes; then @@ -30870,14 +33612,14 @@ fi ################## -# Check whether --with-libpng or --without-libpng was given. +# Check whether --with-libpng was given. if test "${with_libpng+set}" = set; then - withval="$with_libpng" + withval=$with_libpng; +fi -fi; if test x$with_libpng != xno && test -z "$LIBPNG" && test -n "$LIBZ"; then - echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 +echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_read_info+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30890,39 +33632,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char png_read_info (); int main () { -png_read_info (); +return png_read_info (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30931,27 +33686,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_png_png_read_info=no + ac_cv_lib_png_png_read_info=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } if test $ac_cv_lib_png_png_read_info = yes; then if test "${ac_cv_header_png_h+set}" = set; then - echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for png.h" >&5 +echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +echo "${ECHO_T}$ac_cv_header_png_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking png.h usability" >&5 +echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -30962,23 +33718,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -30987,15 +33756,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking png.h presence" >&5 +echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31004,8 +33774,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -31029,9 +33804,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -31055,25 +33831,23 @@ echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >& echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for png.h" >&5 +echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_png_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +echo "${ECHO_T}$ac_cv_header_png_h" >&6; } fi if test $ac_cv_header_png_h = yes; then @@ -31089,8 +33863,8 @@ echo "$as_me: WARNING: *** PNG plug-in will not be built (PNG library not found) fi if test "$png_ok" = yes; then - echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 +echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31107,23 +33881,36 @@ png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31132,11 +33919,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -png_ok=no + png_ok=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $png_ok" >&5 -echo "${ECHO_T}$png_ok" >&6 + { echo "$as_me:$LINENO: result: $png_ok" >&5 +echo "${ECHO_T}$png_ok" >&6; } if test "$png_ok" = yes; then PNG='png$(EXEEXT)'; LIBPNG="-lpng $LIBZ" else @@ -31168,15 +33956,15 @@ echo "$as_me: error: ################## -# Check whether --with-libmng or --without-libmng was given. +# Check whether --with-libmng was given. if test "${with_libmng+set}" = set; then - withval="$with_libmng" + withval=$with_libmng; +fi -fi; if test x$with_libmng != xno && test -z "$LIBMNG" && test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then - echo "$as_me:$LINENO: checking for mng_create in -lmng" >&5 -echo $ECHO_N "checking for mng_create in -lmng... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for mng_create in -lmng" >&5 +echo $ECHO_N "checking for mng_create in -lmng... $ECHO_C" >&6; } if test "${ac_cv_lib_mng_mng_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31189,39 +33977,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mng_create (); int main () { -mng_create (); +return mng_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31230,27 +34031,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mng_mng_create=no + ac_cv_lib_mng_mng_create=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_create" >&5 -echo "${ECHO_T}$ac_cv_lib_mng_mng_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mng_mng_create" >&5 +echo "${ECHO_T}$ac_cv_lib_mng_mng_create" >&6; } if test $ac_cv_lib_mng_mng_create = yes; then if test "${ac_cv_header_libmng_h+set}" = set; then - echo "$as_me:$LINENO: checking for libmng.h" >&5 -echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libmng.h" >&5 +echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6; } if test "${ac_cv_header_libmng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 +echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking libmng.h usability" >&5 -echo $ECHO_N "checking libmng.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libmng.h usability" >&5 +echo $ECHO_N "checking libmng.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31261,23 +34063,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31286,15 +34101,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking libmng.h presence" >&5 -echo $ECHO_N "checking libmng.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking libmng.h presence" >&5 +echo $ECHO_N "checking libmng.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31303,8 +34119,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -31328,9 +34149,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -31354,25 +34176,23 @@ echo "$as_me: WARNING: libmng.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: libmng.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: libmng.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: libmng.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for libmng.h" >&5 -echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libmng.h" >&5 +echo $ECHO_N "checking for libmng.h... $ECHO_C" >&6; } if test "${ac_cv_header_libmng_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_libmng_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 -echo "${ECHO_T}$ac_cv_header_libmng_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libmng_h" >&5 +echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; } fi if test $ac_cv_header_libmng_h = yes; then @@ -31404,16 +34224,16 @@ echo "$as_me: WARNING: *** MNG plug-in will not be built (MNG header file not fo ############################################################ -# Check whether --with-libexif or --without-libexif was given. +# Check whether --with-libexif was given. if test "${with_libexif+set}" = set; then - withval="$with_libexif" + withval=$with_libexif; +fi -fi; if test x$with_libexif != xno && test -z "$LIBEXIF" && test -n "$LIBJPEG"; then pkg_failed=no -echo "$as_me:$LINENO: checking for EXIF" >&5 -echo $ECHO_N "checking for EXIF... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for EXIF" >&5 +echo $ECHO_N "checking for EXIF... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$EXIF_CFLAGS"; then @@ -31485,8 +34305,8 @@ libexif is available from http://www.sourceforge.net/projects/libexif" >&2;} else EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS EXIF_LIBS=$pkg_cv_EXIF_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_EXIF 1 @@ -31504,14 +34324,14 @@ fi -# Check whether --with-aa or --without-aa was given. +# Check whether --with-aa was given. if test "${with_aa+set}" = set; then - withval="$with_aa" + withval=$with_aa; +fi -fi; if test x$with_aa != xno && test -z "$LIBAA"; then - echo "$as_me:$LINENO: checking for aa_printf in -laa" >&5 -echo $ECHO_N "checking for aa_printf in -laa... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for aa_printf in -laa" >&5 +echo $ECHO_N "checking for aa_printf in -laa... $ECHO_C" >&6; } if test "${ac_cv_lib_aa_aa_printf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31524,39 +34344,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char aa_printf (); int main () { -aa_printf (); +return aa_printf (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31565,27 +34398,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_aa_aa_printf=no + ac_cv_lib_aa_aa_printf=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_aa_aa_printf" >&5 -echo "${ECHO_T}$ac_cv_lib_aa_aa_printf" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_aa_aa_printf" >&5 +echo "${ECHO_T}$ac_cv_lib_aa_aa_printf" >&6; } if test $ac_cv_lib_aa_aa_printf = yes; then if test "${ac_cv_header_aalib_h+set}" = set; then - echo "$as_me:$LINENO: checking for aalib.h" >&5 -echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for aalib.h" >&5 +echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6; } if test "${ac_cv_header_aalib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 -echo "${ECHO_T}$ac_cv_header_aalib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 +echo "${ECHO_T}$ac_cv_header_aalib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking aalib.h usability" >&5 -echo $ECHO_N "checking aalib.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking aalib.h usability" >&5 +echo $ECHO_N "checking aalib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31596,23 +34430,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31621,15 +34468,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking aalib.h presence" >&5 -echo $ECHO_N "checking aalib.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking aalib.h presence" >&5 +echo $ECHO_N "checking aalib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31638,8 +34486,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -31663,9 +34516,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -31689,25 +34543,23 @@ echo "$as_me: WARNING: aalib.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: aalib.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: aalib.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: aalib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for aalib.h" >&5 -echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for aalib.h" >&5 +echo $ECHO_N "checking for aalib.h... $ECHO_C" >&6; } if test "${ac_cv_header_aalib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_aalib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 -echo "${ECHO_T}$ac_cv_header_aalib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_aalib_h" >&5 +echo "${ECHO_T}$ac_cv_header_aalib_h" >&6; } fi if test $ac_cv_header_aalib_h = yes; then @@ -31741,8 +34593,8 @@ if test "$gdk_target" = x11; then lib_X11=-lX11 fi if test -z "$LIBXPM"; then - echo "$as_me:$LINENO: checking for XpmReadFileToXpmImage in -lXpm" >&5 -echo $ECHO_N "checking for XpmReadFileToXpmImage in -lXpm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpmReadFileToXpmImage in -lXpm" >&5 +echo $ECHO_N "checking for XpmReadFileToXpmImage in -lXpm... $ECHO_C" >&6; } if test "${ac_cv_lib_Xpm_XpmReadFileToXpmImage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31755,39 +34607,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XpmReadFileToXpmImage (); int main () { -XpmReadFileToXpmImage (); +return XpmReadFileToXpmImage (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31796,27 +34661,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xpm_XpmReadFileToXpmImage=no + ac_cv_lib_Xpm_XpmReadFileToXpmImage=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&5 -echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&5 +echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&6; } if test $ac_cv_lib_Xpm_XpmReadFileToXpmImage = yes; then if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 +echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 -echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 +echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31827,23 +34693,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -31852,15 +34731,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 -echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 +echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -31869,8 +34749,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -31894,9 +34779,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -31920,25 +34806,23 @@ echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 +echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_xpm_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } fi if test $ac_cv_header_X11_xpm_h = yes; then @@ -31967,18 +34851,18 @@ LDFLAGS="$gimp_save_LDFLAGS" #################### -# Check whether --with-gtkhtml2 or --without-gtkhtml2 was given. +# Check whether --with-gtkhtml2 was given. if test "${with_gtkhtml2+set}" = set; then - withval="$with_gtkhtml2" + withval=$with_gtkhtml2; +fi -fi; have_gtkhtml2=no if test "x$with_gtkhtml2" != xno; then pkg_failed=no -echo "$as_me:$LINENO: checking for GTKHTML2" >&5 -echo $ECHO_N "checking for GTKHTML2... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GTKHTML2" >&5 +echo $ECHO_N "checking for GTKHTML2... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GTKHTML2_CFLAGS"; then @@ -32042,8 +34926,8 @@ echo "$as_me: WARNING: *** Help browser plug-in will not be built (GtkHtml2 not else GTKHTML2_CFLAGS=$pkg_cv_GTKHTML2_CFLAGS GTKHTML2_LIBS=$pkg_cv_GTKHTML2_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } have_gtkhtml2=yes fi else @@ -32071,17 +34955,17 @@ fi ################### -# Check whether --with-librsvg or --without-librsvg was given. +# Check whether --with-librsvg was given. if test "${with_librsvg+set}" = set; then - withval="$with_librsvg" + withval=$with_librsvg; +fi -fi; if test "x$with_librsvg" != xno; then pkg_failed=no -echo "$as_me:$LINENO: checking for SVG" >&5 -echo $ECHO_N "checking for SVG... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for SVG" >&5 +echo $ECHO_N "checking for SVG... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$SVG_CFLAGS"; then @@ -32145,8 +35029,8 @@ echo "$as_me: WARNING: *** SVG import plug-in will not be built (librsvg not fou else SVG_CFLAGS=$pkg_cv_SVG_CFLAGS SVG_LIBS=$pkg_cv_SVG_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SVG='svg$(EXEEXT)' LIBSVG=$SVG_LIBS fi @@ -32164,37 +35048,37 @@ fi # Check for gimp-print ###################### -# Check whether --enable-print or --disable-print was given. +# Check whether --enable-print was given. if test "${enable_print+set}" = set; then - enableval="$enable_print" + enableval=$enable_print; +fi -fi; have_gimp_print=no if test "x$enable_print" != "xno"; then -# Check whether --with-gimpprint-prefix or --without-gimpprint-prefix was given. +# Check whether --with-gimpprint-prefix was given. if test "${with_gimpprint_prefix+set}" = set; then - withval="$with_gimpprint_prefix" - gimpprint_config_prefix="$withval" + withval=$with_gimpprint_prefix; gimpprint_config_prefix="$withval" else gimpprint_config_prefix="" -fi; +fi -# Check whether --with-gimpprint-exec-prefix or --without-gimpprint-exec-prefix was given. + +# Check whether --with-gimpprint-exec-prefix was given. if test "${with_gimpprint_exec_prefix+set}" = set; then - withval="$with_gimpprint_exec_prefix" - gimpprint_config_exec_prefix="$withval" + withval=$with_gimpprint_exec_prefix; gimpprint_config_exec_prefix="$withval" else gimpprint_config_exec_prefix="" -fi; -# Check whether --enable-gimpprinttest or --disable-gimpprinttest was given. -if test "${enable_gimpprinttest+set}" = set; then - enableval="$enable_gimpprinttest" +fi +# Check whether --enable-gimpprinttest was given. +if test "${enable_gimpprinttest+set}" = set; then + enableval=$enable_gimpprinttest; else enable_gimpprinttest=yes -fi; +fi + if test x$gimpprint_config_exec_prefix != x ; then gimpprint_config_args="$gimpprint_config_args --exec-prefix=$gimpprint_config_exec_prefix" @@ -32211,8 +35095,8 @@ fi; # Extract the first word of "gimpprint-config", so it can be a program name with args. set dummy gimpprint-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GIMPPRINT_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32227,31 +35111,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GIMPPRINT_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_GIMPPRINT_CONFIG" && ac_cv_path_GIMPPRINT_CONFIG="no" ;; esac fi GIMPPRINT_CONFIG=$ac_cv_path_GIMPPRINT_CONFIG - if test -n "$GIMPPRINT_CONFIG"; then - echo "$as_me:$LINENO: result: $GIMPPRINT_CONFIG" >&5 -echo "${ECHO_T}$GIMPPRINT_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $GIMPPRINT_CONFIG" >&5 +echo "${ECHO_T}$GIMPPRINT_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + min_gimpprint_version=4.2.0 - echo "$as_me:$LINENO: checking for GIMP-PRINT - version >= $min_gimpprint_version" >&5 -echo $ECHO_N "checking for GIMP-PRINT - version >= $min_gimpprint_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GIMP-PRINT - version >= $min_gimpprint_version" >&5 +echo $ECHO_N "checking for GIMP-PRINT - version >= $min_gimpprint_version... $ECHO_C" >&6; } no_gimpprint="" if test "$GIMPPRINT_CONFIG" = "no" ; then no_gimpprint=yes @@ -32361,13 +35246,22 @@ main () _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32380,15 +35274,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) no_gimpprint=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gimpprint" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } print_version=`$GIMPPRINT_CONFIG --version` if expr $print_version \>= 4.3.0 >/dev/null; then { echo "$as_me:$LINENO: WARNING: @@ -32412,8 +35308,8 @@ echo "$as_me: WARNING: fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if test "$GIMPPRINT_CONFIG" = "no" ; then echo "*** The gimpprint-config script installed by GIMP-PRINT could not be found" echo "*** If GIMP-PRINT was installed in PREFIX, make sure PREFIX/bin is in" @@ -32446,23 +35342,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32479,12 +35388,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GIMP-PRINT was incorrectly" echo "*** installed or that you have moved GIMP-PRINT since it was installed. In the" echo "*** latter case, you may want to edit the gimpprint-config script:" echo "*** $GIMPPRINT_CONFIG" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" @@ -32533,8 +35443,8 @@ fi # Extract the first word of "libwmf-config", so it can be a program name with args. set dummy libwmf-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_WMF_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32549,35 +35459,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_WMF_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_WMF_CONFIG" && ac_cv_path_WMF_CONFIG="no" ;; esac fi WMF_CONFIG=$ac_cv_path_WMF_CONFIG - if test -n "$WMF_CONFIG"; then - echo "$as_me:$LINENO: result: $WMF_CONFIG" >&5 -echo "${ECHO_T}$WMF_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $WMF_CONFIG" >&5 +echo "${ECHO_T}$WMF_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$WMF_CONFIG" != "xno" ; then - echo "$as_me:$LINENO: checking for libwmf >= 0.2.8" >&5 -echo $ECHO_N "checking for libwmf >= 0.2.8... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libwmf >= 0.2.8" >&5 +echo $ECHO_N "checking for libwmf >= 0.2.8... $ECHO_C" >&6; } wmf_version=`$WMF_CONFIG --version` if expr $wmf_version \>= 0.2.8 >/dev/null; then - echo "$as_me:$LINENO: result: yes (version $wmf_version)" >&5 -echo "${ECHO_T}yes (version $wmf_version)" >&6 + { echo "$as_me:$LINENO: result: yes (version $wmf_version)" >&5 +echo "${ECHO_T}yes (version $wmf_version)" >&6; } WMF='wmf$(EXEEXT)' LIBWMF=`$WMF_CONFIG --libs` WMF_CFLAGS=`$WMF_CONFIG --cflags` @@ -32598,16 +35509,16 @@ fi ################ -# Check whether --with-lcms or --without-lcms was given. +# Check whether --with-lcms was given. if test "${with_lcms+set}" = set; then - withval="$with_lcms" + withval=$with_lcms; +fi -fi; have_lcms=no if test "x$with_lcms" != xno; then - echo "$as_me:$LINENO: checking for cmsCreate_sRGBProfile in -llcms" >&5 -echo $ECHO_N "checking for cmsCreate_sRGBProfile in -llcms... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for cmsCreate_sRGBProfile in -llcms" >&5 +echo $ECHO_N "checking for cmsCreate_sRGBProfile in -llcms... $ECHO_C" >&6; } if test "${ac_cv_lib_lcms_cmsCreate_sRGBProfile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32620,39 +35531,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cmsCreate_sRGBProfile (); int main () { -cmsCreate_sRGBProfile (); +return cmsCreate_sRGBProfile (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32661,28 +35585,29 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_lcms_cmsCreate_sRGBProfile=no + ac_cv_lib_lcms_cmsCreate_sRGBProfile=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsCreate_sRGBProfile" >&5 -echo "${ECHO_T}$ac_cv_lib_lcms_cmsCreate_sRGBProfile" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsCreate_sRGBProfile" >&5 +echo "${ECHO_T}$ac_cv_lib_lcms_cmsCreate_sRGBProfile" >&6; } if test $ac_cv_lib_lcms_cmsCreate_sRGBProfile = yes; then if test "${ac_cv_header_lcms_h+set}" = set; then - echo "$as_me:$LINENO: checking for lcms.h" >&5 -echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for lcms.h" >&5 +echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; } if test "${ac_cv_header_lcms_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5 -echo "${ECHO_T}$ac_cv_header_lcms_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5 +echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking lcms.h usability" >&5 -echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking lcms.h usability" >&5 +echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32693,23 +35618,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32718,15 +35656,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking lcms.h presence" >&5 -echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking lcms.h presence" >&5 +echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32735,8 +35674,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -32760,9 +35704,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -32786,25 +35731,23 @@ echo "$as_me: WARNING: lcms.h: section \"Present But Cannot Be Compiled\"" > echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for lcms.h" >&5 -echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for lcms.h" >&5 +echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; } if test "${ac_cv_header_lcms_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_lcms_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5 -echo "${ECHO_T}$ac_cv_header_lcms_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5 +echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; } fi if test $ac_cv_header_lcms_h = yes; then @@ -32812,17 +35755,17 @@ if test $ac_cv_header_lcms_h = yes; then else if test "${ac_cv_header_lcms_lcms_h+set}" = set; then - echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5 -echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5 +echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; } if test "${ac_cv_header_lcms_lcms_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5 -echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5 +echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5 -echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5 +echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32833,23 +35776,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -32858,15 +35814,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5 -echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5 +echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32875,8 +35832,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -32900,9 +35862,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -32926,25 +35889,23 @@ echo "$as_me: WARNING: lcms/lcms.h: section \"Present But Cannot Be Compiled echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5 -echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5 +echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; } if test "${ac_cv_header_lcms_lcms_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_lcms_lcms_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5 -echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5 +echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; } fi if test $ac_cv_header_lcms_lcms_h = yes; then @@ -32998,43 +35959,43 @@ alsa_save_LIBS="$LIBS" alsa_found=yes -# Check whether --with-alsa-prefix or --without-alsa-prefix was given. +# Check whether --with-alsa-prefix was given. if test "${with_alsa_prefix+set}" = set; then - withval="$with_alsa_prefix" - alsa_prefix="$withval" + withval=$with_alsa_prefix; alsa_prefix="$withval" else alsa_prefix="" -fi; +fi -# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given. + +# Check whether --with-alsa-inc-prefix was given. if test "${with_alsa_inc_prefix+set}" = set; then - withval="$with_alsa_inc_prefix" - alsa_inc_prefix="$withval" + withval=$with_alsa_inc_prefix; alsa_inc_prefix="$withval" else alsa_inc_prefix="" -fi; +fi -# Check whether --enable-alsatest or --disable-alsatest was given. + +# Check whether --enable-alsatest was given. if test "${enable_alsatest+set}" = set; then - enableval="$enable_alsatest" - enable_alsatest="$enableval" + enableval=$enable_alsatest; enable_alsatest="$enableval" else enable_alsatest=yes -fi; +fi -echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5 -echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5 +echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6; } if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" CFLAGS="$CFLAGS -I$alsa_inc_prefix" fi -echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 -echo "${ECHO_T}$ALSA_CFLAGS" >&6 +{ echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 +echo "${ECHO_T}$ALSA_CFLAGS" >&6; } CFLAGS="$alsa_save_CFLAGS" -echo "$as_me:$LINENO: checking for ALSA LDFLAGS" >&5 -echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ALSA LDFLAGS" >&5 +echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6; } if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LDFLAGS="$LDFLAGS $ALSA_LIBS" @@ -33046,12 +36007,12 @@ LIBS=`echo $LIBS | sed 's/-ldl//'` LIBS=`echo $LIBS | sed 's/-lpthread//'` LIBS=`echo $LIBS | sed 's/ //'` LIBS="$ALSA_LIBS $LIBS" -echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 -echo "${ECHO_T}$ALSA_LIBS" >&6 +{ echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 +echo "${ECHO_T}$ALSA_LIBS" >&6; } min_alsa_version=1.0.0 -echo "$as_me:$LINENO: checking for libasound headers version >= $min_alsa_version" >&5 -echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libasound headers version >= $min_alsa_version" >&5 +echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6; } no_alsa="" alsa_min_major_version=`echo $min_alsa_version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -33061,7 +36022,6 @@ no_alsa="" sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33118,38 +36078,52 @@ exit(0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: found." >&5 -echo "${ECHO_T}found." >&6 + { echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: not present." >&5 -echo "${ECHO_T}not present." >&6 + { echo "$as_me:$LINENO: result: not present." >&5 +echo "${ECHO_T}not present." >&6; } alsa_found=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -33160,8 +36134,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "x$enable_alsatest" = "xyes"; then -echo "$as_me:$LINENO: checking for snd_ctl_open in -lasound" >&5 -echo $ECHO_N "checking for snd_ctl_open in -lasound... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for snd_ctl_open in -lasound" >&5 +echo $ECHO_N "checking for snd_ctl_open in -lasound... $ECHO_C" >&6; } if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33174,39 +36148,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char snd_ctl_open (); int main () { -snd_ctl_open (); +return snd_ctl_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33215,14 +36202,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_asound_snd_ctl_open=no + ac_cv_lib_asound_snd_ctl_open=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_ctl_open" >&5 -echo "${ECHO_T}$ac_cv_lib_asound_snd_ctl_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_ctl_open" >&5 +echo "${ECHO_T}$ac_cv_lib_asound_snd_ctl_open" >&6; } if test $ac_cv_lib_asound_snd_ctl_open = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBASOUND 1 @@ -33264,26 +36252,26 @@ fi ####################### -# Check whether --with-linux-input or --without-linux-input was given. +# Check whether --with-linux-input was given. if test "${with_linux_input+set}" = set; then - withval="$with_linux_input" + withval=$with_linux_input; +fi -fi; have_linux_input=no if test "x$with_linux_input" != "xno"; then if test "${ac_cv_header_linux_input_h+set}" = set; then - echo "$as_me:$LINENO: checking for linux/input.h" >&5 -echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for linux/input.h" >&5 +echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6; } if test "${ac_cv_header_linux_input_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking linux/input.h usability" >&5 -echo $ECHO_N "checking linux/input.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking linux/input.h usability" >&5 +echo $ECHO_N "checking linux/input.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33294,23 +36282,36 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -33319,15 +36320,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking linux/input.h presence" >&5 -echo $ECHO_N "checking linux/input.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking linux/input.h presence" >&5 +echo $ECHO_N "checking linux/input.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33336,8 +36338,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -33361,9 +36368,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -33387,25 +36395,23 @@ echo "$as_me: WARNING: linux/input.h: section \"Present But Cannot Be Compil echo "$as_me: WARNING: linux/input.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: linux/input.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: linux/input.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX + ( cat <<\_ASBOX ## ------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP ## ## ------------------------------------------------------------------- ## _ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for linux/input.h" >&5 -echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for linux/input.h" >&5 +echo $ECHO_N "checking for linux/input.h... $ECHO_C" >&6; } if test "${ac_cv_header_linux_input_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_linux_input_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_input_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_input_h" >&6; } fi if test $ac_cv_header_linux_input_h = yes; then @@ -33437,11 +36443,11 @@ fi ############################################################ -# Check whether --with-gif-compression or --without-gif-compression was given. +# Check whether --with-gif-compression was given. if test "${with_gif_compression+set}" = set; then - withval="$with_gif_compression" + withval=$with_gif_compression; +fi -fi; case x"$with_gif_compression" in xnone) @@ -33464,11 +36470,11 @@ esac #################### -# Check whether --with-sendmail or --without-sendmail was given. +# Check whether --with-sendmail was given. if test "${with_sendmail+set}" = set; then - withval="$with_sendmail" + withval=$with_sendmail; +fi -fi; if test "x$with_sendmail" != "x"; then sendmail_path=$with_sendmail @@ -33478,8 +36484,8 @@ fi # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SENDMAIL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33494,27 +36500,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SENDMAIL=$ac_cv_path_SENDMAIL - if test -n "$SENDMAIL"; then - echo "$as_me:$LINENO: result: $SENDMAIL" >&5 -echo "${ECHO_T}$SENDMAIL" >&6 + { echo "$as_me:$LINENO: result: $SENDMAIL" >&5 +echo "${ECHO_T}$SENDMAIL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$SENDMAIL" != "x"; then cat >>confdefs.h <<_ACEOF @@ -33532,8 +36539,8 @@ for ac_prog in perl5 perl perl5.005 perl5.004 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33548,27 +36555,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PERL=$ac_cv_path_PERL - if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 + { echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$PERL" && break done test -n "$PERL" || PERL="perl" @@ -33576,13 +36584,13 @@ test -n "$PERL" || PERL="perl" -# Check whether --with-pdbgen or --without-pdbgen was given. +# Check whether --with-pdbgen was given. if test "${with_pdbgen+set}" = set; then - withval="$with_pdbgen" - + withval=$with_pdbgen; else with_pdbgen=$enable_maintainer_mode -fi; +fi + @@ -33600,13 +36608,13 @@ fi # Check for python ################## -# Check whether --enable-python or --disable-python was given. +# Check whether --enable-python was given. if test "${enable_python+set}" = set; then - enableval="$enable_python" - + enableval=$enable_python; else enable_python=no -fi; +fi + if test "x$enable_python" != xno; then @@ -33616,8 +36624,8 @@ if test "x$enable_python" != xno; then if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 -echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6; } prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -33630,8 +36638,8 @@ sys.exit(sys.hexversion < minverhex)" ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: too old" >&5 echo "$as_me: error: too old" >&2;} @@ -33642,8 +36650,8 @@ fi else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 -echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 +echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6; } if test "${am_cv_pathless_PYTHON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33667,16 +36675,16 @@ fi done fi -echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 -echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PYTHON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33691,27 +36699,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then - echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6 + { echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi am_display_PYTHON=$am_cv_pathless_PYTHON fi @@ -33724,15 +36733,15 @@ echo "$as_me: error: no suitable Python interpreter found" >&2;} else - echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 -echo "${ECHO_T}$am_cv_python_version" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +echo "${ECHO_T}$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -33743,30 +36752,30 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; } if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 -echo "${ECHO_T}$am_cv_python_platform" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +echo "${ECHO_T}$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform - echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; } if test "${am_cv_python_pythondir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&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 || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi -echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -echo "${ECHO_T}$am_cv_python_pythondir" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -33774,16 +36783,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" >&6 pkgpythondir=\${pythondir}/$PACKAGE - echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; } if test "${am_cv_python_pyexecdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&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"` fi -echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -33796,8 +36805,8 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 -echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 -echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 +echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" @@ -33815,8 +36824,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -33833,27 +36847,28 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: could not find Python headers" >&5 echo "$as_me: error: could not find Python headers" >&2;} { (exit 1); exit 1; }; } fi + rm -f conftest.err conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" pkg_failed=no -echo "$as_me:$LINENO: checking for PYGTK" >&5 -echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for PYGTK" >&5 +echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$PYGTK_CFLAGS"; then @@ -33957,8 +36972,8 @@ See \`config.log' for more details." >&2;} else PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS PYGTK_LIBS=$pkg_cv_PYGTK_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi @@ -33969,8 +36984,8 @@ fi if test -z "$PYGIMP_EXTRA_CFLAGS"; then PYGIMP_EXTRA_CFLAGS_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -33987,23 +37002,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -34012,11 +37040,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -PYGIMP_EXTRA_CFLAGS_works=no + PYGIMP_EXTRA_CFLAGS_works=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $PYGIMP_EXTRA_CFLAGS_works" >&5 -echo "${ECHO_T}$PYGIMP_EXTRA_CFLAGS_works" >&6 + { echo "$as_me:$LINENO: result: $PYGIMP_EXTRA_CFLAGS_works" >&5 +echo "${ECHO_T}$PYGIMP_EXTRA_CFLAGS_works" >&6; } CFLAGS="$PYGIMP_EXTRA_CFLAGS_save_CFLAGS" if test "x$PYGIMP_EXTRA_CFLAGS_works" = "xyes"; then PYGIMP_EXTRA_CFLAGS="$flag" @@ -34063,8 +37092,8 @@ fi # Check for Mac OS X TWAIN framework (can't build on Darwin) ############################################################ -echo "$as_me:$LINENO: checking checking for Mac OS X TWAIN support" >&5 -echo $ECHO_N "checking checking for Mac OS X TWAIN support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking checking for Mac OS X TWAIN support" >&5 +echo $ECHO_N "checking checking for Mac OS X TWAIN support... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -34076,8 +37105,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -34101,9 +37135,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 twain_ok=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $twain_ok" >&5 -echo "${ECHO_T}$twain_ok" >&6 +{ echo "$as_me:$LINENO: result: $twain_ok" >&5 +echo "${ECHO_T}$twain_ok" >&6; } if test x$twain_ok = xyes; then @@ -34121,11 +37156,11 @@ fi ########################################################## -# Check whether --with-desktop-dir or --without-desktop-dir was given. +# Check whether --with-desktop-dir was given. if test "${with_desktop_dir+set}" = set; then - withval="$with_desktop_dir" + withval=$with_desktop_dir; +fi -fi; if test "x$with_desktop_dir" != x; then DESKTOP_DATADIR=$with_desktop_dir @@ -34152,8 +37187,8 @@ fi # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XMLLINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34168,30 +37203,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="no" ;; esac fi XMLLINT=$ac_cv_path_XMLLINT - if test -n "$XMLLINT"; then - echo "$as_me:$LINENO: result: $XMLLINT" >&5 -echo "${ECHO_T}$XMLLINT" >&6 + { echo "$as_me:$LINENO: result: $XMLLINT" >&5 +echo "${ECHO_T}$XMLLINT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$XMLLINT" != "xno"; then HAVE_XMLLINT_TRUE= HAVE_XMLLINT_FALSE='#' @@ -34203,8 +37239,8 @@ fi # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XSLTPROC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34219,30 +37255,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" ;; esac fi XSLTPROC=$ac_cv_path_XSLTPROC - if test -n "$XSLTPROC"; then - echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -echo "${ECHO_T}$XSLTPROC" >&6 + { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +echo "${ECHO_T}$XSLTPROC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$XSLTPROC" != "xno"; then HAVE_XSLTPROC_TRUE= HAVE_XSLTPROC_FALSE='#' @@ -34259,31 +37296,31 @@ fi -# Check whether --with-html-dir or --without-html-dir was given. +# Check whether --with-html-dir was given. if test "${with_html_dir+set}" = set; then - withval="$with_html_dir" - + withval=$with_html_dir; else with_html_dir='${datadir}/gtk-doc/html' -fi; +fi + HTML_DIR="$with_html_dir" - # Check whether --enable-gtk-doc or --disable-gtk-doc was given. + # Check whether --enable-gtk-doc was given. if test "${enable_gtk_doc+set}" = set; then - enableval="$enable_gtk_doc" - + enableval=$enable_gtk_doc; else enable_gtk_doc=no -fi; +fi + have_gtk_doc=no if test x$enable_gtk_doc = xyes; then if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34298,28 +37335,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then have_gtk_doc=yes @@ -34327,14 +37365,14 @@ fi gtk_doc_min_version=1.0 if test "$have_gtk_doc" = yes; then - echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 -echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 +echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } have_gtk_doc=no fi fi @@ -34382,13 +37420,13 @@ fi # Allow to configure the gimp environment ######################################### -# Check whether --enable-default-binary or --disable-default-binary was given. +# Check whether --enable-default-binary was given. if test "${enable_default_binary+set}" = set; then - enableval="$enable_default_binary" - + enableval=$enable_default_binary; else enable_default_binary=yes -fi; +fi + @@ -34402,13 +37440,13 @@ fi -# Check whether --enable-gimp-console or --disable-gimp-console was given. +# Check whether --enable-gimp-console was given. if test "${enable_gimp_console+set}" = set; then - enableval="$enable_gimp_console" - + enableval=$enable_gimp_console; else enable_gimp_console=no -fi; +fi + @@ -34424,15 +37462,15 @@ fi gimpdir=.gimp-2.2 -# Check whether --with-gimpdir or --without-gimpdir was given. +# Check whether --with-gimpdir was given. if test "${with_gimpdir+set}" = set; then - withval="$with_gimpdir" - if eval "test x$with_gimpdir != x"; then + withval=$with_gimpdir; if eval "test x$with_gimpdir != x"; then if eval "test x$with_gimpdir != xyes"; then gimpdir=$with_gimpdir fi fi -fi; +fi + gimpdatadir="$datadir/$PACKAGE/2.0" gimpplugindir="$libdir/$PACKAGE/2.0" @@ -34518,19 +37556,19 @@ GIMP_MODULES=modules - ac_config_commands="$ac_config_commands libgimpbase/gimpversion.h" +ac_config_commands="$ac_config_commands libgimpbase/gimpversion.h" - ac_config_files="$ac_config_files gimptool-win32.c tools/Makefile tools/pdbgen/Makefile regexrepl/Makefile libgimp/Makefile libgimpbase/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/base/Makefile app/config/Makefile app/core/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/paint-funcs/Makefile app/composite/Makefile app/pdb/Makefile app/plug-in/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile plug-ins/Makefile plug-ins/dbbrowser/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/siod/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/xjt/Makefile plug-ins/FractalExplorer/Makefile plug-ins/FractalExplorer/examples/Makefile plug-ins/Lighting/Makefile plug-ins/Lighting/images/Makefile plug-ins/MapObject/Makefile plug-ins/bmp/Makefile plug-ins/common/Makefile plug-ins/faxg3/Makefile plug-ins/fits/Makefile plug-ins/flame/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/gflare/Makefile plug-ins/gflare/gflares/Makefile plug-ins/gfli/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/help/Makefile plug-ins/helpbrowser/Makefile plug-ins/ifscompose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/maze/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/doc/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/rcm/Makefile plug-ins/rcm/images/Makefile plug-ins/sel2path/Makefile plug-ins/sgi/Makefile plug-ins/twain/Makefile plug-ins/winicon/Makefile plug-ins/winsnap/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version docs/Makefile menus/Makefile tips/Makefile cursors/Makefile themes/Makefile themes/Default/Makefile themes/Default/images/Makefile themes/Default/images/preferences/Makefile themes/Small/Makefile data/Makefile data/environ/Makefile data/misc/Makefile data/misc/gimp.desktop.in data/misc/gimp.keys data/misc/gimp.applications data/images/Makefile data/brushes/Makefile data/gradients/Makefile data/palettes/Makefile data/patterns/Makefile etc/Makefile m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-script-fu/Makefile.in gimp-zip Makefile" +ac_config_files="$ac_config_files gimptool-win32.c tools/Makefile tools/pdbgen/Makefile regexrepl/Makefile libgimp/Makefile libgimpbase/Makefile libgimpcolor/Makefile libgimpmath/Makefile libgimpmodule/Makefile libgimpthumb/Makefile libgimpwidgets/Makefile app/Makefile app/actions/Makefile app/base/Makefile app/config/Makefile app/core/Makefile app/dialogs/Makefile app/display/Makefile app/file/Makefile app/gui/Makefile app/menus/Makefile app/paint/Makefile app/paint-funcs/Makefile app/composite/Makefile app/pdb/Makefile app/plug-in/Makefile app/text/Makefile app/tools/Makefile app/vectors/Makefile app/widgets/Makefile app/xcf/Makefile plug-ins/Makefile plug-ins/dbbrowser/Makefile plug-ins/script-fu/Makefile plug-ins/script-fu/siod/Makefile plug-ins/script-fu/scripts/Makefile plug-ins/script-fu/scripts/images/Makefile plug-ins/xjt/Makefile plug-ins/FractalExplorer/Makefile plug-ins/FractalExplorer/examples/Makefile plug-ins/Lighting/Makefile plug-ins/Lighting/images/Makefile plug-ins/MapObject/Makefile plug-ins/bmp/Makefile plug-ins/common/Makefile plug-ins/faxg3/Makefile plug-ins/fits/Makefile plug-ins/flame/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile plug-ins/gfig/images/Makefile plug-ins/gflare/Makefile plug-ins/gflare/gflares/Makefile plug-ins/gfli/Makefile plug-ins/gimpressionist/Makefile plug-ins/gimpressionist/Brushes/Makefile plug-ins/gimpressionist/Paper/Makefile plug-ins/gimpressionist/Presets/Makefile plug-ins/help/Makefile plug-ins/helpbrowser/Makefile plug-ins/ifscompose/Makefile plug-ins/imagemap/Makefile plug-ins/imagemap/images/Makefile plug-ins/maze/Makefile plug-ins/pagecurl/Makefile plug-ins/print/Makefile plug-ins/pygimp/Makefile plug-ins/pygimp/doc/Makefile plug-ins/pygimp/plug-ins/Makefile plug-ins/rcm/Makefile plug-ins/rcm/images/Makefile plug-ins/sel2path/Makefile plug-ins/sgi/Makefile plug-ins/twain/Makefile plug-ins/winicon/Makefile plug-ins/winsnap/Makefile modules/Makefile devel-docs/Makefile devel-docs/app/Makefile devel-docs/app/version devel-docs/libgimp/Makefile devel-docs/libgimp/version devel-docs/libgimpbase/Makefile devel-docs/libgimpbase/version devel-docs/libgimpcolor/Makefile devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile devel-docs/libgimpwidgets/version docs/Makefile menus/Makefile tips/Makefile cursors/Makefile themes/Makefile themes/Default/Makefile themes/Default/images/Makefile themes/Default/images/preferences/Makefile themes/Small/Makefile data/Makefile data/environ/Makefile data/misc/Makefile data/misc/gimp.desktop.in data/misc/gimp.keys data/misc/gimp.applications data/images/Makefile data/brushes/Makefile data/gradients/Makefile data/palettes/Makefile data/patterns/Makefile etc/Makefile m4macros/Makefile po/Makefile.in po-libgimp/Makefile.in po-plug-ins/Makefile.in po-script-fu/Makefile.in gimp-zip Makefile" - ac_config_files="$ac_config_files docs/gimp-2.2.1:docs/gimp.1.in docs/gimprc-2.2.5:docs/gimprc.5.in docs/gimptool-2.0.1:docs/gimptool.1.in docs/gimp-remote-2.2.1:docs/gimp-remote.1.in gimptool-2.0:gimptool-2.0.in gimp-2.0.pc:gimp.pc.in gimpthumb-2.0.pc:gimpthumb.pc.in gimpui-2.0.pc:gimpui.pc.in" +ac_config_files="$ac_config_files docs/gimp-2.2.1:docs/gimp.1.in docs/gimprc-2.2.5:docs/gimprc.5.in docs/gimptool-2.0.1:docs/gimptool.1.in docs/gimp-remote-2.2.1:docs/gimp-remote.1.in gimptool-2.0:gimptool-2.0.in gimp-2.0.pc:gimp.pc.in gimpthumb-2.0.pc:gimpthumb.pc.in gimpui-2.0.pc:gimpui.pc.in" - ac_config_commands="$ac_config_commands chmod-scripts" +ac_config_commands="$ac_config_commands chmod-scripts" - ac_config_commands="$ac_config_commands sed-po-makefiles" +ac_config_commands="$ac_config_commands sed-po-makefiles" cat >confcache <<\_ACEOF @@ -34551,39 +37589,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -34592,32 +37649,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -34695,7 +37738,7 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi - ac_config_commands="$ac_config_commands po/stamp-it" + ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${HAVE_GLIBC_REGEX_TRUE}" && test -z "${HAVE_GLIBC_REGEX_FALSE}"; then @@ -34855,66 +37898,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -34935,126 +37927,198 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -35063,7 +38127,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -35072,31 +38148,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by GIMP $as_me 2.2.11, which was -generated by GNU Autoconf 2.59. Invocation command line was +# values after options handling. +ac_log=" +This file was extended by GIMP $as_me 2.2.12, which was +generated by GNU Autoconf 2.59e. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -35104,30 +38163,20 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -35154,19 +38203,21 @@ Configuration commands: $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GIMP config.status 2.2.11 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +GIMP config.status 2.2.12 +configured by $0, generated by GNU Autoconf 2.59e, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -35177,39 +38228,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -35219,18 +38255,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -35246,17 +38288,28 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" @@ -35267,164 +38320,165 @@ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}' gimp_major_ver=2 gimp_minor_ver=2 - gimp_micro_ver=11 - gimp_ver=2.2.11 + gimp_micro_ver=12 + gimp_ver=2.2.12 gimp_api_ver=2.0 _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "gimptool-win32.c" ) CONFIG_FILES="$CONFIG_FILES gimptool-win32.c" ;; - "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/pdbgen/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/pdbgen/Makefile" ;; - "regexrepl/Makefile" ) CONFIG_FILES="$CONFIG_FILES regexrepl/Makefile" ;; - "libgimp/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimp/Makefile" ;; - "libgimpbase/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpbase/Makefile" ;; - "libgimpcolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpcolor/Makefile" ;; - "libgimpmath/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpmath/Makefile" ;; - "libgimpmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpmodule/Makefile" ;; - "libgimpthumb/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpthumb/Makefile" ;; - "libgimpwidgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES libgimpwidgets/Makefile" ;; - "app/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/Makefile" ;; - "app/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/actions/Makefile" ;; - "app/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/base/Makefile" ;; - "app/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/config/Makefile" ;; - "app/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/core/Makefile" ;; - "app/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/dialogs/Makefile" ;; - "app/display/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/display/Makefile" ;; - "app/file/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/file/Makefile" ;; - "app/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/gui/Makefile" ;; - "app/menus/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/menus/Makefile" ;; - "app/paint/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/paint/Makefile" ;; - "app/paint-funcs/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/paint-funcs/Makefile" ;; - "app/composite/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/composite/Makefile" ;; - "app/pdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/pdb/Makefile" ;; - "app/plug-in/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/plug-in/Makefile" ;; - "app/text/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/text/Makefile" ;; - "app/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/tools/Makefile" ;; - "app/vectors/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/vectors/Makefile" ;; - "app/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/widgets/Makefile" ;; - "app/xcf/Makefile" ) CONFIG_FILES="$CONFIG_FILES app/xcf/Makefile" ;; - "plug-ins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/Makefile" ;; - "plug-ins/dbbrowser/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/dbbrowser/Makefile" ;; - "plug-ins/script-fu/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/Makefile" ;; - "plug-ins/script-fu/siod/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/siod/Makefile" ;; - "plug-ins/script-fu/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/scripts/Makefile" ;; - "plug-ins/script-fu/scripts/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/scripts/images/Makefile" ;; - "plug-ins/xjt/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/xjt/Makefile" ;; - "plug-ins/FractalExplorer/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/FractalExplorer/Makefile" ;; - "plug-ins/FractalExplorer/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/FractalExplorer/examples/Makefile" ;; - "plug-ins/Lighting/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/Lighting/Makefile" ;; - "plug-ins/Lighting/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/Lighting/images/Makefile" ;; - "plug-ins/MapObject/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/MapObject/Makefile" ;; - "plug-ins/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/bmp/Makefile" ;; - "plug-ins/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/common/Makefile" ;; - "plug-ins/faxg3/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/faxg3/Makefile" ;; - "plug-ins/fits/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/fits/Makefile" ;; - "plug-ins/flame/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/flame/Makefile" ;; - "plug-ins/gfig/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/Makefile" ;; - "plug-ins/gfig/gfig-examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/gfig-examples/Makefile" ;; - "plug-ins/gfig/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/images/Makefile" ;; - "plug-ins/gflare/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gflare/Makefile" ;; - "plug-ins/gflare/gflares/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gflare/gflares/Makefile" ;; - "plug-ins/gfli/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gfli/Makefile" ;; - "plug-ins/gimpressionist/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Makefile" ;; - "plug-ins/gimpressionist/Brushes/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Brushes/Makefile" ;; - "plug-ins/gimpressionist/Paper/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Paper/Makefile" ;; - "plug-ins/gimpressionist/Presets/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Presets/Makefile" ;; - "plug-ins/help/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/help/Makefile" ;; - "plug-ins/helpbrowser/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/helpbrowser/Makefile" ;; - "plug-ins/ifscompose/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/ifscompose/Makefile" ;; - "plug-ins/imagemap/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/imagemap/Makefile" ;; - "plug-ins/imagemap/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/imagemap/images/Makefile" ;; - "plug-ins/maze/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/maze/Makefile" ;; - "plug-ins/pagecurl/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/pagecurl/Makefile" ;; - "plug-ins/print/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/print/Makefile" ;; - "plug-ins/pygimp/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/Makefile" ;; - "plug-ins/pygimp/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/doc/Makefile" ;; - "plug-ins/pygimp/plug-ins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/plug-ins/Makefile" ;; - "plug-ins/rcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/rcm/Makefile" ;; - "plug-ins/rcm/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/rcm/images/Makefile" ;; - "plug-ins/sel2path/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/sel2path/Makefile" ;; - "plug-ins/sgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/sgi/Makefile" ;; - "plug-ins/twain/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/twain/Makefile" ;; - "plug-ins/winicon/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/winicon/Makefile" ;; - "plug-ins/winsnap/Makefile" ) CONFIG_FILES="$CONFIG_FILES plug-ins/winsnap/Makefile" ;; - "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; - "devel-docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/Makefile" ;; - "devel-docs/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/app/Makefile" ;; - "devel-docs/app/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/app/version" ;; - "devel-docs/libgimp/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimp/Makefile" ;; - "devel-docs/libgimp/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimp/version" ;; - "devel-docs/libgimpbase/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpbase/Makefile" ;; - "devel-docs/libgimpbase/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpbase/version" ;; - "devel-docs/libgimpcolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpcolor/Makefile" ;; - "devel-docs/libgimpcolor/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpcolor/version" ;; - "devel-docs/libgimpmath/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmath/Makefile" ;; - "devel-docs/libgimpmath/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmath/version" ;; - "devel-docs/libgimpmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmodule/Makefile" ;; - "devel-docs/libgimpmodule/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmodule/version" ;; - "devel-docs/libgimpthumb/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpthumb/Makefile" ;; - "devel-docs/libgimpthumb/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpthumb/version" ;; - "devel-docs/libgimpwidgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpwidgets/Makefile" ;; - "devel-docs/libgimpwidgets/version" ) CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpwidgets/version" ;; - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "menus/Makefile" ) CONFIG_FILES="$CONFIG_FILES menus/Makefile" ;; - "tips/Makefile" ) CONFIG_FILES="$CONFIG_FILES tips/Makefile" ;; - "cursors/Makefile" ) CONFIG_FILES="$CONFIG_FILES cursors/Makefile" ;; - "themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Makefile" ;; - "themes/Default/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Default/Makefile" ;; - "themes/Default/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Default/images/Makefile" ;; - "themes/Default/images/preferences/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Default/images/preferences/Makefile" ;; - "themes/Small/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/Small/Makefile" ;; - "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/environ/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/environ/Makefile" ;; - "data/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;; - "data/misc/gimp.desktop.in" ) CONFIG_FILES="$CONFIG_FILES data/misc/gimp.desktop.in" ;; - "data/misc/gimp.keys" ) CONFIG_FILES="$CONFIG_FILES data/misc/gimp.keys" ;; - "data/misc/gimp.applications" ) CONFIG_FILES="$CONFIG_FILES data/misc/gimp.applications" ;; - "data/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/images/Makefile" ;; - "data/brushes/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/brushes/Makefile" ;; - "data/gradients/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/gradients/Makefile" ;; - "data/palettes/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/palettes/Makefile" ;; - "data/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/patterns/Makefile" ;; - "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; - "m4macros/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "po-libgimp/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po-libgimp/Makefile.in" ;; - "po-plug-ins/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po-plug-ins/Makefile.in" ;; - "po-script-fu/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po-script-fu/Makefile.in" ;; - "gimp-zip" ) CONFIG_FILES="$CONFIG_FILES gimp-zip" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "docs/gimp-2.2.1" ) CONFIG_FILES="$CONFIG_FILES docs/gimp-2.2.1:docs/gimp.1.in" ;; - "docs/gimprc-2.2.5" ) CONFIG_FILES="$CONFIG_FILES docs/gimprc-2.2.5:docs/gimprc.5.in" ;; - "docs/gimptool-2.0.1" ) CONFIG_FILES="$CONFIG_FILES docs/gimptool-2.0.1:docs/gimptool.1.in" ;; - "docs/gimp-remote-2.2.1" ) CONFIG_FILES="$CONFIG_FILES docs/gimp-remote-2.2.1:docs/gimp-remote.1.in" ;; - "gimptool-2.0" ) CONFIG_FILES="$CONFIG_FILES gimptool-2.0:gimptool-2.0.in" ;; - "gimp-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gimp-2.0.pc:gimp.pc.in" ;; - "gimpthumb-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gimpthumb-2.0.pc:gimpthumb.pc.in" ;; - "gimpui-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gimpui-2.0.pc:gimpui.pc.in" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "libgimpbase/gimpversion.h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libgimpbase/gimpversion.h" ;; - "chmod-scripts" ) CONFIG_COMMANDS="$CONFIG_COMMANDS chmod-scripts" ;; - "sed-po-makefiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS sed-po-makefiles" ;; - "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "libgimpbase/gimpversion.h") CONFIG_COMMANDS="$CONFIG_COMMANDS libgimpbase/gimpversion.h" ;; + "gimptool-win32.c") CONFIG_FILES="$CONFIG_FILES gimptool-win32.c" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "tools/pdbgen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/pdbgen/Makefile" ;; + "regexrepl/Makefile") CONFIG_FILES="$CONFIG_FILES regexrepl/Makefile" ;; + "libgimp/Makefile") CONFIG_FILES="$CONFIG_FILES libgimp/Makefile" ;; + "libgimpbase/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpbase/Makefile" ;; + "libgimpcolor/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpcolor/Makefile" ;; + "libgimpmath/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpmath/Makefile" ;; + "libgimpmodule/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpmodule/Makefile" ;; + "libgimpthumb/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpthumb/Makefile" ;; + "libgimpwidgets/Makefile") CONFIG_FILES="$CONFIG_FILES libgimpwidgets/Makefile" ;; + "app/Makefile") CONFIG_FILES="$CONFIG_FILES app/Makefile" ;; + "app/actions/Makefile") CONFIG_FILES="$CONFIG_FILES app/actions/Makefile" ;; + "app/base/Makefile") CONFIG_FILES="$CONFIG_FILES app/base/Makefile" ;; + "app/config/Makefile") CONFIG_FILES="$CONFIG_FILES app/config/Makefile" ;; + "app/core/Makefile") CONFIG_FILES="$CONFIG_FILES app/core/Makefile" ;; + "app/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES app/dialogs/Makefile" ;; + "app/display/Makefile") CONFIG_FILES="$CONFIG_FILES app/display/Makefile" ;; + "app/file/Makefile") CONFIG_FILES="$CONFIG_FILES app/file/Makefile" ;; + "app/gui/Makefile") CONFIG_FILES="$CONFIG_FILES app/gui/Makefile" ;; + "app/menus/Makefile") CONFIG_FILES="$CONFIG_FILES app/menus/Makefile" ;; + "app/paint/Makefile") CONFIG_FILES="$CONFIG_FILES app/paint/Makefile" ;; + "app/paint-funcs/Makefile") CONFIG_FILES="$CONFIG_FILES app/paint-funcs/Makefile" ;; + "app/composite/Makefile") CONFIG_FILES="$CONFIG_FILES app/composite/Makefile" ;; + "app/pdb/Makefile") CONFIG_FILES="$CONFIG_FILES app/pdb/Makefile" ;; + "app/plug-in/Makefile") CONFIG_FILES="$CONFIG_FILES app/plug-in/Makefile" ;; + "app/text/Makefile") CONFIG_FILES="$CONFIG_FILES app/text/Makefile" ;; + "app/tools/Makefile") CONFIG_FILES="$CONFIG_FILES app/tools/Makefile" ;; + "app/vectors/Makefile") CONFIG_FILES="$CONFIG_FILES app/vectors/Makefile" ;; + "app/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES app/widgets/Makefile" ;; + "app/xcf/Makefile") CONFIG_FILES="$CONFIG_FILES app/xcf/Makefile" ;; + "plug-ins/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/Makefile" ;; + "plug-ins/dbbrowser/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/dbbrowser/Makefile" ;; + "plug-ins/script-fu/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/Makefile" ;; + "plug-ins/script-fu/siod/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/siod/Makefile" ;; + "plug-ins/script-fu/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/scripts/Makefile" ;; + "plug-ins/script-fu/scripts/images/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/script-fu/scripts/images/Makefile" ;; + "plug-ins/xjt/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/xjt/Makefile" ;; + "plug-ins/FractalExplorer/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/FractalExplorer/Makefile" ;; + "plug-ins/FractalExplorer/examples/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/FractalExplorer/examples/Makefile" ;; + "plug-ins/Lighting/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/Lighting/Makefile" ;; + "plug-ins/Lighting/images/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/Lighting/images/Makefile" ;; + "plug-ins/MapObject/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/MapObject/Makefile" ;; + "plug-ins/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/bmp/Makefile" ;; + "plug-ins/common/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/common/Makefile" ;; + "plug-ins/faxg3/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/faxg3/Makefile" ;; + "plug-ins/fits/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/fits/Makefile" ;; + "plug-ins/flame/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/flame/Makefile" ;; + "plug-ins/gfig/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/Makefile" ;; + "plug-ins/gfig/gfig-examples/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/gfig-examples/Makefile" ;; + "plug-ins/gfig/images/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gfig/images/Makefile" ;; + "plug-ins/gflare/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gflare/Makefile" ;; + "plug-ins/gflare/gflares/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gflare/gflares/Makefile" ;; + "plug-ins/gfli/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gfli/Makefile" ;; + "plug-ins/gimpressionist/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Makefile" ;; + "plug-ins/gimpressionist/Brushes/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Brushes/Makefile" ;; + "plug-ins/gimpressionist/Paper/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Paper/Makefile" ;; + "plug-ins/gimpressionist/Presets/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/gimpressionist/Presets/Makefile" ;; + "plug-ins/help/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/help/Makefile" ;; + "plug-ins/helpbrowser/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/helpbrowser/Makefile" ;; + "plug-ins/ifscompose/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/ifscompose/Makefile" ;; + "plug-ins/imagemap/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/imagemap/Makefile" ;; + "plug-ins/imagemap/images/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/imagemap/images/Makefile" ;; + "plug-ins/maze/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/maze/Makefile" ;; + "plug-ins/pagecurl/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/pagecurl/Makefile" ;; + "plug-ins/print/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/print/Makefile" ;; + "plug-ins/pygimp/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/Makefile" ;; + "plug-ins/pygimp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/doc/Makefile" ;; + "plug-ins/pygimp/plug-ins/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/pygimp/plug-ins/Makefile" ;; + "plug-ins/rcm/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/rcm/Makefile" ;; + "plug-ins/rcm/images/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/rcm/images/Makefile" ;; + "plug-ins/sel2path/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/sel2path/Makefile" ;; + "plug-ins/sgi/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/sgi/Makefile" ;; + "plug-ins/twain/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/twain/Makefile" ;; + "plug-ins/winicon/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/winicon/Makefile" ;; + "plug-ins/winsnap/Makefile") CONFIG_FILES="$CONFIG_FILES plug-ins/winsnap/Makefile" ;; + "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; + "devel-docs/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/Makefile" ;; + "devel-docs/app/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/app/Makefile" ;; + "devel-docs/app/version") CONFIG_FILES="$CONFIG_FILES devel-docs/app/version" ;; + "devel-docs/libgimp/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimp/Makefile" ;; + "devel-docs/libgimp/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimp/version" ;; + "devel-docs/libgimpbase/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpbase/Makefile" ;; + "devel-docs/libgimpbase/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpbase/version" ;; + "devel-docs/libgimpcolor/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpcolor/Makefile" ;; + "devel-docs/libgimpcolor/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpcolor/version" ;; + "devel-docs/libgimpmath/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmath/Makefile" ;; + "devel-docs/libgimpmath/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmath/version" ;; + "devel-docs/libgimpmodule/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmodule/Makefile" ;; + "devel-docs/libgimpmodule/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpmodule/version" ;; + "devel-docs/libgimpthumb/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpthumb/Makefile" ;; + "devel-docs/libgimpthumb/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpthumb/version" ;; + "devel-docs/libgimpwidgets/Makefile") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpwidgets/Makefile" ;; + "devel-docs/libgimpwidgets/version") CONFIG_FILES="$CONFIG_FILES devel-docs/libgimpwidgets/version" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "menus/Makefile") CONFIG_FILES="$CONFIG_FILES menus/Makefile" ;; + "tips/Makefile") CONFIG_FILES="$CONFIG_FILES tips/Makefile" ;; + "cursors/Makefile") CONFIG_FILES="$CONFIG_FILES cursors/Makefile" ;; + "themes/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Makefile" ;; + "themes/Default/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Default/Makefile" ;; + "themes/Default/images/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Default/images/Makefile" ;; + "themes/Default/images/preferences/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Default/images/preferences/Makefile" ;; + "themes/Small/Makefile") CONFIG_FILES="$CONFIG_FILES themes/Small/Makefile" ;; + "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/environ/Makefile") CONFIG_FILES="$CONFIG_FILES data/environ/Makefile" ;; + "data/misc/Makefile") CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;; + "data/misc/gimp.desktop.in") CONFIG_FILES="$CONFIG_FILES data/misc/gimp.desktop.in" ;; + "data/misc/gimp.keys") CONFIG_FILES="$CONFIG_FILES data/misc/gimp.keys" ;; + "data/misc/gimp.applications") CONFIG_FILES="$CONFIG_FILES data/misc/gimp.applications" ;; + "data/images/Makefile") CONFIG_FILES="$CONFIG_FILES data/images/Makefile" ;; + "data/brushes/Makefile") CONFIG_FILES="$CONFIG_FILES data/brushes/Makefile" ;; + "data/gradients/Makefile") CONFIG_FILES="$CONFIG_FILES data/gradients/Makefile" ;; + "data/palettes/Makefile") CONFIG_FILES="$CONFIG_FILES data/palettes/Makefile" ;; + "data/patterns/Makefile") CONFIG_FILES="$CONFIG_FILES data/patterns/Makefile" ;; + "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; + "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "po-libgimp/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-libgimp/Makefile.in" ;; + "po-plug-ins/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-plug-ins/Makefile.in" ;; + "po-script-fu/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-script-fu/Makefile.in" ;; + "gimp-zip") CONFIG_FILES="$CONFIG_FILES gimp-zip" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "docs/gimp-2.2.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-2.2.1:docs/gimp.1.in" ;; + "docs/gimprc-2.2.5") CONFIG_FILES="$CONFIG_FILES docs/gimprc-2.2.5:docs/gimprc.5.in" ;; + "docs/gimptool-2.0.1") CONFIG_FILES="$CONFIG_FILES docs/gimptool-2.0.1:docs/gimptool.1.in" ;; + "docs/gimp-remote-2.2.1") CONFIG_FILES="$CONFIG_FILES docs/gimp-remote-2.2.1:docs/gimp-remote.1.in" ;; + "gimptool-2.0") CONFIG_FILES="$CONFIG_FILES gimptool-2.0:gimptool-2.0.in" ;; + "gimp-2.0.pc") CONFIG_FILES="$CONFIG_FILES gimp-2.0.pc:gimp.pc.in" ;; + "gimpthumb-2.0.pc") CONFIG_FILES="$CONFIG_FILES gimpthumb-2.0.pc:gimpthumb.pc.in" ;; + "gimpui-2.0.pc") CONFIG_FILES="$CONFIG_FILES gimpui-2.0.pc:gimpui.pc.in" ;; + "chmod-scripts") CONFIG_COMMANDS="$CONFIG_COMMANDS chmod-scripts" ;; + "sed-po-makefiles") CONFIG_COMMANDS="$CONFIG_COMMANDS sed-po-makefiles" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -35436,593 +38490,776 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@GIMP_MAJOR_VERSION@,$GIMP_MAJOR_VERSION,;t t -s,@GIMP_MINOR_VERSION@,$GIMP_MINOR_VERSION,;t t -s,@GIMP_MICRO_VERSION@,$GIMP_MICRO_VERSION,;t t -s,@GIMP_INTERFACE_AGE@,$GIMP_INTERFACE_AGE,;t t -s,@GIMP_BINARY_AGE@,$GIMP_BINARY_AGE,;t t -s,@GIMP_API_VERSION@,$GIMP_API_VERSION,;t t -s,@GIMP_VERSION@,$GIMP_VERSION,;t t -s,@GIMP_REAL_VERSION@,$GIMP_REAL_VERSION,;t t -s,@GIMP_APP_VERSION@,$GIMP_APP_VERSION,;t t -s,@GIMP_PLUGIN_VERSION@,$GIMP_PLUGIN_VERSION,;t t -s,@GIMP_TOOL_VERSION@,$GIMP_TOOL_VERSION,;t t -s,@GIMP_PKGCONFIG_VERSION@,$GIMP_PKGCONFIG_VERSION,;t t -s,@GIMP_DATA_VERSION@,$GIMP_DATA_VERSION,;t t -s,@GIMP_SYSCONF_VERSION@,$GIMP_SYSCONF_VERSION,;t t -s,@GIMP_USER_VERSION@,$GIMP_USER_VERSION,;t t -s,@GIMP_UNSTABLE@,$GIMP_UNSTABLE,;t t -s,@GIMP_FULL_NAME@,$GIMP_FULL_NAME,;t t -s,@GIMP_DESKTOP_ICON@,$GIMP_DESKTOP_ICON,;t t -s,@LT_VERSION_INFO@,$LT_VERSION_INFO,;t t -s,@LT_CURRENT_MINUS_AGE@,$LT_CURRENT_MINUS_AGE,;t t -s,@GLIB_REQUIRED_VERSION@,$GLIB_REQUIRED_VERSION,;t t -s,@GTK_REQUIRED_VERSION@,$GTK_REQUIRED_VERSION,;t t -s,@GDK_PIXBUF_REQUIRED_VERSION@,$GDK_PIXBUF_REQUIRED_VERSION,;t t -s,@PANGOFT2_REQUIRED_VERSION@,$PANGOFT2_REQUIRED_VERSION,;t t -s,@FONTCONFIG_REQUIRED_VERSION@,$FONTCONFIG_REQUIRED_VERSION,;t t -s,@GTKDOC_REQUIRED_VERSION@,$GTKDOC_REQUIRED_VERSION,;t t -s,@GTKHTML2_REQUIRED_VERSION@,$GTKHTML2_REQUIRED_VERSION,;t t -s,@GIMPPRINT_REQUIRED_VERSION@,$GIMPPRINT_REQUIRED_VERSION,;t t -s,@GIMPPRINT_TOONEW_VERSION@,$GIMPPRINT_TOONEW_VERSION,;t t -s,@RSVG_REQUIRED_VERSION@,$RSVG_REQUIRED_VERSION,;t t -s,@WMF_REQUIRED_VERSION@,$WMF_REQUIRED_VERSION,;t t -s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@CCAS@,$CCAS,;t t -s,@CCASFLAGS@,$CCASFLAGS,;t t -s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t -s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t -s,@MAINT@,$MAINT,;t t -s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t -s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t -s,@PATHSEP@,$PATHSEP,;t t -s,@OS_WIN32_TRUE@,$OS_WIN32_TRUE,;t t -s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t -s,@OS_UNIX_TRUE@,$OS_UNIX_TRUE,;t t -s,@OS_UNIX_FALSE@,$OS_UNIX_FALSE,;t t -s,@ms_librarian@,$ms_librarian,;t t -s,@WINDRES@,$WINDRES,;t t -s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t -s,@MS_LIB_AVAILABLE_TRUE@,$MS_LIB_AVAILABLE_TRUE,;t t -s,@MS_LIB_AVAILABLE_FALSE@,$MS_LIB_AVAILABLE_FALSE,;t t -s,@HAVE_WINDRES_TRUE@,$HAVE_WINDRES_TRUE,;t t -s,@HAVE_WINDRES_FALSE@,$HAVE_WINDRES_FALSE,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t -s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t -s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t -s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t -s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t -s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t -s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t -s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t -s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t -s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t -s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t -s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t -s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t -s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t -s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t -s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t -s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t -s,@INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t -s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t -s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t -s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t -s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t -s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t -s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t -s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t -s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t -s,@USE_NLS@,$USE_NLS,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@GMSGFMT@,$GMSGFMT,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@CATALOGS@,$CATALOGS,;t t -s,@CATOBJEXT@,$CATOBJEXT,;t t -s,@DATADIRNAME@,$DATADIRNAME,;t t -s,@GMOFILES@,$GMOFILES,;t t -s,@INSTOBJEXT@,$INSTOBJEXT,;t t -s,@INTLLIBS@,$INTLLIBS,;t t -s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t -s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t -s,@POFILES@,$POFILES,;t t -s,@POSUB@,$POSUB,;t t -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t -s,@GLIB_LIBS@,$GLIB_LIBS,;t t -s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t -s,@GOBJECT_QUERY@,$GOBJECT_QUERY,;t t -s,@GLIB_MKENUMS@,$GLIB_MKENUMS,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t -s,@GMODULE_CFLAGS@,$GMODULE_CFLAGS,;t t -s,@GMODULE_LIBS@,$GMODULE_LIBS,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t -s,@GDK_PIXBUF_CFLAGS@,$GDK_PIXBUF_CFLAGS,;t t -s,@GDK_PIXBUF_LIBS@,$GDK_PIXBUF_LIBS,;t t -s,@GDK_PIXBUF_CSOURCE@,$GDK_PIXBUF_CSOURCE,;t t -s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t -s,@LIBART_LIBS@,$LIBART_LIBS,;t t -s,@FONTCONFIG_CFLAGS@,$FONTCONFIG_CFLAGS,;t t -s,@FONTCONFIG_LIBS@,$FONTCONFIG_LIBS,;t t -s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t -s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t -s,@FREETYPE_CONFIG@,$FREETYPE_CONFIG,;t t -s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t -s,@HAVE_FINITE@,$HAVE_FINITE,;t t -s,@HAVE_ISFINITE@,$HAVE_ISFINITE,;t t -s,@SOCKET_LIBS@,$SOCKET_LIBS,;t t -s,@MMX_EXTRA_CFLAGS@,$MMX_EXTRA_CFLAGS,;t t -s,@SSE_EXTRA_CFLAGS@,$SSE_EXTRA_CFLAGS,;t t -s,@RT_LIBS@,$RT_LIBS,;t t -s,@SYMPREFIX@,$SYMPREFIX,;t t -s,@HAVE_GLIBC_REGEX_TRUE@,$HAVE_GLIBC_REGEX_TRUE,;t t -s,@HAVE_GLIBC_REGEX_FALSE@,$HAVE_GLIBC_REGEX_FALSE,;t t -s,@HAVE_GLIBC_REGEX@,$HAVE_GLIBC_REGEX,;t t -s,@GIMP_THREAD_FLAGS@,$GIMP_THREAD_FLAGS,;t t -s,@GIMP_THREAD_LIBS@,$GIMP_THREAD_LIBS,;t t -s,@GIMP_MP_FLAGS@,$GIMP_MP_FLAGS,;t t -s,@GIMP_MP_LIBS@,$GIMP_MP_LIBS,;t t -s,@LIBXMU@,$LIBXMU,;t t -s,@LIBSCREENSHOT@,$LIBSCREENSHOT,;t t -s,@GIMP_REMOTE@,$GIMP_REMOTE,;t t -s,@TIFF@,$TIFF,;t t -s,@LIBTIFF@,$LIBTIFF,;t t -s,@JPEG@,$JPEG,;t t -s,@LIBJPEG@,$LIBJPEG,;t t -s,@BUILD_XJT_TRUE@,$BUILD_XJT_TRUE,;t t -s,@BUILD_XJT_FALSE@,$BUILD_XJT_FALSE,;t t -s,@LIBZ@,$LIBZ,;t t -s,@PSP@,$PSP,;t t -s,@PNG@,$PNG,;t t -s,@LIBPNG@,$LIBPNG,;t t -s,@MNG@,$MNG,;t t -s,@LIBMNG@,$LIBMNG,;t t -s,@EXIF_CFLAGS@,$EXIF_CFLAGS,;t t -s,@EXIF_LIBS@,$EXIF_LIBS,;t t -s,@AA@,$AA,;t t -s,@LIBAA@,$LIBAA,;t t -s,@XPM@,$XPM,;t t -s,@LIBXPM@,$LIBXPM,;t t -s,@GTKHTML2_CFLAGS@,$GTKHTML2_CFLAGS,;t t -s,@GTKHTML2_LIBS@,$GTKHTML2_LIBS,;t t -s,@BUILD_HELPBROWSER_TRUE@,$BUILD_HELPBROWSER_TRUE,;t t -s,@BUILD_HELPBROWSER_FALSE@,$BUILD_HELPBROWSER_FALSE,;t t -s,@SVG_CFLAGS@,$SVG_CFLAGS,;t t -s,@SVG_LIBS@,$SVG_LIBS,;t t -s,@SVG@,$SVG,;t t -s,@LIBSVG@,$LIBSVG,;t t -s,@GIMPPRINT_CONFIG@,$GIMPPRINT_CONFIG,;t t -s,@GIMPPRINT_CFLAGS@,$GIMPPRINT_CFLAGS,;t t -s,@GIMPPRINT_LIBS@,$GIMPPRINT_LIBS,;t t -s,@PRINT_LIBS@,$PRINT_LIBS,;t t -s,@PRINT_CFLAGS@,$PRINT_CFLAGS,;t t -s,@BUILD_PRINT_TRUE@,$BUILD_PRINT_TRUE,;t t -s,@BUILD_PRINT_FALSE@,$BUILD_PRINT_FALSE,;t t -s,@WMF_CONFIG@,$WMF_CONFIG,;t t -s,@LIBWMF@,$LIBWMF,;t t -s,@WMF_CFLAGS@,$WMF_CFLAGS,;t t -s,@LCMS_LIBS@,$LCMS_LIBS,;t t -s,@HAVE_LCMS_TRUE@,$HAVE_LCMS_TRUE,;t t -s,@HAVE_LCMS_FALSE@,$HAVE_LCMS_FALSE,;t t -s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t -s,@ALSA_LIBS@,$ALSA_LIBS,;t t -s,@HAVE_LINUX_INPUT_TRUE@,$HAVE_LINUX_INPUT_TRUE,;t t -s,@HAVE_LINUX_INPUT_FALSE@,$HAVE_LINUX_INPUT_FALSE,;t t -s,@SENDMAIL@,$SENDMAIL,;t t -s,@PERL@,$PERL,;t t -s,@WITH_PDBGEN_TRUE@,$WITH_PDBGEN_TRUE,;t t -s,@WITH_PDBGEN_FALSE@,$WITH_PDBGEN_FALSE,;t t -s,@PYTHON@,$PYTHON,;t t -s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t -s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t -s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t -s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t -s,@pythondir@,$pythondir,;t t -s,@pkgpythondir@,$pkgpythondir,;t t -s,@pyexecdir@,$pyexecdir,;t t -s,@pkgpyexecdir@,$pkgpyexecdir,;t t -s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t -s,@PYGTK_CFLAGS@,$PYGTK_CFLAGS,;t t -s,@PYGTK_LIBS@,$PYGTK_LIBS,;t t -s,@PYGIMP_EXTRA_CFLAGS@,$PYGIMP_EXTRA_CFLAGS,;t t -s,@BUILD_PYTHON_TRUE@,$BUILD_PYTHON_TRUE,;t t -s,@BUILD_PYTHON_FALSE@,$BUILD_PYTHON_FALSE,;t t -s,@MAIL@,$MAIL,;t t -s,@SCREENSHOT@,$SCREENSHOT,;t t -s,@URL@,$URL,;t t -s,@WINCLIPBOARD@,$WINCLIPBOARD,;t t -s,@WINPRINT@,$WINPRINT,;t t -s,@WMF@,$WMF,;t t -s,@HAVE_MAC_TWAIN_TRUE@,$HAVE_MAC_TWAIN_TRUE,;t t -s,@HAVE_MAC_TWAIN_FALSE@,$HAVE_MAC_TWAIN_FALSE,;t t -s,@DESKTOP_DATADIR_TRUE@,$DESKTOP_DATADIR_TRUE,;t t -s,@DESKTOP_DATADIR_FALSE@,$DESKTOP_DATADIR_FALSE,;t t -s,@DESKTOP_DATADIR@,$DESKTOP_DATADIR,;t t -s,@XMLLINT@,$XMLLINT,;t t -s,@HAVE_XMLLINT_TRUE@,$HAVE_XMLLINT_TRUE,;t t -s,@HAVE_XMLLINT_FALSE@,$HAVE_XMLLINT_FALSE,;t t -s,@XSLTPROC@,$XSLTPROC,;t t -s,@HAVE_XSLTPROC_TRUE@,$HAVE_XSLTPROC_TRUE,;t t -s,@HAVE_XSLTPROC_FALSE@,$HAVE_XSLTPROC_FALSE,;t t -s,@HTML_DIR@,$HTML_DIR,;t t -s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t -s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t -s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t -s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t -s,@DEFAULT_BINARY_TRUE@,$DEFAULT_BINARY_TRUE,;t t -s,@DEFAULT_BINARY_FALSE@,$DEFAULT_BINARY_FALSE,;t t -s,@ENABLE_GIMP_CONSOLE_TRUE@,$ENABLE_GIMP_CONSOLE_TRUE,;t t -s,@ENABLE_GIMP_CONSOLE_FALSE@,$ENABLE_GIMP_CONSOLE_FALSE,;t t -s,@gimpdir@,$gimpdir,;t t -s,@gimpdatadir@,$gimpdatadir,;t t -s,@gimpplugindir@,$gimpplugindir,;t t -s,@gimpsysconfdir@,$gimpsysconfdir,;t t -s,@localedir@,$localedir,;t t -s,@GIMPINSTALL@,$GIMPINSTALL,;t t -s,@STATICLIBS_TRUE@,$STATICLIBS_TRUE,;t t -s,@STATICLIBS_FALSE@,$STATICLIBS_FALSE,;t t -s,@GIMP_MKENUMS@,$GIMP_MKENUMS,;t t -s,@GIMP_PLUGINS@,$GIMP_PLUGINS,;t t -s,@GIMP_MODULES@,$GIMP_MODULES,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF +if test -n "$CONFIG_FILES"; then _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +GIMP_MAJOR_VERSION!$GIMP_MAJOR_VERSION$ac_delim +GIMP_MINOR_VERSION!$GIMP_MINOR_VERSION$ac_delim +GIMP_MICRO_VERSION!$GIMP_MICRO_VERSION$ac_delim +GIMP_INTERFACE_AGE!$GIMP_INTERFACE_AGE$ac_delim +GIMP_BINARY_AGE!$GIMP_BINARY_AGE$ac_delim +GIMP_API_VERSION!$GIMP_API_VERSION$ac_delim +GIMP_VERSION!$GIMP_VERSION$ac_delim +GIMP_REAL_VERSION!$GIMP_REAL_VERSION$ac_delim +GIMP_APP_VERSION!$GIMP_APP_VERSION$ac_delim +GIMP_PLUGIN_VERSION!$GIMP_PLUGIN_VERSION$ac_delim +GIMP_TOOL_VERSION!$GIMP_TOOL_VERSION$ac_delim +GIMP_PKGCONFIG_VERSION!$GIMP_PKGCONFIG_VERSION$ac_delim +GIMP_DATA_VERSION!$GIMP_DATA_VERSION$ac_delim +GIMP_SYSCONF_VERSION!$GIMP_SYSCONF_VERSION$ac_delim +GIMP_USER_VERSION!$GIMP_USER_VERSION$ac_delim +GIMP_UNSTABLE!$GIMP_UNSTABLE$ac_delim +GIMP_FULL_NAME!$GIMP_FULL_NAME$ac_delim +GIMP_DESKTOP_ICON!$GIMP_DESKTOP_ICON$ac_delim +LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim +LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim +GLIB_REQUIRED_VERSION!$GLIB_REQUIRED_VERSION$ac_delim +GTK_REQUIRED_VERSION!$GTK_REQUIRED_VERSION$ac_delim +GDK_PIXBUF_REQUIRED_VERSION!$GDK_PIXBUF_REQUIRED_VERSION$ac_delim +PANGOFT2_REQUIRED_VERSION!$PANGOFT2_REQUIRED_VERSION$ac_delim +FONTCONFIG_REQUIRED_VERSION!$FONTCONFIG_REQUIRED_VERSION$ac_delim +GTKDOC_REQUIRED_VERSION!$GTKDOC_REQUIRED_VERSION$ac_delim +GTKHTML2_REQUIRED_VERSION!$GTKHTML2_REQUIRED_VERSION$ac_delim +GIMPPRINT_REQUIRED_VERSION!$GIMPPRINT_REQUIRED_VERSION$ac_delim +GIMPPRINT_TOONEW_VERSION!$GIMPPRINT_TOONEW_VERSION$ac_delim +RSVG_REQUIRED_VERSION!$RSVG_REQUIRED_VERSION$ac_delim +WMF_REQUIRED_VERSION!$WMF_REQUIRED_VERSION$ac_delim +GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +AS!$AS$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CPP!$CPP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +CCAS!$CCAS$ac_delim +CCASFLAGS!$CCASFLAGS$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim +PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim +PATHSEP!$PATHSEP$ac_delim +OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim +OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim +OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim +OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim +ms_librarian!$ms_librarian$ac_delim +WINDRES!$WINDRES$ac_delim +MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim +MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim +HAVE_WINDRES_TRUE!$HAVE_WINDRES_TRUE$ac_delim +HAVE_WINDRES_FALSE!$HAVE_WINDRES_FALSE$ac_delim +ALLOCA!$ALLOCA$ac_delim +INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim +INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim +INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim +INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim +INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim +INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim +INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim +INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim +INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim +INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim +INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim +INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim +INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim +INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim +INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim +INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim +INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim +INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim +INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim +INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim +INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim +INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim +ALL_LINGUAS!$ALL_LINGUAS$ac_delim +USE_NLS!$USE_NLS$ac_delim +MSGFMT!$MSGFMT$ac_delim +GMSGFMT!$GMSGFMT$ac_delim +XGETTEXT!$XGETTEXT$ac_delim +CATALOGS!$CATALOGS$ac_delim +CATOBJEXT!$CATOBJEXT$ac_delim +DATADIRNAME!$DATADIRNAME$ac_delim +GMOFILES!$GMOFILES$ac_delim +INSTOBJEXT!$INSTOBJEXT$ac_delim +INTLLIBS!$INTLLIBS$ac_delim +PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim +PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim +POFILES!$POFILES$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +POSUB!$POSUB$ac_delim +MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +GLIB_LIBS!$GLIB_LIBS$ac_delim +GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim +GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim +GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim +GMODULE_CFLAGS!$GMODULE_CFLAGS$ac_delim +GMODULE_LIBS!$GMODULE_LIBS$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +GDK_PIXBUF_CFLAGS!$GDK_PIXBUF_CFLAGS$ac_delim +GDK_PIXBUF_LIBS!$GDK_PIXBUF_LIBS$ac_delim +GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim +LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim +LIBART_LIBS!$LIBART_LIBS$ac_delim +FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim +FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim +PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim +PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim +FREETYPE_CONFIG!$FREETYPE_CONFIG$ac_delim +FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim +HAVE_FINITE!$HAVE_FINITE$ac_delim +HAVE_ISFINITE!$HAVE_ISFINITE$ac_delim +SOCKET_LIBS!$SOCKET_LIBS$ac_delim +MMX_EXTRA_CFLAGS!$MMX_EXTRA_CFLAGS$ac_delim +SSE_EXTRA_CFLAGS!$SSE_EXTRA_CFLAGS$ac_delim +RT_LIBS!$RT_LIBS$ac_delim +SYMPREFIX!$SYMPREFIX$ac_delim +HAVE_GLIBC_REGEX_TRUE!$HAVE_GLIBC_REGEX_TRUE$ac_delim +HAVE_GLIBC_REGEX_FALSE!$HAVE_GLIBC_REGEX_FALSE$ac_delim +HAVE_GLIBC_REGEX!$HAVE_GLIBC_REGEX$ac_delim +GIMP_THREAD_FLAGS!$GIMP_THREAD_FLAGS$ac_delim +GIMP_THREAD_LIBS!$GIMP_THREAD_LIBS$ac_delim +GIMP_MP_FLAGS!$GIMP_MP_FLAGS$ac_delim +GIMP_MP_LIBS!$GIMP_MP_LIBS$ac_delim +LIBXMU!$LIBXMU$ac_delim +LIBSCREENSHOT!$LIBSCREENSHOT$ac_delim +GIMP_REMOTE!$GIMP_REMOTE$ac_delim +TIFF!$TIFF$ac_delim +LIBTIFF!$LIBTIFF$ac_delim +JPEG!$JPEG$ac_delim +LIBJPEG!$LIBJPEG$ac_delim +BUILD_XJT_TRUE!$BUILD_XJT_TRUE$ac_delim +BUILD_XJT_FALSE!$BUILD_XJT_FALSE$ac_delim +LIBZ!$LIBZ$ac_delim +PSP!$PSP$ac_delim +PNG!$PNG$ac_delim +LIBPNG!$LIBPNG$ac_delim +MNG!$MNG$ac_delim +LIBMNG!$LIBMNG$ac_delim +EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim +EXIF_LIBS!$EXIF_LIBS$ac_delim +AA!$AA$ac_delim +LIBAA!$LIBAA$ac_delim +XPM!$XPM$ac_delim +LIBXPM!$LIBXPM$ac_delim +GTKHTML2_CFLAGS!$GTKHTML2_CFLAGS$ac_delim +GTKHTML2_LIBS!$GTKHTML2_LIBS$ac_delim +BUILD_HELPBROWSER_TRUE!$BUILD_HELPBROWSER_TRUE$ac_delim +BUILD_HELPBROWSER_FALSE!$BUILD_HELPBROWSER_FALSE$ac_delim +SVG_CFLAGS!$SVG_CFLAGS$ac_delim +SVG_LIBS!$SVG_LIBS$ac_delim +SVG!$SVG$ac_delim +LIBSVG!$LIBSVG$ac_delim +GIMPPRINT_CONFIG!$GIMPPRINT_CONFIG$ac_delim +GIMPPRINT_CFLAGS!$GIMPPRINT_CFLAGS$ac_delim +GIMPPRINT_LIBS!$GIMPPRINT_LIBS$ac_delim +PRINT_LIBS!$PRINT_LIBS$ac_delim +PRINT_CFLAGS!$PRINT_CFLAGS$ac_delim +BUILD_PRINT_TRUE!$BUILD_PRINT_TRUE$ac_delim +BUILD_PRINT_FALSE!$BUILD_PRINT_FALSE$ac_delim +WMF_CONFIG!$WMF_CONFIG$ac_delim +LIBWMF!$LIBWMF$ac_delim +WMF_CFLAGS!$WMF_CFLAGS$ac_delim +LCMS_LIBS!$LCMS_LIBS$ac_delim +HAVE_LCMS_TRUE!$HAVE_LCMS_TRUE$ac_delim +HAVE_LCMS_FALSE!$HAVE_LCMS_FALSE$ac_delim +ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim +ALSA_LIBS!$ALSA_LIBS$ac_delim +HAVE_LINUX_INPUT_TRUE!$HAVE_LINUX_INPUT_TRUE$ac_delim +HAVE_LINUX_INPUT_FALSE!$HAVE_LINUX_INPUT_FALSE$ac_delim +SENDMAIL!$SENDMAIL$ac_delim +PERL!$PERL$ac_delim +WITH_PDBGEN_TRUE!$WITH_PDBGEN_TRUE$ac_delim +WITH_PDBGEN_FALSE!$WITH_PDBGEN_FALSE$ac_delim +PYTHON!$PYTHON$ac_delim +PYTHON_VERSION!$PYTHON_VERSION$ac_delim +PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim +PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim +PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +pythondir!$pythondir$ac_delim +pkgpythondir!$pkgpythondir$ac_delim +pyexecdir!$pyexecdir$ac_delim +pkgpyexecdir!$pkgpyexecdir$ac_delim +PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim +PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim +PYGTK_LIBS!$PYGTK_LIBS$ac_delim +PYGIMP_EXTRA_CFLAGS!$PYGIMP_EXTRA_CFLAGS$ac_delim +BUILD_PYTHON_TRUE!$BUILD_PYTHON_TRUE$ac_delim +BUILD_PYTHON_FALSE!$BUILD_PYTHON_FALSE$ac_delim +MAIL!$MAIL$ac_delim +SCREENSHOT!$SCREENSHOT$ac_delim +URL!$URL$ac_delim +WINCLIPBOARD!$WINCLIPBOARD$ac_delim +WINPRINT!$WINPRINT$ac_delim +WMF!$WMF$ac_delim +HAVE_MAC_TWAIN_TRUE!$HAVE_MAC_TWAIN_TRUE$ac_delim +HAVE_MAC_TWAIN_FALSE!$HAVE_MAC_TWAIN_FALSE$ac_delim +DESKTOP_DATADIR_TRUE!$DESKTOP_DATADIR_TRUE$ac_delim +DESKTOP_DATADIR_FALSE!$DESKTOP_DATADIR_FALSE$ac_delim +DESKTOP_DATADIR!$DESKTOP_DATADIR$ac_delim +XMLLINT!$XMLLINT$ac_delim +HAVE_XMLLINT_TRUE!$HAVE_XMLLINT_TRUE$ac_delim +HAVE_XMLLINT_FALSE!$HAVE_XMLLINT_FALSE$ac_delim +XSLTPROC!$XSLTPROC$ac_delim +HAVE_XSLTPROC_TRUE!$HAVE_XSLTPROC_TRUE$ac_delim +HAVE_XSLTPROC_FALSE!$HAVE_XSLTPROC_FALSE$ac_delim +HTML_DIR!$HTML_DIR$ac_delim +ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim +ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim +GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim +GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim +DEFAULT_BINARY_TRUE!$DEFAULT_BINARY_TRUE$ac_delim +DEFAULT_BINARY_FALSE!$DEFAULT_BINARY_FALSE$ac_delim +ENABLE_GIMP_CONSOLE_TRUE!$ENABLE_GIMP_CONSOLE_TRUE$ac_delim +ENABLE_GIMP_CONSOLE_FALSE!$ENABLE_GIMP_CONSOLE_FALSE$ac_delim +gimpdir!$gimpdir$ac_delim +gimpdatadir!$gimpdatadir$ac_delim +gimpplugindir!$gimpplugindir$ac_delim +gimpsysconfdir!$gimpsysconfdir$ac_delim +GIMPINSTALL!$GIMPINSTALL$ac_delim +STATICLIBS_TRUE!$STATICLIBS_TRUE$ac_delim +STATICLIBS_FALSE!$STATICLIBS_FALSE$ac_delim +GIMP_MKENUMS!$GIMP_MKENUMS$ac_delim +GIMP_PLUGINS!$GIMP_PLUGINS$ac_delim +GIMP_MODULES!$GIMP_MODULES$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -36030,248 +39267,129 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - + ;; + :H) + # + # CONFIG_HEADER + # _ACEOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' -# This sed command replaces #undef with comments. This is necessary, for +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do @@ -36282,135 +39400,39 @@ for _am_header in $config_headers :; do _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$ac_file : 'X\(//\)[^/]' \| \ X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X$ac_file : 'X\(/\)' \| . 2>/dev/null || echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. @@ -36420,18 +39442,29 @@ echo "$as_me: executing $ac_dest commands" >&6;} # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -36453,49 +39486,76 @@ echo X"$mf" | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - intltool ) + "intltool":C) for file in intltool-extract intltool-merge intltool-update; do sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ @@ -36516,10 +39576,10 @@ for file in intltool-extract intltool-merge intltool-update; do done ;; - default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*) + "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; - libgimpbase/gimpversion.h ) + "libgimpbase/gimpversion.h":C) outfile=gimpversion.h-tmp cat > $outfile <<\_______EOF /* gimpversion.h @@ -36564,11 +39624,11 @@ echo "$as_me: libgimpbase/gimpversion.h is unchanged" >&6;} mv $outfile libgimpbase/gimpversion.h fi ;; - chmod-scripts ) chmod +x gimptool-2.0 ;; - sed-po-makefiles ) sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile + "chmod-scripts":C) chmod +x gimptool-2.0 ;; + "sed-po-makefiles":C) sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile sed -e "/POTFILES =/r po-plug-ins/POTFILES" po-plug-ins/Makefile.in > po-plug-ins/Makefile sed -e "/POTFILES =/r po-script-fu/POTFILES" po-script-fu/Makefile.in > po-script-fu/Makefile ;; - po/stamp-it ) + "po/stamp-it":C) rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" sed '/^#/d @@ -36591,11 +39651,10 @@ echo "$as_me: error: po/Makefile is not ready." >&2;} rm -f "po/Makefile.tmp" mv "po/stamp-it.tmp" "po/stamp-it" ;; - esac -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + esac +done # for ac_tag + { (exit 0); exit 0; } _ACEOF diff --git a/configure.in b/configure.in index c55c7dbdd3..26cc023311 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], [2]) -m4_define([gimp_micro_version], [11]) +m4_define([gimp_micro_version], [12]) 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], [11]) +m4_define([gimp_interface_age], [12]) 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 5352b4db94..7e937a011b 100644 --- a/cursors/Makefile.in +++ b/cursors/Makefile.in @@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -356,6 +351,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -366,6 +364,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -377,10 +376,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/Makefile.in b/data/Makefile.in index 01273f484e..2a3bdd8450 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/brushes/Makefile.in b/data/brushes/Makefile.in index 47183ce7b5..090aebbd32 100644 --- a/data/brushes/Makefile.in +++ b/data/brushes/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/environ/Makefile.in b/data/environ/Makefile.in index bb84fcfd9d..313787e832 100644 --- a/data/environ/Makefile.in +++ b/data/environ/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/gradients/Makefile.in b/data/gradients/Makefile.in index 70ad6c1315..c0e8952585 100644 --- a/data/gradients/Makefile.in +++ b/data/gradients/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/images/Makefile.in b/data/images/Makefile.in index e5171ce8c3..b69ba8b0be 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/misc/Makefile.in b/data/misc/Makefile.in index 450c515bfb..3f97e85b6b 100644 --- a/data/misc/Makefile.in +++ b/data/misc/Makefile.in @@ -63,6 +63,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -171,6 +172,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -332,6 +334,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -339,17 +342,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -366,6 +361,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -376,6 +374,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -387,10 +386,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/palettes/Makefile.in b/data/palettes/Makefile.in index c93168210f..abc8f1c908 100644 --- a/data/palettes/Makefile.in +++ b/data/palettes/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/data/patterns/Makefile.in b/data/patterns/Makefile.in index b95b2af704..66bee264f7 100644 --- a/data/patterns/Makefile.in +++ b/data/patterns/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/devel-docs/Makefile.in b/devel-docs/Makefile.in index 998d60522d..727ecac83c 100644 --- a/devel-docs/Makefile.in +++ b/devel-docs/Makefile.in @@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -364,6 +359,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -374,6 +372,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -385,10 +384,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ diff --git a/devel-docs/app/Makefile b/devel-docs/app/Makefile index 0667e716fc..3fb2cd3df6 100644 --- a/devel-docs/app/Makefile +++ b/devel-docs/app/Makefile @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = aa$(EXEEXT) ACLOCAL = ${SHELL} /home/sven/gnomecvs/gimp-dist-2-2/missing --run aclocal-1.9 ALLOCA = +ALL_LINGUAS = bg ca cs da de el en_CA en_GB es eu fi fr ga gl he hu hr id it ja ko lt mk ms nb nl no pa pl pt pt_BR ro ru sk sr sr@Latn sv tr uk vi yi zh_CN zh_TW ALSA_CFLAGS = ALSA_LIBS = -lasound -lm -ldl -lpthread AMDEP_FALSE = # @@ -96,7 +97,7 @@ DEFAULT_BINARY_FALSE = # DEFAULT_BINARY_TRUE = DEFS = -DHAVE_CONFIG_H DEPDIR = .deps -DESKTOP_DATADIR = ${prefix}/share +DESKTOP_DATADIR = ${datarootdir} DESKTOP_DATADIR_FALSE = # DESKTOP_DATADIR_TRUE = DLLTOOL = dlltool @@ -104,7 +105,7 @@ ECHO = echo ECHO_C = ECHO_N = -n ECHO_T = -EGREP = grep -E +EGREP = /bin/grep -E ENABLE_GIMP_CONSOLE_FALSE = # ENABLE_GIMP_CONSOLE_TRUE = ENABLE_GTK_DOC_FALSE = # @@ -132,13 +133,13 @@ GIMPPRINT_REQUIRED_VERSION = 4.2.0 GIMPPRINT_TOONEW_VERSION = 4.3.0 GIMP_API_VERSION = 2.0 GIMP_APP_VERSION = 2.2 -GIMP_BINARY_AGE = 211 +GIMP_BINARY_AGE = 212 GIMP_DATA_VERSION = 2.0 GIMP_DESKTOP_ICON = wilber-icon.png GIMP_FULL_NAME = The GIMP -GIMP_INTERFACE_AGE = 11 +GIMP_INTERFACE_AGE = 12 GIMP_MAJOR_VERSION = 2 -GIMP_MICRO_VERSION = 11 +GIMP_MICRO_VERSION = 12 GIMP_MINOR_VERSION = 2 GIMP_MKENUMS = $(PERL) $(top_srcdir)/tools/gimp-mkenums GIMP_MODULES = modules @@ -147,7 +148,7 @@ GIMP_MP_LIBS = GIMP_PKGCONFIG_VERSION = 2.0 GIMP_PLUGINS = plug-ins GIMP_PLUGIN_VERSION = 2.0 -GIMP_REAL_VERSION = 2.2.11 +GIMP_REAL_VERSION = 2.2.12 GIMP_REMOTE = gimp-remote-2.2$(EXEEXT) GIMP_SYSCONF_VERSION = 2.0 GIMP_THREAD_FLAGS = @@ -155,7 +156,7 @@ GIMP_THREAD_LIBS = GIMP_TOOL_VERSION = 2.0 GIMP_UNSTABLE = no GIMP_USER_VERSION = 2.2 -GIMP_VERSION = 2.2.11 +GIMP_VERSION = 2.2.12 GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include GLIB_GENMARSHAL = glib-genmarshal GLIB_LIBS = -lgobject-2.0 -lglib-2.0 @@ -166,14 +167,15 @@ GMODULE_LIBS = -Wl,--export-dynamic -lgmodule-2.0 -ldl -lgobject-2.0 -lglib-2.0 GMOFILES = bg.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_CA.gmo en_GB.gmo es.gmo eu.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hu.gmo hr.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo mk.gmo ms.gmo nb.gmo nl.gmo no.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sr.gmo sr@Latn.gmo sv.gmo tr.gmo uk.gmo vi.gmo yi.gmo zh_CN.gmo zh_TW.gmo GMSGFMT = /usr/bin/msgfmt GOBJECT_QUERY = gobject-query +GREP = /bin/grep GTKDOC_REQUIRED_VERSION = 1.0 -GTKHTML2_CFLAGS = -DXTHREADS -I/usr/include/gtkhtml-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTKHTML2_LIBS = -L/usr/X11R6/lib -lgtkhtml-2 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -lXrandr -lXi -lXinerama -lXext -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXcursor -lpango-1.0 -lcairo -lXrender -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +GTKHTML2_CFLAGS = -I/usr/include/gtkhtml-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +GTKHTML2_LIBS = -lgtkhtml-2 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 GTKHTML2_REQUIRED_VERSION = 2.0.0 -GTK_CFLAGS = -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include GTK_DOC_USE_LIBTOOL_FALSE = # GTK_DOC_USE_LIBTOOL_TRUE = -GTK_LIBS = -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lXrandr -lXi -lXinerama -lXext -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXcursor -lpango-1.0 -lcairo -lXrender -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 GTK_REQUIRED_VERSION = 2.4.4 HAVE_FINITE = HAVE_GLIBC_REGEX = @@ -236,18 +238,18 @@ LIBMNG = -lmng -ljpeg -lpng -lz LIBOBJS = LIBPNG = -lpng -lz LIBS = -LIBSCREENSHOT = -L/usr/X11R6/lib -lX11 +LIBSCREENSHOT = -lX11 LIBSVG = -lrsvg-2 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 LIBTIFF = -ltiff LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBWMF = -L/usr/lib -lwmf -lwmflite -lfreetype -lz -L/usr/X11R6/lib -lSM -lICE -lX11 -lexpat -ljpeg -lpng -lz -lm -LIBXMU = -L/usr/X11R6/lib -lSM -lICE -lX11 -lXmu -lXt -LIBXPM = -L/usr/X11R6/lib -lSM -lICE -lX11 -lXpm +LIBXMU = -lSM -lICE -lX11 -lXmu -lXt +LIBXPM = -lSM -lICE -lX11 -lXpm LIBZ = -lz LN_S = ln -s LTLIBOBJS = LT_CURRENT_MINUS_AGE = 0 -LT_VERSION_INFO = 200:11:200 +LT_VERSION_INFO = 200:12:200 MAIL = mail$(EXEEXT) MAINT = MAINTAINER_MODE_FALSE = # @@ -268,9 +270,9 @@ OS_WIN32_TRUE = # PACKAGE = gimp PACKAGE_BUGREPORT = http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP PACKAGE_NAME = GIMP -PACKAGE_STRING = GIMP 2.2.11 +PACKAGE_STRING = GIMP 2.2.12 PACKAGE_TARNAME = gimp -PACKAGE_VERSION = 2.2.11 +PACKAGE_VERSION = 2.2.12 PANGOFT2_CFLAGS = -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include PANGOFT2_LIBS = -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 PANGOFT2_REQUIRED_VERSION = 1.4.0 @@ -316,7 +318,7 @@ SYMPREFIX = TIFF = tiff$(EXEEXT) URL = url$(EXEEXT) USE_NLS = yes -VERSION = 2.2.11 +VERSION = 2.2.12 WINCLIPBOARD = WINDRES = : WINPRINT = @@ -327,24 +329,17 @@ WMF_CFLAGS = -I/usr/include/freetype2 -I/usr/include WMF_CONFIG = /usr/bin/libwmf-config WMF_REQUIRED_VERSION = 0.2.8 XGETTEXT = /usr/bin/xgettext +XMKMF = XMLLINT = /usr/bin/xmllint XPM = xpm$(EXEEXT) XSLTPROC = /usr/bin/xsltproc -X_CFLAGS = -I/usr/X11R6/include +X_CFLAGS = X_EXTRA_LIBS = -X_LIBS = -L/usr/X11R6/lib +X_LIBS = X_PRE_LIBS = -lSM -lICE -ac_ct_AR = ar -ac_ct_AS = ac_ct_CC = gcc ac_ct_CXX = g++ -ac_ct_DLLTOOL = ac_ct_F77 = g77 -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_ct_WINDRES = -ac_pt_PKG_CONFIG = am__fastdepCC_FALSE = # am__fastdepCC_TRUE = am__fastdepCXX_FALSE = # @@ -360,9 +355,12 @@ build_alias = build_cpu = i686 build_os = linux-gnu build_vendor = pc -datadir = ${prefix}/share +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} exec_prefix = ${prefix} -gimpdatadir = ${prefix}/share/gimp/2.0 +gimpdatadir = ${datarootdir}/gimp/2.0 gimpdir = .gimp-2.2 gimpplugindir = ${exec_prefix}/lib/gimp/2.0 gimpsysconfdir = ${prefix}/etc/gimp/2.0 @@ -371,21 +369,24 @@ host_alias = host_cpu = i686 host_os = linux-gnu host_vendor = pc +htmldir = ${docdir} includedir = ${prefix}/include -infodir = ${prefix}/info +infodir = ${datarootdir}/info install_sh = /home/sven/gnomecvs/gimp-dist-2-2/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec -localedir = ${prefix}/share/locale +localedir = ${datarootdir}/locale localstatedir = ${prefix}/var -mandir = ${prefix}/man +mandir = ${datarootdir}/man mkdir_p = mkdir -p -- ms_librarian = oldincludedir = /usr/include +pdfdir = ${docdir} pkgpyexecdir = ${pyexecdir}/gimp pkgpythondir = ${pythondir}/gimp prefix = /usr/local program_transform_name = s,x,x, +psdir = ${docdir} pyexecdir = ${exec_prefix}/lib/python2.3/site-packages pythondir = ${prefix}/lib/python2.3/site-packages sbindir = ${exec_prefix}/sbin @@ -700,7 +701,7 @@ all-local: html-build.stamp #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo '*** Scanning header files ***' + @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -720,7 +721,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp #### templates #### tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo '*** Rebuilding template files ***' + @echo 'gtk-doc: Rebuilding template files' @-chmod -R u+w $(srcdir) cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) touch tmpl-build.stamp @@ -731,10 +732,10 @@ tmpl.stamp: tmpl-build.stamp #### xml #### sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo '*** Building XML ***' + @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -743,13 +744,13 @@ sgml.stamp: sgml-build.stamp #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' + @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) rm -rf $(srcdir)/html mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' + @echo 'gtk-doc: Fixing cross-references' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp #all-local: diff --git a/devel-docs/app/Makefile.in b/devel-docs/app/Makefile.in index ed0bfe76ca..049ed5f4e4 100644 --- a/devel-docs/app/Makefile.in +++ b/devel-docs/app/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -700,7 +701,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -720,7 +721,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -731,10 +732,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -743,13 +744,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/app/version b/devel-docs/app/version index 0b6e43134b..98c938ec34 100644 --- a/devel-docs/app/version +++ b/devel-docs/app/version @@ -1 +1 @@ -2.2.11 +2.2.12 diff --git a/devel-docs/libgimp/Makefile.in b/devel-docs/libgimp/Makefile.in index 1d8b5edcb3..e862a769eb 100644 --- a/devel-docs/libgimp/Makefile.in +++ b/devel-docs/libgimp/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -657,7 +658,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -677,7 +678,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -688,10 +689,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -700,13 +701,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpbase/Makefile.in b/devel-docs/libgimpbase/Makefile.in index b90f0b3ccb..4e347446b8 100644 --- a/devel-docs/libgimpbase/Makefile.in +++ b/devel-docs/libgimpbase/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -643,7 +644,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -663,7 +664,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -674,10 +675,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -686,13 +687,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpcolor/Makefile.in b/devel-docs/libgimpcolor/Makefile.in index 40119599d7..4641a3f1e8 100644 --- a/devel-docs/libgimpcolor/Makefile.in +++ b/devel-docs/libgimpcolor/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -639,7 +640,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -659,7 +660,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -670,10 +671,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -682,13 +683,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpmath/Makefile.in b/devel-docs/libgimpmath/Makefile.in index 382982c745..22b0d695ef 100644 --- a/devel-docs/libgimpmath/Makefile.in +++ b/devel-docs/libgimpmath/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -639,7 +640,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -659,7 +660,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -670,10 +671,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -682,13 +683,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpmodule/Makefile.in b/devel-docs/libgimpmodule/Makefile.in index ca0526be3d..21cbe171cd 100644 --- a/devel-docs/libgimpmodule/Makefile.in +++ b/devel-docs/libgimpmodule/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -647,7 +648,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -667,7 +668,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -678,10 +679,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -690,13 +691,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpthumb/Makefile.in b/devel-docs/libgimpthumb/Makefile.in index 25940224f6..ff790aecee 100644 --- a/devel-docs/libgimpthumb/Makefile.in +++ b/devel-docs/libgimpthumb/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -648,7 +649,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -668,7 +669,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -679,10 +680,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -691,13 +692,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpwidgets/Makefile.in b/devel-docs/libgimpwidgets/Makefile.in index 8dbead0532..cc73b21778 100644 --- a/devel-docs/libgimpwidgets/Makefile.in +++ b/devel-docs/libgimpwidgets/Makefile.in @@ -58,6 +58,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA = @AA@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +ALL_LINGUAS = @ALL_LINGUAS@ ALSA_CFLAGS = @ALSA_CFLAGS@ ALSA_LIBS = @ALSA_LIBS@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -166,6 +167,7 @@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -327,6 +329,7 @@ WMF_CFLAGS = @WMF_CFLAGS@ WMF_CONFIG = @WMF_CONFIG@ WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ XPM = @XPM@ XSLTPROC = @XSLTPROC@ @@ -334,17 +337,9 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_ct_WINDRES = @ac_ct_WINDRES@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -361,6 +356,9 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ @@ -371,6 +369,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -382,10 +381,12 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgpyexecdir = @pkgpyexecdir@ pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ sbindir = @sbindir@ @@ -657,7 +658,7 @@ uninstall-am: uninstall-info-am uninstall-local #### scan #### @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @@ -677,7 +678,7 @@ uninstall-am: uninstall-info-am uninstall-local #### templates #### @ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -688,10 +689,10 @@ uninstall-am: uninstall-info-am uninstall-local #### xml #### @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -700,13 +701,13 @@ uninstall-am: uninstall-info-am uninstall-local #### html #### @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' @ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' +@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp @ENABLE_GTK_DOC_FALSE@all-local: diff --git a/devel-docs/libgimpwidgets/html/GimpButton.html b/devel-docs/libgimpwidgets/html/GimpButton.html index ef40d2e35d..dfef1f40ba 100644 --- a/devel-docs/libgimpwidgets/html/GimpButton.html +++ b/devel-docs/libgimpwidgets/html/GimpButton.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,110 +20,98 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Signals +
-

GimpButton

-

GimpButton — A GtkButton with a little extra functionality.

+

GimpButton

+

GimpButton — A GtkButton with a little extra functionality.
-

Synopsis

+

Synopsis

 
 
 
             GimpButton;
-GtkWidget*  gimp_button_new                 (void);
+GtkWidget*  gimp_button_new                 (void);
 void        gimp_button_extended_clicked    (GimpButton *button,
-                                             GdkModifierType state);
+                                             GdkModifierType state);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpButton
-                                       +----GimpColorButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpButton
+                                             +----GimpColorButton
-

Implemented Interfaces

+

Implemented Interfaces

GimpButton implements AtkImplementorIface.

-

Signal Prototypes

+

Signals

 
 "extended-clicked"
-            void        user_function      (GimpButton *gimpbutton,
-                                            GdkModifierType arg1,
-                                            gpointer user_data);
+            void        user_function      (GimpButton      *gimpbutton,
+                                            GdkModifierType *arg1,
+                                            gpointer         user_data)       : Run first
-

Description

+

Description

-GimpButton adds an extra signal to the GtkButton widget that allows +GimpButton adds an extra signal to the GtkButton widget that allows to distinguish a normal click from a click that was performed with modifier keys pressed.

-

Details

+

Details

-

+

GimpButton

-
typedef struct _GimpButton GimpButton;
+
typedef struct _GimpButton GimpButton;

-

+

gimp_button_new ()

-
GtkWidget*  gimp_button_new                 (void);
+
GtkWidget*  gimp_button_new                 (void);

Creates a new GimpButton widget.

@@ -140,12 +129,10 @@ Creates a new Gi

-

+

gimp_button_extended_clicked ()

-
void        gimp_button_extended_clicked    (GimpButton *button,
-                                             GdkModifierType state);
+
void        gimp_button_extended_clicked    (GimpButton *button,
+                                             GdkModifierType state);

Emits the button's "extended_clicked" signal.

@@ -171,15 +158,13 @@ Emits the button's "extended_clicked" signal.

-

Signals

+

Signal Details

-

+

The "extended-clicked" signal

-
void        user_function                  (GimpButton *gimpbutton,
-                                            GdkModifierType arg1,
-                                            gpointer user_data);
+
void        user_function                  (GimpButton      *gimpbutton,
+                                            GdkModifierType *arg1,
+                                            gpointer         user_data)       : Run first

@@ -209,9 +194,5 @@ href="../gdk/gdk-Windows.html#GdkModifierType"
- - - -
<< Object HierarchyGimpChainButton >>
diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html index 8e65c14746..88f0afe3bc 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,52 +20,56 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Properties +
-

GimpCellRendererColor

+

GimpCellRendererColor

GimpCellRendererColor —

-

Synopsis

+

Synopsis

 
 
 
             GimpCellRendererColor;
-GtkCellRenderer* gimp_cell_renderer_color_new
+GtkCellRenderer* gimp_cell_renderer_color_new
                                             (void);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkCellRenderer
-               +----GimpCellRendererColor
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkCellRenderer
+                     +----GimpCellRendererColor
-

Properties

+

Properties

 
   "color"
-

Description

+

Description

-

Details

+

Details

-

+

GimpCellRendererColor

-
typedef struct _GimpCellRendererColor GimpCellRendererColor;
+
typedef struct _GimpCellRendererColor GimpCellRendererColor;

-

+

gimp_cell_renderer_color_new ()

-
GtkCellRenderer* gimp_cell_renderer_color_new
+
GtkCellRenderer* gimp_cell_renderer_color_new
                                             (void);

 

-Creates a GtkCellRenderer that displays a color.

+Creates a GtkCellRenderer that displays a color.

 

 
 

@@ -120,37 +121,33 @@ href="../gtk/GtkCellRenderer.html"
-

Properties

+

Property Details

-

+

The "color" property

-
  "color"                
  "color"                GimpRGB               : Read / Write
-

+

The "icon-size" property

-
  "icon-size"            gint                  : Read / Write / Construct
+
  "icon-size"            gint                  : Read / Write / Construct

Allowed values: >= 0

Default value: 1

-

+

The "opaque" property

-
  "opaque"               gboolean              : Read / Write / Construct
+
  "opaque"               gboolean              : Read / Write / Construct

Default value: TRUE

- - - -
<< Cell Renderers for GtkTreeViewGimpCellRendererToggle >>
diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html index 22cbdfe2cd..08ebf9a546 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,61 +20,63 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Properties +  |  + Signals +
-

GimpCellRendererToggle

+

GimpCellRendererToggle

GimpCellRendererToggle —

-

Synopsis

+

Synopsis

 
 
 
             GimpCellRendererToggle;
-GtkCellRenderer* gimp_cell_renderer_toggle_new
+GtkCellRenderer* gimp_cell_renderer_toggle_new
                                             (const gchar *stock_id);
 void        gimp_cell_renderer_toggle_clicked
                                             (GimpCellRendererToggle *cell,
                                              const gchar *path,
-                                             GdkModifierType state);
+                                             GdkModifierType state);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkCellRenderer
-               +----GtkCellRendererToggle
-                     +----GimpCellRendererToggle
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkCellRenderer
+                     +----GtkCellRendererToggle
+                           +----GimpCellRendererToggle
-

Properties

+

Properties

 
   "stock-id"             gchararray            : Read / Write / Construct
@@ -81,49 +84,43 @@ href="../gtk/GtkCellRendererToggle.html"
-

Signal Prototypes

+

Signals

 
 "clicked"   void        user_function      (GimpCellRendererToggle *gimpcellrenderertoggle,
-                                            gchar *arg1,
-                                            GdkModifierType arg2,
-                                            gpointer user_data);
+                                            gchar                  *arg1,
+                                            GdkModifierType        *arg2,
+                                            gpointer                user_data)                   : Run last
-

Description

+

Description

-

Details

+

Details

-

+

GimpCellRendererToggle

-
typedef struct _GimpCellRendererToggle GimpCellRendererToggle;
+
typedef struct _GimpCellRendererToggle GimpCellRendererToggle;

-

+

gimp_cell_renderer_toggle_new ()

-
GtkCellRenderer* gimp_cell_renderer_toggle_new
+
GtkCellRenderer* gimp_cell_renderer_toggle_new
                                             (const gchar *stock_id);

 

-Creates a custom version of the GtkCellRendererToggle. Instead of
+Creates a custom version of the GtkCellRendererToggle. Instead of
 showing the standard toggle button, it shows a stock icon if the
 cell is active and no icon otherwise. This cell renderer is for
 example used in the Layers treeview to indicate and control the
-layer's visibility by showing GIMP_STOCK_VISIBLE.

+layer's visibility by showing GIMP_STOCK_VISIBLE.

 

 
 

@@ -150,14 +147,12 @@ layer's visibility by showing GIMP_STOCK_VISIBLE.
 

 

-

+

 gimp_cell_renderer_toggle_clicked ()

-
void        gimp_cell_renderer_toggle_clicked
+
void        gimp_cell_renderer_toggle_clicked
                                             (GimpCellRendererToggle *cell,
                                              const gchar *path,
-                                             GdkModifierType state);

+                                             GdkModifierType state);

 

 Emits the "clicked" signal from a GimpCellRendererToggle.

 

@@ -191,35 +186,33 @@ Emits the "clicked" signal from a 
-
Properties

+
Property Details

 

-

+

 The "stock-id" property

-
  "stock-id"             gchararray            : Read / Write / Construct

+
  "stock-id"             gchararray            : Read / Write / Construct

 

 
Default value: NULL

 

 

 

-

+

 The "stock-size" property

-
  "stock-size"           gint                  : Read / Write / Construct

+
  "stock-size"           gint                  : Read / Write / Construct

 

 
Allowed values: >= 0

 
Default value: 4

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "clicked" signal

-
void        user_function                  (GimpCellRendererToggle *gimpcellrenderertoggle,
-                                            gchar *arg1,
-                                            GdkModifierType arg2,
-                                            gpointer user_data);

+
void        user_function                  (GimpCellRendererToggle *gimpcellrenderertoggle,
+                                            gchar                  *arg1,
+                                            GdkModifierType        *arg2,
+                                            gpointer                user_data)                   : Run last

 

 
 

@@ -255,9 +248,5 @@ href="../gdk/gdk-Windows.html#GdkModifierType"
- - - -
<< GimpCellRendererColorPart II. GIMP Display Filters >>
diff --git a/devel-docs/libgimpwidgets/html/GimpChainButton.html b/devel-docs/libgimpwidgets/html/GimpChainButton.html index 69f1ab975b..a86ba88821 100644 --- a/devel-docs/libgimpwidgets/html/GimpChainButton.html +++ b/devel-docs/libgimpwidgets/html/GimpChainButton.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,33 +20,40 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Signals +
-

GimpChainButton

+

GimpChainButton

GimpChainButton — Widget to visually connect two entry widgets.
-

Synopsis

+

Synopsis

 
 
 
             GimpChainButton;
 enum        GimpChainPosition;
-GtkWidget*  gimp_chain_button_new           (GimpChainPosition position);
+GtkWidget*  gimp_chain_button_new           (GimpChainPosition position);
 void        gimp_chain_button_set_active    (GimpChainButton *button,
                                              gboolean active);
 gboolean    gimp_chain_button_get_active    (GimpChainButton *button);
@@ -53,41 +61,34 @@ gboolean    gimp_cha
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTable
-                           +----GimpChainButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkTable
+                                 +----GimpChainButton
-

Implemented Interfaces

+

Implemented Interfaces

GimpChainButton implements AtkImplementorIface.

-

Signal Prototypes

+

Signals

 
 "toggled"   void        user_function      (GimpChainButton *gimpchainbutton,
-                                            gpointer user_data);
+                                            gpointer         user_data)            : Run first
-

Description

+

Description

This widget provides a button showing either a linked or a broken chain that can be used to link two entries, spinbuttons, colors @@ -104,20 +105,20 @@ necessary.

-

Details

+

Details

-

+

GimpChainButton

-
typedef struct _GimpChainButton GimpChainButton;
+
typedef struct _GimpChainButton GimpChainButton;

-

+

enum GimpChainPosition

-
typedef enum
+
typedef enum
 {
   GIMP_CHAIN_TOP,
   GIMP_CHAIN_LEFT,
@@ -131,11 +132,9 @@ necessary.
-

+

gimp_chain_button_new ()

-
GtkWidget*  gimp_chain_button_new           (GimpChainPosition position);
+
GtkWidget*  gimp_chain_button_new           (GimpChainPosition position);

Creates a new GimpChainButton widget.

@@ -172,9 +171,9 @@ for more than two widgets, but the look is optimized for two.

-

+

gimp_chain_button_set_active ()

-
void        gimp_chain_button_set_active    (GimpChainButton *button,
+
void        gimp_chain_button_set_active    (GimpChainButton *button,
                                              gboolean active);

 

 Sets the state of the GimpChainButton to be either locked (TRUE) or
@@ -202,9 +201,9 @@ unlocked (FALSE) and changes the showed pixmap to r
-

+

gimp_chain_button_get_active ()

-
gboolean    gimp_chain_button_get_active    (GimpChainButton *button);
+
gboolean    gimp_chain_button_get_active    (GimpChainButton *button);

Checks the state of the GimpChainButton.

@@ -230,12 +229,12 @@ Checks the state of the <

-

Signals

+

Signal Details

-

+

The "toggled" signal

-
void        user_function                  (GimpChainButton *gimpchainbutton,
-                                            gpointer user_data);
+
void        user_function                  (GimpChainButton *gimpchainbutton,
+                                            gpointer         user_data)            : Run first

@@ -259,16 +258,12 @@ Checks the state of the <
-

See Also

+

See Also

You may want to use the convenience function gimp_coordinates_new() to set up two GimpSizeEntries (see GimpSizeEntry) linked with a GimpChainButton.

- - - -
<< GimpButtonGimpColorArea >>
diff --git a/devel-docs/libgimpwidgets/html/GimpColorArea.html b/devel-docs/libgimpwidgets/html/GimpColorArea.html index 6601d66337..f44dcfd978 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorArea.html +++ b/devel-docs/libgimpwidgets/html/GimpColorArea.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,39 +20,44 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Signals +
-

GimpColorArea

+

GimpColorArea

GimpColorArea — Displays a GimpRGB color, optionally with alpha-channel.
-

Synopsis

+

Synopsis

 
 
 
             GimpColorArea;
 enum        GimpColorAreaType;
-GtkWidget*  gimp_color_area_new             (const gimp_color_area_new             (const GimpRGB *color,
                                              GimpColorAreaType type,
-                                             GdkModifierType drag_mask);
+                                             GdkModifierType drag_mask);
 void        gimp_color_area_set_color       (GimpColorArea *area,
                                              const gimp_co
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpColorArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpColorArea
-

Implemented Interfaces

+

Implemented Interfaces

GimpColorArea implements AtkImplementorIface.

-

Signal Prototypes

+

Signals

 
 "color-changed"
             void        user_function      (GimpColorArea *gimpcolorarea,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
-

Description

+

Description

-

Details

+

Details

-

+

GimpColorArea

-
typedef struct _GimpColorArea GimpColorArea;
+
typedef struct _GimpColorArea GimpColorArea;

-

+

enum GimpColorAreaType

-
typedef enum
+
typedef enum
 {
   GIMP_COLOR_AREA_FLAT = 0,
   GIMP_COLOR_AREA_SMALL_CHECKS,
@@ -133,17 +134,13 @@ GimpColorArea implements
-

+

gimp_color_area_new ()

-
GtkWidget*  gimp_color_area_new             (const 
GtkWidget*  gimp_color_area_new             (const GimpRGB *color,
                                              GimpColorAreaType type,
-                                             GdkModifierType drag_mask);

+                                             GdkModifierType drag_mask);

Creates a new GimpColorArea widget.

@@ -187,9 +184,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
-

+

gimp_color_area_set_color ()

-
void        gimp_color_area_set_color       (GimpColorArea *area,
+
void        gimp_color_area_set_color       (GimpColorArea *area,
                                              const GimpRGB *color);

@@ -220,9 +217,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
-

+

gimp_color_area_get_color ()

-
void        gimp_color_area_get_color       (GimpColorArea *area,
+
void        gimp_color_area_get_color       (GimpColorArea *area,
                                              GimpRGB *color);

@@ -253,9 +250,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
-

+

gimp_color_area_has_alpha ()

-
gboolean    gimp_color_area_has_alpha       (GimpColorArea *area);
+
gboolean    gimp_color_area_has_alpha       (GimpColorArea *area);

Checks whether the area shows transparency information. This is determined via the area's GimpColorAreaType.

@@ -282,9 +279,9 @@ via the area's -

+

gimp_color_area_set_type ()

-
void        gimp_color_area_set_type        (GimpColorArea *area,
+
void        gimp_color_area_set_type        (GimpColorArea *area,
                                              GimpColorAreaType type);

 

 Allows to change the type of area. The GimpColorAreaType determines
@@ -313,9 +310,9 @@ the checkerboard used to do that.
-

+

gimp_color_area_set_draw_border ()

-
void        gimp_color_area_set_draw_border (GimpColorArea *area,
+
void        gimp_color_area_set_draw_border (GimpColorArea *area,
                                              gboolean draw_border);

 

 The area can draw a thin border in the foreground color around
@@ -344,12 +341,12 @@ off. The default is not draw a border.
-

Signals

+

Signal Details

-

+

The "color-changed" signal

-
void        user_function                  (GimpColorArea *gimpcolorarea,
-                                            gpointer user_data);
+
void        user_function                  (GimpColorArea *gimpcolorarea,
+                                            gpointer       user_data)          : Run first

@@ -373,9 +370,5 @@ off. The default is not draw a border.

- - - -
<< GimpChainButtonGimpColorButton >>
diff --git a/devel-docs/libgimpwidgets/html/GimpColorButton.html b/devel-docs/libgimpwidgets/html/GimpColorButton.html index 845b731277..5acafee92a 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorButton.html +++ b/devel-docs/libgimpwidgets/html/GimpColorButton.html @@ -1,3 +1,4 @@ + @@ -7,7 +8,7 @@ - + @@ -19,32 +20,39 @@ - +
+ - + +Top +  |  + Description +  |  + Object Hierarchy +  |  + Signals +
-

GimpColorButton

+

GimpColorButton

GimpColorButton — Widget for selecting a color from a simple button.
-

Synopsis

+

Synopsis

 
 
 
             GimpColorButton;
-GtkWidget*  gimp_color_button_new           (const gchar *title,
+GtkWidget*  gimp_color_button_new           (const gchar *title,
                                              gint width,
                                              gint height,
                                              const gimp_color
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpButton
-                                       +----GimpColorButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpButton
+                                             +----GimpColorButton
-

Implemented Interfaces

+

Implemented Interfaces

GimpColorButton implements AtkImplementorIface.

-

Signal Prototypes

+

Signals

 
 "color-changed"
             void        user_function      (GimpColorButton *gimpcolorbutton,
-                                            gpointer user_data);
+                                            gpointer         user_data)            : Run first
-

Description

+

Description

This widget provides a simple button with a preview showing the color. @@ -121,22 +120,20 @@ color, the "color_changed" signal is emitted.

-

Details

+

Details

-

+

GimpColorButton

-
typedef struct _GimpColorButton GimpColorButton;
+
typedef struct _GimpColorButton GimpColorButton;

-

+

gimp_color_button_new ()

-
GtkWidget*  gimp_color_button_new           (const gchar *title,
+
GtkWidget*  gimp_color_button_new           (const gchar *title,
                                              gint width,
                                              gint height,
                                              const 
 

 

-

+

 gimp_color_button_set_color ()

-
void        gimp_color_button_set_color     (GimpColorButton *button,
+
void        gimp_color_button_set_color     (GimpColorButton *button,
                                              const GimpRGB *color);

@@ -234,9 +231,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-

+

 gimp_color_button_get_color ()

-
void        gimp_color_button_get_color     (GimpColorButton *button,
+
void        gimp_color_button_get_color     (GimpColorButton *button,
                                              GimpRGB *color);

@@ -267,9 +264,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-

+

 gimp_color_button_set_update ()

-
void        gimp_color_button_set_update    (GimpColorButton *button,
+
void        gimp_color_button_set_update    (GimpColorButton *button,
                                              gboolean continuous);

 

 When set to TRUE, the button will emit the "color_changed"
@@ -298,9 +295,9 @@ dialog.

 

 

 

-

+

 gimp_color_button_get_update ()

-
gboolean    gimp_color_button_get_update    (GimpColorButton *button);

+
gboolean    gimp_color_button_get_update    (GimpColorButton *button);

 

 Returns the color button's continuous_update property.

 

@@ -326,9 +323,9 @@ Returns the color button's continuous_update<
 

 

 

-

+

 gimp_color_button_has_alpha ()

-
gboolean    gimp_color_button_has_alpha     (GimpColorButton *button);

+
gboolean    gimp_color_button_has_alpha     (GimpColorButton *button);

 

 Checks whether the buttons shows transparency information.

 

@@ -355,9 +352,9 @@ otherwise.
 

 

 

-

+

 gimp_color_button_set_type ()

-
void        gimp_color_button_set_type      (GimpColorButton *button,
+
void        gimp_color_button_set_type      (GimpColorButton *button,
                                              GimpColorAreaType type);

 

 Sets the button to the given type. See also gimp_color_area_set_type().

@@ -384,12 +381,12 @@ Sets the button to the given 
-
Signals

+
Signal Details

 

-

+

 The "color-changed" signal

-
void        user_function                  (GimpColorButton *gimpcolorbutton,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorButton *gimpcolorbutton,
+                                            gpointer         user_data)            : Run first

 

 
 

@@ -413,15 +410,11 @@ Sets the button to the given 
-
See Also

+
See Also

 

 libgimpcolor-gimpcolorspace
 

 

 

-
-
-
-
<< GimpColorAreaGimpColorHexEntry >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html
index 7657fdfa50..d4127ffc01 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,35 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Properties
+                   | 
+                  Signals
+
 

 

 

 
-
GimpColorDisplay

+
GimpColorDisplay

 
GimpColorDisplay — Pluggable GIMP display color correction modules.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -60,9 +72,7 @@ href="../libgimpbase/libgimpbase-gimpparasite.html#GimpParasite"
 GimpParasite* gimp_color_display_save_state (GimpColorDisplay *display);
-GtkWidget*  gimp_color_display_configure    (GimpColorDisplay *display);
+GtkWidget*  gimp_color_display_configure    (GimpColorDisplay *display);
 void        gimp_color_display_configure_reset
                                             (GimpColorDisplay *display);
 void        gimp_color_display_changed      (GimpColorDisplay *display);
@@ -70,7 +80,7 @@ void        gimp_colo
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
@@ -78,42 +88,42 @@ void        gimp_colo
 

 

 

-
Properties

+
Properties

 
 
   "enabled"              gboolean              : Read / Write / Construct
 

 

 

-
Signal Prototypes

+
Signals

 
 
 "changed"   void        user_function      (GimpColorDisplay *gimpcolordisplay,
-                                            gpointer user_data);
+                                            gpointer          user_data)             : Run first
 

 

 

-
Description

+
Description

 

 Functions and definitions for creating pluggable GIMP
 display color correction modules.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorDisplay

-
typedef struct _GimpColorDisplay GimpColorDisplay;

+
typedef struct _GimpColorDisplay GimpColorDisplay;

 

 
 

 

 

 

-

+

 gimp_color_display_new ()

-
GimpColorDisplay* gimp_color_display_new    (GType display_type);

+
GimpColorDisplay* gimp_color_display_new    (GType display_type);

 

 
 

@@ -139,9 +149,9 @@ display color correction modules.
 

 

 

-

+

 gimp_color_display_clone ()

-
GimpColorDisplay* gimp_color_display_clone  (GimpColorDisplay *display);

+
GimpColorDisplay* gimp_color_display_clone  (GimpColorDisplay *display);

 

 
 

@@ -167,9 +177,9 @@ display color correction modules.
 

 

 

-

+

 gimp_color_display_set_enabled ()

-
void        gimp_color_display_set_enabled  (GimpColorDisplay *display,
+
void        gimp_color_display_set_enabled  (GimpColorDisplay *display,
                                              gboolean enabled);

 

 
@@ -196,9 +206,9 @@ display color correction modules.
 

 

 

-

+

 gimp_color_display_get_enabled ()

-
gboolean    gimp_color_display_get_enabled  (GimpColorDisplay *display);

+
gboolean    gimp_color_display_get_enabled  (GimpColorDisplay *display);

 

 
 

@@ -224,9 +234,9 @@ display color correction modules.
 

 

 

-

+

 gimp_color_display_convert ()

-
void        gimp_color_display_convert      (GimpColorDisplay *display,
+
void        gimp_color_display_convert      (GimpColorDisplay *display,
                                              guchar *buf,
                                              gint width,
                                              gint height,
@@ -281,9 +291,9 @@ display color correction modules.
 

 

 

-

+

 gimp_color_display_load_state ()

-
void        gimp_color_display_load_state   (GimpColorDisplay *display,
+
void        gimp_color_display_load_state   (GimpColorDisplay *display,
                                              GimpParasite *state);

@@ -312,9 +322,9 @@ href="../libgimpbase/libgimpbase-gimpparasite.html#GimpParasite"
 

 

 

-

+

 gimp_color_display_save_state ()

-
GimpParasite* gimp_color_display_save_state (GimpColorDisplay *display);

 

@@ -342,11 +352,9 @@ href="../libgimpbase/libgimpbase-gimpparasite.html#GimpParasite"
 

 

 

-

+

 gimp_color_display_configure ()

-
GtkWidget*  gimp_color_display_configure    (GimpColorDisplay *display);

+
GtkWidget*  gimp_color_display_configure    (GimpColorDisplay *display);

 

 
 

@@ -372,9 +380,9 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 gimp_color_display_configure_reset ()

-
void        gimp_color_display_configure_reset
+
void        gimp_color_display_configure_reset
                                             (GimpColorDisplay *display);

 

 
@@ -393,9 +401,9 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 gimp_color_display_changed ()

-
void        gimp_color_display_changed      (GimpColorDisplay *display);

+
void        gimp_color_display_changed      (GimpColorDisplay *display);

 

 
 

@@ -413,22 +421,22 @@ href="../gtk/GtkWidget.html"
 

 

 

-
Properties

+
Property Details

 

-

+

 The "enabled" property

-
  "enabled"              gboolean              : Read / Write / Construct

+
  "enabled"              gboolean              : Read / Write / Construct

 

 
Default value: TRUE

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "changed" signal

-
void        user_function                  (GimpColorDisplay *gimpcolordisplay,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorDisplay *gimpcolordisplay,
+                                            gpointer          user_data)             : Run first

 

 
 

@@ -452,7 +460,7 @@ href="../gtk/GtkWidget.html"
 

 

 

-
See Also

+
See Also

 

 GModule
 

@@ -464,9 +472,5 @@ href="../gtk/GtkWidget.html"
 

 

 

-
-
-
-
<< Part II. GIMP Display FiltersGimpColorDisplayStack >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html
index 214e7f8b4f..c43f410115 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,33 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpColorDisplayStack

+
GimpColorDisplayStack

 
GimpColorDisplayStack — 

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -69,7 +79,7 @@ void        
-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
@@ -77,45 +87,45 @@ void        
-
Signal Prototypes

+
Signals

 
 
 "added"     void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 "changed"   void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            gpointer user_data);
+                                            gpointer               user_data)                  : Run first
 "removed"   void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gpointer               user_data)                  : Run first
 "reordered" void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpColorDisplayStack

-
typedef struct _GimpColorDisplayStack GimpColorDisplayStack;

+
typedef struct _GimpColorDisplayStack GimpColorDisplayStack;

 

 
 

 

 

 

-

+

 gimp_color_display_stack_new ()

-
GimpColorDisplayStack* gimp_color_display_stack_new
+
GimpColorDisplayStack* gimp_color_display_stack_new
                                             (void);

 

 
@@ -134,9 +144,9 @@ void        
-

+

 gimp_color_display_stack_clone ()

-
GimpColorDisplayStack* gimp_color_display_stack_clone
+
GimpColorDisplayStack* gimp_color_display_stack_clone
                                             (GimpColorDisplayStack *stack);

 

 
@@ -163,9 +173,9 @@ void        
-

+

 gimp_color_display_stack_changed ()

-
void        gimp_color_display_stack_changed
+
void        gimp_color_display_stack_changed
                                             (GimpColorDisplayStack *stack);

 

 
@@ -184,9 +194,9 @@ void        
-

+

 gimp_color_display_stack_add ()

-
void        gimp_color_display_stack_add    (GimpColorDisplayStack *stack,
+
void        gimp_color_display_stack_add    (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);

 

 
@@ -213,9 +223,9 @@ void        
-

+

 gimp_color_display_stack_remove ()

-
void        gimp_color_display_stack_remove (GimpColorDisplayStack *stack,
+
void        gimp_color_display_stack_remove (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);

 

 
@@ -242,9 +252,9 @@ void        
-

+

 gimp_color_display_stack_reorder_up ()

-
void        gimp_color_display_stack_reorder_up
+
void        gimp_color_display_stack_reorder_up
                                             (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);

 

@@ -272,9 +282,9 @@ void        
-

+

 gimp_color_display_stack_reorder_down ()

-
void        gimp_color_display_stack_reorder_down
+
void        gimp_color_display_stack_reorder_down
                                             (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);

 

@@ -302,9 +312,9 @@ void        
-

+

 gimp_color_display_stack_convert ()

-
void        gimp_color_display_stack_convert
+
void        gimp_color_display_stack_convert
                                             (GimpColorDisplayStack *stack,
                                              guchar *buf,
                                              gint width,
@@ -360,14 +370,14 @@ void        
-
Signals

+
Signal Details

 

-

+

 The "added" signal

-
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first

 

 
 

@@ -403,10 +413,10 @@ void        
-

+

 The "changed" signal

-
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            gpointer               user_data)                  : Run first

 

 
 

@@ -430,11 +440,11 @@ void        
-

+

 The "removed" signal

-
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gpointer               user_data)                  : Run first

 

 
 

@@ -464,12 +474,12 @@ void        
-

+

 The "reordered" signal

-
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first

 

 
 

@@ -505,9 +515,5 @@ void        
-<< GimpColorDisplay
-Part III. GIMP Color Selectors >>
-
 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html
index 53b4995986..c86e14ab00 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpColorHexEntry

+
GimpColorHexEntry

 
GimpColorHexEntry — Widget for entering a color's hex triplet.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpColorHexEntry;
-GtkWidget*  gimp_color_hex_entry_new        (void);
+GtkWidget*  gimp_color_hex_entry_new        (void);
 void        gimp_color_hex_entry_set_color  (GimpColorHexEntry *entry,
                                              const 
 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkEntry
-                     +----GimpColorHexEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkEntry
+                           +----GimpColorHexEntry
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorHexEntry implements
- AtkImplementorIface,  GtkEditable and  GtkCellEditable.

+ AtkImplementorIface,  GtkEditable and  GtkCellEditable.

 

 

-
Signal Prototypes

+
Signals

 
 
 "color-changed"
             void        user_function      (GimpColorHexEntry *gimpcolorhexentry,
-                                            gpointer user_data);
+                                            gpointer           user_data)              : Run first
 

 

 

-
Description

+
Description

 

 Widget for entering a color's hex triplet.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorHexEntry

-
typedef struct _GimpColorHexEntry GimpColorHexEntry;

+
typedef struct _GimpColorHexEntry GimpColorHexEntry;

 

 
 

 

 

 

-

+

 gimp_color_hex_entry_new ()

-
GtkWidget*  gimp_color_hex_entry_new        (void);

+
GtkWidget*  gimp_color_hex_entry_new        (void);

 

 

 

@@ -135,9 +132,9 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 gimp_color_hex_entry_set_color ()

-
void        gimp_color_hex_entry_set_color  (GimpColorHexEntry *entry,
+
void        gimp_color_hex_entry_set_color  (GimpColorHexEntry *entry,
                                              const GimpRGB *color);

@@ -172,9 +169,9 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-

+

 gimp_color_hex_entry_get_color ()

-
void        gimp_color_hex_entry_get_color  (GimpColorHexEntry *entry,
+
void        gimp_color_hex_entry_get_color  (GimpColorHexEntry *entry,
                                              GimpRGB *color);

@@ -207,12 +204,12 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-
Signals

+
Signal Details

 

-

+

 The "color-changed" signal

-
void        user_function                  (GimpColorHexEntry *gimpcolorhexentry,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorHexEntry *gimpcolorhexentry,
+                                            gpointer           user_data)              : Run first

 

 
 

@@ -236,9 +233,5 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-
-
-
-
<< GimpColorButtonGimpColorScale >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html
index 1b2952b569..75fd39322c 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Style Properties
+
 

 

 

 
-
GimpColorNotebook

+
GimpColorNotebook

 
GimpColorNotebook — A GimpColorSelector implementation.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpColorNotebook;
-GtkWidget*  gimp_color_notebook_set_has_page
+GtkWidget*  gimp_color_notebook_set_has_page
                                             (GimpColorNotebook *notebook,
                                              GType page_type,
                                              gboolean has_page);
@@ -52,69 +60,56 @@ href="../gtk/GtkWidget.html"
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorNotebook
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorNotebook
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorNotebook implements
  AtkImplementorIface.

 

 

-
Style Properties

+
Style Properties

 
 
   "tab-border"           gint                  : Read
-  "tab-icon-size"        GtkIconSize           : Read
+  "tab-icon-size"        GtkIconSize           : Read
 

 

 

-
Description

+
Description

 

 The GimpColorNotebook widget is an implementation of a GimpColorSelector.
 It serves as a container for GimpColorSelectors.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorNotebook

-
typedef struct _GimpColorNotebook GimpColorNotebook;

+
typedef struct _GimpColorNotebook GimpColorNotebook;

 

 
 

 

 

 

-

+

 gimp_color_notebook_set_has_page ()

-
GtkWidget*  gimp_color_notebook_set_has_page
+
GtkWidget*  gimp_color_notebook_set_has_page
                                             (GimpColorNotebook *notebook,
                                              GType page_type,
                                              gboolean has_page);

@@ -157,30 +152,24 @@ The page_type passed must be a 
-
Style Properties

+
Style Property Details

 

-

+

 The "tab-border" style property

-
  "tab-border"           gint                  : Read

+
  "tab-border"           gint                  : Read

 
Width of the border around the tab contents.

 
Allowed values: >= 0

 
Default value: 0

 

 

 

-

+

 The "tab-icon-size" style property

-
  "tab-icon-size"        GtkIconSize           : Read

+
  "tab-icon-size"        GtkIconSize           : Read

 
Size for icons displayed in the tab.

 
Default value: GTK_ICON_SIZE_BUTTON

 

 

 

-
-
-
-
<< GimpColorSelectorGimpColorScales >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorScale.html b/devel-docs/libgimpwidgets/html/GimpColorScale.html
index 0d9681cda0..ff4b38e3a8 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorScale.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorScale.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,34 +20,37 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpColorScale

+
GimpColorScale

 
GimpColorScale — Fancy colored sliders.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpColorScale;
-GtkWidget*  gimp_color_scale_new            (GtkOrientation orientation,
+GtkWidget*  gimp_color_scale_new            (GtkOrientation orientation,
                                              GimpColorSelectorChannel channel);
 void        gimp_color_scale_set_channel    (GimpColorScale *scale,
                                              GimpColorSelectorChannel channel);
@@ -61,56 +65,45 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkRange
-                     +----GtkScale
-                           +----GimpColorScale
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkRange
+                           +----GtkScale
+                                 +----GimpColorScale
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorScale implements
  AtkImplementorIface.

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpColorScale

-
typedef struct _GimpColorScale GimpColorScale;

+
typedef struct _GimpColorScale GimpColorScale;

 

 
 

 

 

 

-

+

 gimp_color_scale_new ()

-
GtkWidget*  gimp_color_scale_new            (GtkOrientation orientation,
+
GtkWidget*  gimp_color_scale_new            (GtkOrientation orientation,
                                              GimpColorSelectorChannel channel);

 

 Creates a new GimpColorScale widget.

@@ -143,9 +136,9 @@ Creates a new 
-

+

 gimp_color_scale_set_channel ()

-
void        gimp_color_scale_set_channel    (GimpColorScale *scale,
+
void        gimp_color_scale_set_channel    (GimpColorScale *scale,
                                              GimpColorSelectorChannel channel);

 

 Changes the color channel displayed by the scale.

@@ -172,9 +165,9 @@ Changes the color channel displayed by the scale
 

 

-

+

 gimp_color_scale_set_color ()

-
void        gimp_color_scale_set_color      (GimpColorScale *scale,
+
void        gimp_color_scale_set_color      (GimpColorScale *scale,
                                              const GimpRGB *rgb,
@@ -216,9 +209,5 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-
-
-
-
<< GimpColorHexEntryGimpColorSelection >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorScales.html b/devel-docs/libgimpwidgets/html/GimpColorScales.html
index 651f6d25bf..abbba4dc00 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorScales.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorScales.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,31 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpColorScales

+
GimpColorScales

 
GimpColorScales — A GimpColorSelector implementation.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -46,37 +54,28 @@
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorScales
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorScales
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorScales implements
  AtkImplementorIface.

 

 

-
Description

+
Description

 

 The GimpColorScales widget is an implementation of a GimpColorSelector.
 It shows a group of GimpColorScale widgets that allow to adjust the
@@ -84,20 +83,16 @@ HSV and RGB color channels.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorScales

-
typedef struct _GimpColorScales GimpColorScales;

+
typedef struct _GimpColorScales GimpColorScales;

 

 
 

 

 

 

-
-
-
-
<< GimpColorNotebookGimpColorSelect >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelect.html b/devel-docs/libgimpwidgets/html/GimpColorSelect.html
index 20183c407b..d1542170df 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorSelect.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorSelect.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,31 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpColorSelect

+
GimpColorSelect

 
GimpColorSelect — A GimpColorSelector implementation.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -46,37 +54,28 @@
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorSelect
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorSelect
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorSelect implements
  AtkImplementorIface.

 

 

-
Description

+
Description

 

 The GimpColorSelect widget is an implementation of a GimpColorSelector.
 It shows a square area that allows to interactively change two color channels
@@ -86,20 +85,16 @@ will then change the other two channels accordingly.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorSelect

-
typedef struct _GimpColorSelect GimpColorSelect;

+
typedef struct _GimpColorSelect GimpColorSelect;

 

 
 

 

 

 

-
-
-
-
<< GimpColorScalesPart IV. GIMP Controllers >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelection.html b/devel-docs/libgimpwidgets/html/GimpColorSelection.html
index 1bf47ba7ed..c1ffe78c7c 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorSelection.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorSelection.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpColorSelection

+
GimpColorSelection

 
GimpColorSelection — Widget for doing a color selection.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpColorSelection;
-GtkWidget*  gimp_color_selection_new        (void);
+GtkWidget*  gimp_color_selection_new        (void);
 void        gimp_color_selection_set_show_alpha
                                             (GimpColorSelection *selection,
                                              gboolean show_alpha);
@@ -75,66 +83,55 @@ void        
 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelection
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelection
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorSelection implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "color-changed"
             void        user_function      (GimpColorSelection *gimpcolorselection,
-                                            gpointer user_data);
+                                            gpointer            user_data)               : Run first
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpColorSelection

-
typedef struct _GimpColorSelection GimpColorSelection;

+
typedef struct _GimpColorSelection GimpColorSelection;

 

 
 

 

 

 

-

+

 gimp_color_selection_new ()

-
GtkWidget*  gimp_color_selection_new        (void);

+
GtkWidget*  gimp_color_selection_new        (void);

 

 Creates a new GimpColorSelection widget.

 

@@ -152,9 +149,9 @@ Creates a new 
 

 

-

+

 gimp_color_selection_set_show_alpha ()

-
void        gimp_color_selection_set_show_alpha
+
void        gimp_color_selection_set_show_alpha
                                             (GimpColorSelection *selection,
                                              gboolean show_alpha);

 

@@ -182,9 +179,9 @@ Sets the show_alpha property of the 
 

 

-

+

 gimp_color_selection_get_show_alpha ()

-
gboolean    gimp_color_selection_get_show_alpha
+
gboolean    gimp_color_selection_get_show_alpha
                                             (GimpColorSelection *selection);

 

 Returns the selection's show_alpha property.

@@ -211,9 +208,9 @@ Returns the selection's 
-

+

 gimp_color_selection_set_color ()

-
void        gimp_color_selection_set_color  (GimpColorSelection *selection,
+
void        gimp_color_selection_set_color  (GimpColorSelection *selection,
                                              const GimpRGB *color);

@@ -242,9 +239,9 @@ Sets the 
 

 

-

+

 gimp_color_selection_get_color ()

-
void        gimp_color_selection_get_color  (GimpColorSelection *selection,
+
void        gimp_color_selection_get_color  (GimpColorSelection *selection,
                                              GimpRGB *color);

@@ -273,9 +270,9 @@ This function returns the 
-

+

 gimp_color_selection_set_old_color ()

-
void        gimp_color_selection_set_old_color
+
void        gimp_color_selection_set_old_color
                                             (GimpColorSelection *selection,
                                              const 
 

 

-

+

 gimp_color_selection_get_old_color ()

-
void        gimp_color_selection_get_old_color
+
void        gimp_color_selection_get_old_color
                                             (GimpColorSelection *selection,
                                              
-

+

 gimp_color_selection_reset ()

-
void        gimp_color_selection_reset      (GimpColorSelection *selection);

+
void        gimp_color_selection_reset      (GimpColorSelection *selection);

 

 Sets the GimpColorSelection's current color to its old color.

 

@@ -357,9 +354,9 @@ Sets the 
 

 

-

+

 gimp_color_selection_color_changed ()

-
void        gimp_color_selection_color_changed
+
void        gimp_color_selection_color_changed
                                             (GimpColorSelection *selection);

 

 Emits the "color_changed" signal.

@@ -378,12 +375,12 @@ Emits the "color_changed" signal.

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "color-changed" signal

-
void        user_function                  (GimpColorSelection *gimpcolorselection,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorSelection *gimpcolorselection,
+                                            gpointer            user_data)               : Run first

 

 
 

@@ -407,9 +404,5 @@ Emits the "color_changed" signal.

 

 

 

-
-
-
-
<< GimpColorScaleGimpDialog >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelector.html b/devel-docs/libgimpwidgets/html/GimpColorSelector.html
index b8d4b6380a..d57300db33 100644
--- a/devel-docs/libgimpwidgets/html/GimpColorSelector.html
+++ b/devel-docs/libgimpwidgets/html/GimpColorSelector.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,33 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpColorSelector

+
GimpColorSelector

 
GimpColorSelector — Pluggable GIMP color selector modules.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -45,9 +55,7 @@
 #define     GIMP_COLOR_SELECTOR_SIZE
 #define     GIMP_COLOR_SELECTOR_BAR_SIZE
 enum        GimpColorSelectorChannel;
-GtkWidget*  gimp_color_selector_new         (GType selector_type,
+GtkWidget*  gimp_color_selector_new         (GType selector_type,
                                              const GimpRGB *rgb,
@@ -81,74 +89,65 @@ void        
 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorNotebook
-                                       +----GimpColorScales
-                                       +----GimpColorSelect
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorNotebook
+                                             +----GimpColorScales
+                                             +----GimpColorSelect
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpColorSelector implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "channel-changed"
             void        user_function      (GimpColorSelector *gimpcolorselector,
-                                            gint arg1,
-                                            gpointer user_data);
+                                            gint               arg1,
+                                            gpointer           user_data)              : Run first
 "color-changed"
             void        user_function      (GimpColorSelector *gimpcolorselector,
-                                            gpointer arg1,
-                                            gpointer arg2,
-                                            gpointer user_data);
+                                            gpointer           arg1,
+                                            gpointer           arg2,
+                                            gpointer           user_data)              : Run first
 

 

 

-
Description

+
Description

 

 Functions and definitions for creating pluggable GIMP color
 selector modules.
 

 

 

-
Details

+
Details

 

-

+

 GimpColorSelector

-
typedef struct _GimpColorSelector GimpColorSelector;

+
typedef struct _GimpColorSelector GimpColorSelector;

 

 
 

 

 

 

-

+

 GIMP_COLOR_SELECTOR_SIZE

-
#define GIMP_COLOR_SELECTOR_SIZE      150
+
#define GIMP_COLOR_SELECTOR_SIZE      150
 

 

 The suggested size for a color area in a GimpColorSelector implementation.
@@ -156,9 +155,9 @@ The suggested size for a color area in a 
 

 

-

+

 GIMP_COLOR_SELECTOR_BAR_SIZE

-
#define GIMP_COLOR_SELECTOR_BAR_SIZE  15
+
#define GIMP_COLOR_SELECTOR_BAR_SIZE  15
 

 

 The suggested width for a color bar in a GimpColorSelector implementation.
@@ -166,9 +165,9 @@ The suggested width for a color bar in a 
 

 

-

+

 enum GimpColorSelectorChannel

-
typedef enum
+
typedef enum
 {
   GIMP_COLOR_SELECTOR_HUE,
   GIMP_COLOR_SELECTOR_SATURATION,
@@ -187,43 +186,43 @@ The suggested width for a color bar in a 
 
 
-GIMP_COLOR_SELECTOR_HUE
+GIMP_COLOR_SELECTOR_HUE
 the hue channel
 
 
 
 
-GIMP_COLOR_SELECTOR_SATURATION
+GIMP_COLOR_SELECTOR_SATURATION
 the saturation channel
 
 
 
 
-GIMP_COLOR_SELECTOR_VALUE
+GIMP_COLOR_SELECTOR_VALUE
 the value channel
 
 
 
 
-GIMP_COLOR_SELECTOR_RED
+GIMP_COLOR_SELECTOR_RED
 the red channel
 
 
 
 
-GIMP_COLOR_SELECTOR_GREEN
+GIMP_COLOR_SELECTOR_GREEN
 the green channel
 
 
 
 
-GIMP_COLOR_SELECTOR_BLUE
+GIMP_COLOR_SELECTOR_BLUE
 the blue channel
 
 
 
 
-GIMP_COLOR_SELECTOR_ALPHA
+GIMP_COLOR_SELECTOR_ALPHA
 the alpha channel
 
 
@@ -233,11 +232,9 @@ The suggested width for a color bar in a 
 

 

-

+

 gimp_color_selector_new ()

-
GtkWidget*  gimp_color_selector_new         (GType selector_type,
+
GtkWidget*  gimp_color_selector_new         (GType selector_type,
                                              const GimpRGB *rgb,
@@ -288,9 +285,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_set_toggles_visible ()

-
void        gimp_color_selector_set_toggles_visible
+
void        gimp_color_selector_set_toggles_visible
                                             (GimpColorSelector *selector,
                                              gboolean visible);

 

@@ -318,9 +315,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_set_toggles_sensitive ()

-
void        gimp_color_selector_set_toggles_sensitive
+
void        gimp_color_selector_set_toggles_sensitive
                                             (GimpColorSelector *selector,
                                              gboolean sensitive);

 

@@ -348,9 +345,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_set_show_alpha ()

-
void        gimp_color_selector_set_show_alpha
+
void        gimp_color_selector_set_show_alpha
                                             (GimpColorSelector *selector,
                                              gboolean show_alpha);

 

@@ -378,9 +375,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_set_color ()

-
void        gimp_color_selector_set_color   (GimpColorSelector *selector,
+
void        gimp_color_selector_set_color   (GimpColorSelector *selector,
                                              const GimpRGB *rgb,
@@ -418,9 +415,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_set_channel ()

-
void        gimp_color_selector_set_channel (GimpColorSelector *selector,
+
void        gimp_color_selector_set_channel (GimpColorSelector *selector,
                                              GimpColorSelectorChannel channel);

 

 
@@ -447,9 +444,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_color_changed ()

-
void        gimp_color_selector_color_changed
+
void        gimp_color_selector_color_changed
                                             (GimpColorSelector *selector);

 

 
@@ -468,9 +465,9 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 gimp_color_selector_channel_changed ()

-
void        gimp_color_selector_channel_changed
+
void        gimp_color_selector_channel_changed
                                             (GimpColorSelector *selector);

 

 
@@ -489,13 +486,13 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-
Signals

+
Signal Details

 

-

+

 The "channel-changed" signal

-
void        user_function                  (GimpColorSelector *gimpcolorselector,
-                                            gint arg1,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorSelector *gimpcolorselector,
+                                            gint               arg1,
+                                            gpointer           user_data)              : Run first

 

 
 

@@ -525,12 +522,12 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-

+

 The "color-changed" signal

-
void        user_function                  (GimpColorSelector *gimpcolorselector,
-                                            gpointer arg1,
-                                            gpointer arg2,
-                                            gpointer user_data);

+
void        user_function                  (GimpColorSelector *gimpcolorselector,
+                                            gpointer           arg1,
+                                            gpointer           arg2,
+                                            gpointer           user_data)              : Run first

 

 
 

@@ -566,7 +563,7 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-
See Also

+
See Also

 

 GModule
 

@@ -578,9 +575,5 @@ href="../libgimpcolor/libgimpcolor-GimpHSV.html#GimpHSV"
 

 

 

-
-
-
-
<< Part III. GIMP Color SelectorsGimpColorNotebook >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpController.html b/devel-docs/libgimpwidgets/html/GimpController.html
index d00a493ff3..161ebd04e2 100644
--- a/devel-docs/libgimpwidgets/html/GimpController.html
+++ b/devel-docs/libgimpwidgets/html/GimpController.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,35 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Properties
+                   | 
+                  Signals
+
 

 

 

 
-
GimpController

+
GimpController

 
GimpController — Pluggable GIMP input controller modules.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -60,7 +72,7 @@ gboolean    gimp_controller_
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
@@ -68,7 +80,7 @@ gboolean    gimp_controller_
 

 

 

-
Properties

+
Properties

 
 
   "name"                 gchararray            : Read / Write / Construct
@@ -76,26 +88,26 @@ gboolean    gimp_controller_
 

 

 

-
Signal Prototypes

+
Signals

 
 
 "event"     gboolean    user_function      (GimpController *gimpcontroller,
-                                            gpointer arg1,
-                                            gpointer user_data);
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run last
 

 

 

-
Description

+
Description

 

 An abstract interface for implementing arbitrary input controllers.
 

 

 

-
Details

+
Details

 

-

+

 enum GimpControllerEventType

-
typedef enum
+
typedef enum
 {
   GIMP_CONTROLLER_EVENT_TRIGGER,
   GIMP_CONTROLLER_EVENT_VALUE
@@ -107,9 +119,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 GimpControllerEventAny

-
typedef struct {
+
typedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
   gint                     event_id;
@@ -121,9 +133,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 GimpControllerEventTrigger

-
typedef struct {
+
typedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
   gint                     event_id;
@@ -135,9 +147,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 GimpControllerEventValue

-
typedef struct {
+
typedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
   gint                     event_id;
@@ -150,9 +162,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 union GimpControllerEvent

-
union GimpControllerEvent
+
union GimpControllerEvent
 {
   GimpControllerEventType    type;
   GimpControllerEventAny     any;
@@ -166,18 +178,18 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 GimpController

-
typedef struct _GimpController GimpController;

+
typedef struct _GimpController GimpController;

 

 
 

 

 

 

-

+

 gimp_controller_new ()

-
GimpController* gimp_controller_new         (GType controller_type);

+
GimpController* gimp_controller_new         (GType controller_type);

 

 
 

@@ -203,9 +215,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 gimp_controller_get_n_events ()

-
gint        gimp_controller_get_n_events    (GimpController *controller);

+
gint        gimp_controller_get_n_events    (GimpController *controller);

 

 
 

@@ -231,9 +243,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 gimp_controller_get_event_name ()

-
const gchar* gimp_controller_get_event_name (GimpController *controller,
+
const gchar* gimp_controller_get_event_name (GimpController *controller,
                                              gint event_id);

 

 
@@ -266,9 +278,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 gimp_controller_get_event_blurb ()

-
const gchar* gimp_controller_get_event_blurb
+
const gchar* gimp_controller_get_event_blurb
                                             (GimpController *controller,
                                              gint event_id);

 

@@ -302,9 +314,9 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-

+

 gimp_controller_event ()

-
gboolean    gimp_controller_event           (GimpController *controller,
+
gboolean    gimp_controller_event           (GimpController *controller,
                                              const GimpControllerEvent *event);

 

 
@@ -337,31 +349,31 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-
Properties

+
Property Details

 

-

+

 The "name" property

-
  "name"                 gchararray            : Read / Write / Construct

+
  "name"                 gchararray            : Read / Write / Construct

 

 
Default value: "Unnamed Controller"

 

 

 

-

+

 The "state" property

-
  "state"                gchararray            : Read / Write / Construct

+
  "state"                gchararray            : Read / Write / Construct

 

 
Default value: "Unknown"

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "event" signal

-
gboolean    user_function                  (GimpController *gimpcontroller,
-                                            gpointer arg1,
-                                            gpointer user_data);

+
gboolean    user_function                  (GimpController *gimpcontroller,
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run last

 

 
 

@@ -397,9 +409,5 @@ An abstract interface for implementing arbitrary input controllers.
 

 

 

-
-
-
-
<< Part IV. GIMP ControllersPart V. GIMP Widgets Utilities >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpDialog.html b/devel-docs/libgimpwidgets/html/GimpDialog.html
index 09ee5e6c6e..441ded730b 100644
--- a/devel-docs/libgimpwidgets/html/GimpDialog.html
+++ b/devel-docs/libgimpwidgets/html/GimpDialog.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,55 +20,50 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Properties
+
 

 

 

 
-
GimpDialog

-
GimpDialog — Constructors for GtkDialog's and action_areas as well as other
+
GimpDialog

+
GimpDialog — Constructors for GtkDialog's and action_areas as well as other
 dialog-related stuff.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpDialog;
-GtkWidget*  gimp_dialog_new                 (const gchar *title,
+GtkWidget*  gimp_dialog_new                 (const gchar *title,
                                              const gchar *role,
-                                             GtkWidget *parent,
-                                             GtkDialogFlags flags,
+                                             GtkWidget *parent,
+                                             GtkDialogFlags flags,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              ...);
-GtkWidget*  gimp_dialog_new_valist          (const gchar *title,
+GtkWidget*  gimp_dialog_new_valist          (const gchar *title,
                                              const gchar *role,
-                                             GtkWidget *parent,
-                                             GtkDialogFlags flags,
+                                             GtkWidget *parent,
+                                             GtkDialogFlags flags,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              va_list args);
@@ -79,39 +75,28 @@ void        gimp_dialogs
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkWindow
-                                 +----GtkDialog
-                                       +----GimpDialog
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkWindow
+                                       +----GtkDialog
+                                             +----GimpDialog
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpDialog implements
  AtkImplementorIface.

 

 

-
Properties

+
Properties

 
 
   "help-func"            gpointer              : Read / Write / Construct Only
@@ -119,35 +104,29 @@ GimpDialog implements
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpDialog

-
typedef struct _GimpDialog GimpDialog;

+
typedef struct _GimpDialog GimpDialog;

 

 
 

 

 

 

-

+

 gimp_dialog_new ()

-
GtkWidget*  gimp_dialog_new                 (const gchar *title,
+
GtkWidget*  gimp_dialog_new                 (const gchar *title,
                                              const gchar *role,
-                                             GtkWidget *parent,
-                                             GtkDialogFlags flags,
+                                             GtkWidget *parent,
+                                             GtkDialogFlags flags,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              ...);

@@ -160,9 +139,7 @@ into a va_list variable and passes every
 

 

 For a description of the format of the va_list describing the
-action_area buttons see gtk_dialog_new_with_buttons().

+action_area buttons see gtk_dialog_new_with_buttons().

 

 
 

@@ -173,18 +150,14 @@ href="../gtk/GtkDialog.html#gtk-dialog-new-with-buttons"
 
 title :
         The dialog's title which will be set with
-               gtk_window_set_title().
+               gtk_window_set_title().
 
 
 
 
 role :
          The dialog's role which will be set with
-               gtk_window_set_role().
+               gtk_window_set_role().
 
 
 
@@ -196,9 +169,7 @@ href="../gtk/GtkWindow.html#gtk-window-set-role"
 
 
 flags :
-        The flags (see the GtkDialog documentation).
+        The flags (see the GtkDialog documentation).
 
 
 
@@ -231,18 +202,12 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_dialog_new_valist ()

-
GtkWidget*  gimp_dialog_new_valist          (const gchar *title,
+
GtkWidget*  gimp_dialog_new_valist          (const gchar *title,
                                              const gchar *role,
-                                             GtkWidget *parent,
-                                             GtkDialogFlags flags,
+                                             GtkWidget *parent,
+                                             GtkDialogFlags flags,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              va_list args);

@@ -252,9 +217,7 @@ Creates a new GimpDialog widget. If a Gt
 

 

 For a description of the format of the va_list describing the
-action_area buttons see gtk_dialog_new_with_buttons().

+action_area buttons see gtk_dialog_new_with_buttons().

 

 
 

@@ -265,18 +228,14 @@ href="../gtk/GtkDialog.html#gtk-dialog-new-with-buttons"
 
 title :
         The dialog's title which will be set with
-               gtk_window_set_title().
+               gtk_window_set_title().
 
 
 
 
 role :
          The dialog's role which will be set with
-               gtk_window_set_role().
+               gtk_window_set_role().
 
 
 
@@ -288,9 +247,7 @@ href="../gtk/GtkWindow.html#gtk-window-set-role"
 
 
 flags :
-        The flags (see the GtkDialog documentation).
+        The flags (see the GtkDialog documentation).
 
 
 
@@ -322,14 +279,12 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_dialog_add_buttons_valist ()

-
void        gimp_dialog_add_buttons_valist  (GimpDialog *dialog,
+
void        gimp_dialog_add_buttons_valist  (GimpDialog *dialog,
                                              va_list args);

 

-This function is essentially the same as gtk_dialog_add_buttons()
+This function is essentially the same as gtk_dialog_add_buttons()
 except it takes a va_list instead of '...'

 

 
@@ -354,13 +309,11 @@ except it takes a va_list instead of '...'

 

 

 

-

+

 gimp_dialog_run ()

-
gint        gimp_dialog_run                 (GimpDialog *dialog);

+
gint        gimp_dialog_run                 (GimpDialog *dialog);

 

-This function does exactly the same as gtk_dialog_run() except it
+This function does exactly the same as gtk_dialog_run() except it
 does not make the dialog modal while the GMainLoop is running.

 

 
@@ -385,9 +338,9 @@ does not make the dialog modal while the GMainLoop is
 

 

 

-

+

 gimp_dialogs_show_help_button ()

-
void        gimp_dialogs_show_help_button   (gboolean show);

+
void        gimp_dialogs_show_help_button   (gboolean show);

 

 This function is for internal use only.

 

@@ -407,26 +360,22 @@ This function is for internal use only.

 

 

 

-
Properties

+
Property Details

 

-

+

 The "help-func" property

-
  "help-func"            gpointer              : Read / Write / Construct Only

+
  "help-func"            gpointer              : Read / Write / Construct Only

 

 

 

 

-

+

 The "help-id" property

-
  "help-id"              gchararray            : Read / Write / Construct Only

+
  "help-id"              gchararray            : Read / Write / Construct Only

 

 
Default value: NULL

 

 

 

-
-
-
-
<< GimpColorSelectionGimpFileEntry >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpFileEntry.html b/devel-docs/libgimpwidgets/html/GimpFileEntry.html
index 9c7eacc20c..008122b30d 100644
--- a/devel-docs/libgimpwidgets/html/GimpFileEntry.html
+++ b/devel-docs/libgimpwidgets/html/GimpFileEntry.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpFileEntry

+
GimpFileEntry

 
GimpFileEntry — Widget for entering a filename.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpFileEntry;
-GtkWidget*  gimp_file_entry_new             (const gchar *title,
+GtkWidget*  gimp_file_entry_new             (const gchar *title,
                                              const gchar *filename,
                                              gboolean dir_only,
                                              gboolean check_valid);
@@ -55,61 +63,46 @@ void        gimp_file_
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkHBox
-                                 +----GimpFileEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkHBox
+                                       +----GimpFileEntry
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpFileEntry implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "filename-changed"
             void        user_function      (GimpFileEntry *arg0,
-                                            gpointer user_data);
+                                            gpointer       user_data)      : Run first
 

 

 

-
Description

+
Description

 

 This widget is used to enter filenames or directories.
 

 

-There is a GtkEntry for entering the filename manually and a "..."
-button which will pop up a GtkFileSelection dialog.
+There is a GtkEntry for entering the filename manually and a "..."
+button which will pop up a GtkFileSelection dialog.
 

 

 You can restrict the GimpFileSelection to directories. In this case
-the filename listbox of the GtkFileSelection dialog will be hidden.
+the filename listbox of the GtkFileSelection dialog will be hidden.
 

 

 If you specify check_valid as TRUE in gimp_file_entry_new()
@@ -122,22 +115,20 @@ will be emitted.
 

 

 

-
Details

+
Details

 

-

+

 GimpFileEntry

-
typedef struct _GimpFileEntry GimpFileEntry;

+
typedef struct _GimpFileEntry GimpFileEntry;

 

 
 

 

 

 

-

+

 gimp_file_entry_new ()

-
GtkWidget*  gimp_file_entry_new             (const gchar *title,
+
GtkWidget*  gimp_file_entry_new             (const gchar *title,
                                              const gchar *filename,
                                              gboolean dir_only,
                                              gboolean check_valid);

@@ -185,9 +176,9 @@ Creates a new 
-

+

 gimp_file_entry_get_filename ()

-
gchar*      gimp_file_entry_get_filename    (GimpFileEntry *entry);

+
gchar*      gimp_file_entry_get_filename    (GimpFileEntry *entry);

 

 Note that you have to g_free() the returned string.

 

@@ -213,9 +204,9 @@ Note that you have to g_free() the returned string
 

 

 

-

+

 gimp_file_entry_set_filename ()

-
void        gimp_file_entry_set_filename    (GimpFileEntry *entry,
+
void        gimp_file_entry_set_filename    (GimpFileEntry *entry,
                                              const gchar *filename);

 

 If you specified check_valid as TRUE in gimp_file_entry_new()
@@ -244,12 +235,12 @@ name.

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "filename-changed" signal

-
void        user_function                  (GimpFileEntry *arg0,
-                                            gpointer user_data);

+
void        user_function                  (GimpFileEntry *arg0,
+                                            gpointer       user_data)      : Run first

 

 This signal is emitted whenever the user changes the filename.

 

@@ -266,15 +257,11 @@ This signal is emitted whenever the user changes the filename.

 

 

 

-
See Also

+
See Also

 

 GimpPathEditor
 

 

 

-
-
-
-
<< GimpDialogGimpFrame >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpFrame.html b/devel-docs/libgimpwidgets/html/GimpFrame.html
index d3dea5f40c..07abd36a25 100644
--- a/devel-docs/libgimpwidgets/html/GimpFrame.html
+++ b/devel-docs/libgimpwidgets/html/GimpFrame.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,68 +20,64 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Style Properties
+
 

 

 

 
-
GimpFrame

-
GimpFrame — A widget providing a HIG-compliant subclass of GtkFrame.

+
GimpFrame

+
GimpFrame — A widget providing a HIG-compliant subclass of GtkFrame.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpFrame;
-GtkWidget*  gimp_frame_new                  (const gchar *label);
+GtkWidget*  gimp_frame_new                  (const gchar *label);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkFrame
-                                 +----GimpFrame
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkFrame
+                                       +----GimpFrame
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpFrame implements
  AtkImplementorIface.

 

 

-
Style Properties

+
Style Properties

 
 
   "label-bold"           gboolean              : Read
@@ -88,35 +85,29 @@ GimpFrame implements
 

 

 

-
Description

+
Description

 

-A widget providing a HIG-compliant subclass of GtkFrame.
+A widget providing a HIG-compliant subclass of GtkFrame.
 

 

 

-
Details

+
Details

 

-

+

 GimpFrame

-
typedef struct _GimpFrame GimpFrame;

+
typedef struct _GimpFrame GimpFrame;

 

 
 

 

 

 

-

+

 gimp_frame_new ()

-
GtkWidget*  gimp_frame_new                  (const gchar *label);

+
GtkWidget*  gimp_frame_new                  (const gchar *label);

 

 Creates a GimpFrame widget. A GimpFrame is a HIG-compliant
-variant of GtkFrame. It doesn't render a frame at all but
+variant of GtkFrame. It doesn't render a frame at all but
 otherwise behaves like a frame. The frame's title is rendered in
 bold and the frame content is indented four spaces as suggested by
 the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).

@@ -146,28 +137,24 @@ the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).

 

 

 

-
Style Properties

+
Style Property Details

 

-

+

 The "label-bold" style property

-
  "label-bold"           gboolean              : Read

+
  "label-bold"           gboolean              : Read

 

 
Default value: TRUE

 

 

 

-

+

 The "label-spacing" style property

-
  "label-spacing"        gint                  : Read

+
  "label-spacing"        gint                  : Read

 

 
Allowed values: >= 0

 
Default value: 6

 

 

 

-
-
-
-
<< GimpFileEntryGimpIntComboBox >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html
index 24d22daa50..287d58f6cd 100644
--- a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html
+++ b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,42 +20,43 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpIntComboBox

+
GimpIntComboBox

 
GimpIntComboBox — A widget providing a popup menu of integer values (e.g. enums).

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpIntComboBox;
-GtkWidget*  gimp_int_combo_box_new          (const gchar *first_label,
+GtkWidget*  gimp_int_combo_box_new          (const gchar *first_label,
                                              gint first_value,
                                              ...);
-GtkWidget*  gimp_int_combo_box_new_valist   (const gchar *first_label,
+GtkWidget*  gimp_int_combo_box_new_valist   (const gchar *first_label,
                                              gint first_value,
                                              va_list values);
-GtkWidget*  gimp_int_combo_box_new_array    (gint n_values,
+GtkWidget*  gimp_int_combo_box_new_array    (gint n_values,
                                              const gchar *labels[]);
 void        gimp_int_combo_box_prepend      (GimpIntComboBox *combo_box,
                                              ...);
@@ -72,61 +74,46 @@ gulong      gimp_int_c
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkComboBox
-                                 +----GimpIntComboBox
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkComboBox
+                                       +----GimpIntComboBox
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpIntComboBox implements
- AtkImplementorIface,  GtkCellEditable and  GtkCellLayout.

+ AtkImplementorIface,  GtkCellEditable and  GtkCellLayout.

 

 

-
Description

+
Description

 

 A widget providing a popup menu of integer values (e.g. enums).
 

 

 

-
Details

+
Details

 

-

+

 GimpIntComboBox

-
typedef struct _GimpIntComboBox GimpIntComboBox;

+
typedef struct _GimpIntComboBox GimpIntComboBox;

 

 
 

 

 

 

-

+

 gimp_int_combo_box_new ()

-
GtkWidget*  gimp_int_combo_box_new          (const gchar *first_label,
+
GtkWidget*  gimp_int_combo_box_new          (const gchar *first_label,
                                              gint first_value,
                                              ...);

 

@@ -171,11 +158,9 @@ terminated list of label/value pairs.

 

 

 

-

+

 gimp_int_combo_box_new_valist ()

-
GtkWidget*  gimp_int_combo_box_new_valist   (const gchar *first_label,
+
GtkWidget*  gimp_int_combo_box_new_valist   (const gchar *first_label,
                                              gint first_value,
                                              va_list values);

 

@@ -219,11 +204,9 @@ label/value pairs. Probably only useful for language bindings.

 

 

 

-

+

 gimp_int_combo_box_new_array ()

-
GtkWidget*  gimp_int_combo_box_new_array    (gint n_values,
+
GtkWidget*  gimp_int_combo_box_new_array    (gint n_values,
                                              const gchar *labels[]);

 

 A variant of gimp_int_combo_box_new() that takes an array of labels.
@@ -260,16 +243,14 @@ The array indices are used as values.

 

 

 

-

+

 gimp_int_combo_box_prepend ()

-
void        gimp_int_combo_box_prepend      (GimpIntComboBox *combo_box,
+
void        gimp_int_combo_box_prepend      (GimpIntComboBox *combo_box,
                                              ...);

 

 This function provides a convenient way to prepend items to a
 GimpIntComboBox. It prepends a row to the combo_box's list store
-and calls gtk_list_store_set() for you.
+and calls gtk_list_store_set() for you.
 

 

 The column number must be taken from the enum GimpIntStoreColumns.

@@ -298,16 +279,14 @@ The column number must be taken from the enum 
-

+

 gimp_int_combo_box_append ()

-
void        gimp_int_combo_box_append       (GimpIntComboBox *combo_box,
+
void        gimp_int_combo_box_append       (GimpIntComboBox *combo_box,
                                              ...);

 

 This function provides a convenient way to append items to a
 GimpIntComboBox. It appends a row to the combo_box's list store
-and calls gtk_list_store_set() for you.
+and calls gtk_list_store_set() for you.
 

 

 The column number must be taken from the enum GimpIntStoreColumns.

@@ -336,9 +315,9 @@ The column number must be taken from the enum 
-

+

 gimp_int_combo_box_set_active ()

-
gboolean    gimp_int_combo_box_set_active   (GimpIntComboBox *combo_box,
+
gboolean    gimp_int_combo_box_set_active   (GimpIntComboBox *combo_box,
                                              gint value);

 

 Looks up the item that belongs to the given value and makes it the
@@ -376,9 +355,9 @@ selected item in the combo_box.

 

 

 

-

+

 gimp_int_combo_box_get_active ()

-
gboolean    gimp_int_combo_box_get_active   (GimpIntComboBox *combo_box,
+
gboolean    gimp_int_combo_box_get_active   (GimpIntComboBox *combo_box,
                                              gint *value);

 

 Retrieves the value of the selected (active) item in the combo_box.

@@ -415,9 +394,9 @@ Retrieves the value of the selected (active) item in the <
 

 

 

-

+

 gimp_int_combo_box_connect ()

-
gulong      gimp_int_combo_box_connect      (GimpIntComboBox *combo_box,
+
gulong      gimp_int_combo_box_connect      (GimpIntComboBox *combo_box,
                                              gint value,
                                              GCallback callback,
                                              gpointer data);

@@ -476,9 +455,5 @@ gimp_drawable_combo_box_new). If you pass an invalid initial
 

 

 

-
-
-
-
<< GimpFrameGimpIntStore >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpIntStore.html b/devel-docs/libgimpwidgets/html/GimpIntStore.html
index 2fd192e4f0..27a9ea38d0 100644
--- a/devel-docs/libgimpwidgets/html/GimpIntStore.html
+++ b/devel-docs/libgimpwidgets/html/GimpIntStore.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,89 +20,80 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpIntStore

+
GimpIntStore

 
GimpIntStore — A model for integer based name-value pairs (e.g. enums)

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpIntStore;
 enum        GimpIntStoreColumns;
-GtkListStore* gimp_int_store_new            (void);
-gboolean    gimp_int_store_lookup_by_value  (GtkTreeModel *model,
+GtkListStore* gimp_int_store_new            (void);
+gboolean    gimp_int_store_lookup_by_value  (GtkTreeModel *model,
                                              gint value,
-                                             GtkTreeIter *iter);
+                                             GtkTreeIter *iter);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkListStore
+   +----GtkListStore
          +----GimpIntStore
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpIntStore implements
- GtkTreeModel,  GtkTreeDragSource,  GtkTreeDragDest and  GtkTreeSortable.

+ GtkTreeModel,  GtkTreeDragSource,  GtkTreeDragDest and  GtkTreeSortable.

 

 

-
Description

+
Description

 

 A model for integer based name-value pairs (e.g. enums)
 

 

 

-
Details

+
Details

 

-

+

 GimpIntStore

-
typedef struct _GimpIntStore GimpIntStore;

+
typedef struct _GimpIntStore GimpIntStore;

 

 
 

 

 

 

-

+

 enum GimpIntStoreColumns

-
typedef enum
+
typedef enum
 {
   GIMP_INT_STORE_VALUE,
   GIMP_INT_STORE_LABEL,
@@ -117,15 +109,11 @@ A model for integer based name-value pairs (e.g. enums)
 

 

 

-

+

 gimp_int_store_new ()

-
GtkListStore* gimp_int_store_new            (void);

+
GtkListStore* gimp_int_store_new            (void);

 

-Creates a GtkListStore with a number of useful columns.
+Creates a GtkListStore with a number of useful columns.
 GimpIntStore is especially useful if the items you want to store
 are identified using an integer value.

 

@@ -146,15 +134,11 @@ are identified using an integer value.

 

 

 

-

+

 gimp_int_store_lookup_by_value ()

-
gboolean    gimp_int_store_lookup_by_value  (GtkTreeModel *model,
+
gboolean    gimp_int_store_lookup_by_value  (GtkTreeModel *model,
                                              gint value,
-                                             GtkTreeIter *iter);

+                                             GtkTreeIter *iter);

 

 Iterate over the model looking for value.

 

@@ -196,9 +180,5 @@ Iterate over the model looking for 
 

 

-
-
-
-
<< GimpIntComboBoxGimpMemsizeEntry >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html
index ebb3eba2c1..811b2b959c 100644
--- a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html
+++ b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpMemsizeEntry

+
GimpMemsizeEntry

 
GimpMemsizeEntry — A composite widget that allows to enter a memory size.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpMemsizeEntry;
-GtkWidget*  gimp_memsize_entry_new          (guint64 value,
+GtkWidget*  gimp_memsize_entry_new          (guint64 value,
                                              guint64 lower,
                                              guint64 upper);
 void        gimp_memsize_entry_set_value    (GimpMemsizeEntry *entry,
@@ -54,45 +62,36 @@ guint64     gimp_me
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkHBox
-                                 +----GimpMemsizeEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkHBox
+                                       +----GimpMemsizeEntry
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpMemsizeEntry implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "value-changed"
             void        user_function      (GimpMemsizeEntry *gimpmemsizeentry,
-                                            gpointer user_data);
+                                            gpointer          user_data)             : Run first
 

 

 

-
Description

+
Description

 

 Similar to a GimpSizeEntry but instead of lengths, this widget is used to let
 the user enter memory sizes. An option menu allows to switch between
@@ -100,33 +99,25 @@ Kilobytes, Megabytes and Gigabytes. Used in the GIMP preferences dialog.
 

 

 

-
Details

+
Details

 

-

+

 GimpMemsizeEntry

-
typedef struct _GimpMemsizeEntry GimpMemsizeEntry;

+
typedef struct _GimpMemsizeEntry GimpMemsizeEntry;

 

 The GimpSizeEntry struct is considered private.
 

 

 

 

-

+

 gimp_memsize_entry_new ()

-
GtkWidget*  gimp_memsize_entry_new          (guint64 value,
+
GtkWidget*  gimp_memsize_entry_new          (guint64 value,
                                              guint64 lower,
                                              guint64 upper);

 

-Creates a new GimpMemsizeEntry which is a GtkHBox with a GtkSpinButton
-and a GtkOptionMenu all setup to allow the user to enter memory sizes.

+Creates a new GimpMemsizeEntry which is a GtkHBox with a GtkSpinButton
+and a GtkOptionMenu all setup to allow the user to enter memory sizes.

 

 
 

@@ -162,9 +153,9 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 gimp_memsize_entry_set_value ()

-
void        gimp_memsize_entry_set_value    (GimpMemsizeEntry *entry,
+
void        gimp_memsize_entry_set_value    (GimpMemsizeEntry *entry,
                                              guint64 value);

 

 Sets the entry's value. Please note that the GimpMemsizeEntry rounds
@@ -192,9 +183,9 @@ the value to full Kilobytes.

 

 

 

-

+

 gimp_memsize_entry_get_value ()

-
guint64     gimp_memsize_entry_get_value    (GimpMemsizeEntry *entry);

+
guint64     gimp_memsize_entry_get_value    (GimpMemsizeEntry *entry);

 

 Retrieves the current value from a GimpMemsizeEntry.

 

@@ -220,12 +211,12 @@ Retrieves the current value from a 
-
Signals

+
Signal Details

 

-

+

 The "value-changed" signal

-
void        user_function                  (GimpMemsizeEntry *gimpmemsizeentry,
-                                            gpointer user_data);

+
void        user_function                  (GimpMemsizeEntry *gimpmemsizeentry,
+                                            gpointer          user_data)             : Run first

 

 
 

@@ -249,9 +240,5 @@ Retrieves the current value from a 
-<< GimpIntStore
-GimpOffsetArea >>
-
 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html
index c142ac338d..6ffd1127e8 100644
--- a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html
+++ b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpOffsetArea

+
GimpOffsetArea

 
GimpOffsetArea — Widget to control image offsets.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpOffsetArea;
-GtkWidget*  gimp_offset_area_new            (gint orig_width,
+GtkWidget*  gimp_offset_area_new            (gint orig_width,
                                              gint orig_height);
 void        gimp_offset_area_set_size       (GimpOffsetArea *offset_area,
                                              gint width,
@@ -53,69 +61,60 @@ void        gimp_offs
                                              gint offset_x,
                                              gint offset_y);
 void        gimp_offset_area_set_pixbuf     (GimpOffsetArea *offset_area,
-                                             GdkPixbuf *pixbuf);
+                                             GdkPixbuf *pixbuf);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpOffsetArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpOffsetArea
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpOffsetArea implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "offsets-changed"
             void        user_function      (GimpOffsetArea *gimpoffsetarea,
-                                            gint arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            gint            arg1,
+                                            gint            arg2,
+                                            gpointer        user_data)           : Run first
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpOffsetArea

-
typedef struct _GimpOffsetArea GimpOffsetArea;

+
typedef struct _GimpOffsetArea GimpOffsetArea;

 

 
 

 

 

 

-

+

 gimp_offset_area_new ()

-
GtkWidget*  gimp_offset_area_new            (gint orig_width,
+
GtkWidget*  gimp_offset_area_new            (gint orig_width,
                                              gint orig_height);

 

 Creates a new GimpOffsetArea widget. A GimpOffsetArea can be used
@@ -150,9 +149,9 @@ specify the new offsets.

 

 

 

-

+

 gimp_offset_area_set_size ()

-
void        gimp_offset_area_set_size       (GimpOffsetArea *offset_area,
+
void        gimp_offset_area_set_size       (GimpOffsetArea *offset_area,
                                              gint width,
                                              gint height);

 

@@ -188,9 +187,9 @@ signal is emitted.

 

 

 

-

+

 gimp_offset_area_set_offsets ()

-
void        gimp_offset_area_set_offsets    (GimpOffsetArea *offset_area,
+
void        gimp_offset_area_set_offsets    (GimpOffsetArea *offset_area,
                                              gint offset_x,
                                              gint offset_y);

 

@@ -225,12 +224,10 @@ It does not emit the offsets_changed signal.

 

 

 

-

+

 gimp_offset_area_set_pixbuf ()

-
void        gimp_offset_area_set_pixbuf     (GimpOffsetArea *offset_area,
-                                             GdkPixbuf *pixbuf);

+
void        gimp_offset_area_set_pixbuf     (GimpOffsetArea *offset_area,
+                                             GdkPixbuf *pixbuf);

 

 Sets the pixbuf which represents the original image/drawable which
 is being offset.

@@ -249,9 +246,7 @@ is being offset.

 
 
 pixbuf :
- a GdkPixbuf.
+ a GdkPixbuf.
 
 
 
@@ -261,14 +256,14 @@ href="../gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
 

 

 

-
Signals

+
Signal Details

 

-

+

 The "offsets-changed" signal

-
void        user_function                  (GimpOffsetArea *gimpoffsetarea,
-                                            gint arg1,
-                                            gint arg2,
-                                            gpointer user_data);

+
void        user_function                  (GimpOffsetArea *gimpoffsetarea,
+                                            gint            arg1,
+                                            gint            arg2,
+                                            gpointer        user_data)           : Run first

 

 
 

@@ -304,9 +299,5 @@ href="../gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
 

 

 

-
-
-
-
<< GimpMemsizeEntryGimpPathEditor >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpPathEditor.html b/devel-docs/libgimpwidgets/html/GimpPathEditor.html
index 77fa667792..bee2cff6a9 100644
--- a/devel-docs/libgimpwidgets/html/GimpPathEditor.html
+++ b/devel-docs/libgimpwidgets/html/GimpPathEditor.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpPathEditor

+
GimpPathEditor

 
GimpPathEditor — Widget for editing a file search path.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpPathEditor;
-GtkWidget*  gimp_path_editor_new            (const gchar *filesel_title,
+GtkWidget*  gimp_path_editor_new            (const gchar *filesel_title,
                                              const gchar *path);
 gchar*      gimp_path_editor_get_path       (GimpPathEditor *editor);
 void        gimp_path_editor_set_path       (GimpPathEditor *editor,
@@ -65,48 +73,39 @@ void        gimp
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpPathEditor
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpPathEditor
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpPathEditor implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "path-changed"
             void        user_function      (GimpPathEditor *arg0,
-                                            gpointer user_data);
+                                            gpointer        user_data)      : Run first
 "writable-changed"
             void        user_function      (GimpPathEditor *arg0,
-                                            gpointer user_data);
+                                            gpointer        user_data)      : Run first
 

 

 

-
Description

+
Description

 

 This widget is used to edit file search paths.
 

@@ -125,22 +124,20 @@ the search path, the "path_changed" signal will be emitted.
 

 

 

-
Details

+
Details

 

-

+

 GimpPathEditor

-
typedef struct _GimpPathEditor GimpPathEditor;

+
typedef struct _GimpPathEditor GimpPathEditor;

 

 
 

 

 

 

-

+

 gimp_path_editor_new ()

-
GtkWidget*  gimp_path_editor_new            (const gchar *filesel_title,
+
GtkWidget*  gimp_path_editor_new            (const gchar *filesel_title,
                                              const gchar *path);

 

 Creates a new GimpPathEditor widget.
@@ -157,9 +154,7 @@ The elements of the initial search path must be separated with the
 
 
 filesel_title :
- The title of the GtkFileSelection dialog which can be
+ The title of the GtkFileSelection dialog which can be
                 popped up by the attached GimpFileSelection.
 
 
@@ -180,9 +175,9 @@ href="../gtk/GtkFileSelection.html"
 

 

 

-

+

 gimp_path_editor_get_path ()

-
gchar*      gimp_path_editor_get_path       (GimpPathEditor *editor);

+
gchar*      gimp_path_editor_get_path       (GimpPathEditor *editor);

 

 The elements of the returned search path string are separated with the
 G_SEARCHPATH_SEPARATOR character.
@@ -212,9 +207,9 @@ Note that you have to g_free() the returned string
 

 

 

-

+

 gimp_path_editor_set_path ()

-
void        gimp_path_editor_set_path       (GimpPathEditor *editor,
+
void        gimp_path_editor_set_path       (GimpPathEditor *editor,
                                              const gchar *path);

 

 The elements of the initial search path must be separated with the
@@ -242,9 +237,9 @@ The elements of the initial search path must be separated with the
 

 

 

-

+

 gimp_path_editor_get_writable_path ()

-
gchar*      gimp_path_editor_get_writable_path
+
gchar*      gimp_path_editor_get_writable_path
                                             (GimpPathEditor *editor);

 

 
@@ -271,9 +266,9 @@ The elements of the initial search path must be separated with the
 

 

 

-

+

 gimp_path_editor_set_writable_path ()

-
void        gimp_path_editor_set_writable_path
+
void        gimp_path_editor_set_writable_path
                                             (GimpPathEditor *editor,
                                              const gchar *path);

 

@@ -301,9 +296,9 @@ The elements of the initial search path must be separated with the
 

 

 

-

+

 gimp_path_editor_get_dir_writable ()

-
gboolean    gimp_path_editor_get_dir_writable
+
gboolean    gimp_path_editor_get_dir_writable
                                             (GimpPathEditor *editor,
                                              const gchar *directory);

 

@@ -337,9 +332,9 @@ The elements of the initial search path must be separated with the
 

 

 

-

+

 gimp_path_editor_set_dir_writable ()

-
void        gimp_path_editor_set_dir_writable
+
void        gimp_path_editor_set_dir_writable
                                             (GimpPathEditor *editor,
                                              const gchar *directory,
                                              gboolean writable);

@@ -374,12 +369,12 @@ The elements of the initial search path must be separated with the
 

 

 

-
Signals

+
Signal Details

 

-

+

 The "path-changed" signal

-
void        user_function                  (GimpPathEditor *arg0,
-                                            gpointer user_data);

+
void        user_function                  (GimpPathEditor *arg0,
+                                            gpointer        user_data)      : Run first

 

 This signal is emitted whenever the user adds, deletes, modifies
 or reorders an element of the search path.

@@ -397,10 +392,10 @@ or reorders an element of the search path.

 

 

 

-

+

 The "writable-changed" signal

-
void        user_function                  (GimpPathEditor *arg0,
-                                            gpointer user_data);

+
void        user_function                  (GimpPathEditor *arg0,
+                                            gpointer        user_data)      : Run first

 

 This signal is emitted whenever the "writable" column of a directory
 is changed, either by the user clicking on it or by calling
@@ -419,7 +414,7 @@ is changed, either by the user clicking on it or by calling
 

 

 

-
See Also

+
See Also

 

 GimpFileEntry
 

@@ -428,9 +423,5 @@ is changed, either by the user clicking on it or by calling
 

 

 

-
-
-
-
<< GimpOffsetAreaGimpPickButton >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpPickButton.html b/devel-docs/libgimpwidgets/html/GimpPickButton.html
index 3556f4267e..851d4e1a45 100644
--- a/devel-docs/libgimpwidgets/html/GimpPickButton.html
+++ b/devel-docs/libgimpwidgets/html/GimpPickButton.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,76 +20,74 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpPickButton

+
GimpPickButton

 
GimpPickButton — Widget to pick a color from screen.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpPickButton;
-GtkWidget*  gimp_pick_button_new            (void);
+GtkWidget*  gimp_pick_button_new            (void);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpPickButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpPickButton
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpPickButton implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "color-picked"
             void        user_function      (GimpPickButton *gimppickbutton,
-                                            gpointer arg1,
-                                            gpointer user_data);
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run first
 

 

 

-
Description

+
Description

 

 GimpPickButton is a specialized button. When clicked, it changes the
 cursor to a color-picker pipette and allows the user to pick a color
@@ -96,22 +95,20 @@ from any point on the screen.
 

 

 

-
Details

+
Details

 

-

+

 GimpPickButton

-
typedef struct _GimpPickButton GimpPickButton;

+
typedef struct _GimpPickButton GimpPickButton;

 

 
 

 

 

 

-

+

 gimp_pick_button_new ()

-
GtkWidget*  gimp_pick_button_new            (void);

+
GtkWidget*  gimp_pick_button_new            (void);

 

 Creates a new GimpPickButton widget.

 

@@ -129,13 +126,13 @@ Creates a new 
-
Signals

+
Signal Details

 

-

+

 The "color-picked" signal

-
void        user_function                  (GimpPickButton *gimppickbutton,
-                                            gpointer arg1,
-                                            gpointer user_data);

+
void        user_function                  (GimpPickButton *gimppickbutton,
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run first

 

 
 

@@ -167,9 +164,5 @@ href="../libgimpcolor/libgimpcolor-GimpRGB.html#GimpRGB"
 

 

 

-
-
-
-
<< GimpPathEditorGimpPixmap >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpPixmap.html b/devel-docs/libgimpwidgets/html/GimpPixmap.html
index 6a05b80dcb..6d951cc5ac 100644
--- a/devel-docs/libgimpwidgets/html/GimpPixmap.html
+++ b/devel-docs/libgimpwidgets/html/GimpPixmap.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,92 +20,82 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+
 

 

 

 
-
GimpPixmap

-
GimpPixmap — Widget which creates a GtkPixmap from XPM data.

+
GimpPixmap

+
GimpPixmap — Widget which creates a GtkPixmap from XPM data.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpPixmap;
-GtkWidget*  gimp_pixmap_new                 (gchar **xpm_data);
+GtkWidget*  gimp_pixmap_new                 (gchar **xpm_data);
 void        gimp_pixmap_set                 (GimpPixmap *pixmap,
                                              gchar **xpm_data);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkMisc
-                     +----GtkImage
-                           +----GimpPixmap
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkMisc
+                           +----GtkImage
+                                 +----GimpPixmap
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpPixmap implements
  AtkImplementorIface.

 

 

-
Description

+
Description

 

-Widget which creates a GtkPixmap from XPM data.
+Widget which creates a GtkPixmap from XPM data.
 

 

-Use this widget instead of GtkPixmap if you don't want to worry about
+Use this widget instead of GtkPixmap if you don't want to worry about
 the parent container's "realized" state.
 

 

-Note that the drawback of the easy interface is that the actual GdkPixmap
+Note that the drawback of the easy interface is that the actual GdkPixmap
 and it's mask have to be constructed every time you call gimp_pixmap_new()
 and cannot be cached in memory without doing bad hacks.
 

 

 

-
Details

+
Details

 

-

+

 GimpPixmap

-
typedef struct _GimpPixmap GimpPixmap;

+
typedef struct _GimpPixmap GimpPixmap;

 

 
Warning

 
GimpPixmap is deprecated and should not be used in newly-written code.

@@ -115,11 +106,9 @@ and cannot be cached in memory without doing bad hacks.
 

 

 

-

+

 gimp_pixmap_new ()

-
GtkWidget*  gimp_pixmap_new                 (gchar **xpm_data);

+
GtkWidget*  gimp_pixmap_new                 (gchar **xpm_data);

 

 
Warning

 
gimp_pixmap_new is deprecated and should not be used in newly-written code.

@@ -149,9 +138,9 @@ Creates a new Gi
 

 

 

-

+

 gimp_pixmap_set ()

-
void        gimp_pixmap_set                 (GimpPixmap *pixmap,
+
void        gimp_pixmap_set                 (GimpPixmap *pixmap,
                                              gchar **xpm_data);

 

 
Warning

@@ -182,20 +171,14 @@ Sets a new image for an existing 
 

 

-
See Also

+
See Also

 

 gimp_pixmap_button_new()
 

 

-GtkPixmap
+GtkPixmap
 

 

 

-
-
-
-
<< GimpPickButtonGimpPreviewArea >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpPreview.html b/devel-docs/libgimpwidgets/html/GimpPreview.html
index 895e18f9ad..30010fdbe3 100644
--- a/devel-docs/libgimpwidgets/html/GimpPreview.html
+++ b/devel-docs/libgimpwidgets/html/GimpPreview.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,37 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Properties
+                   | 
+                  Style Properties
+                   | 
+                  Signals
+
 

 

 

 
-
GimpPreview

+
GimpPreview

 
GimpPreview — A widget providing a GimpPreviewArea plus framework to update the preview.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -62,85 +76,74 @@ void        gimp_preview_dra
                                              gint rowstride);
 void        gimp_preview_invalidate         (GimpPreview *preview);
 void        gimp_preview_set_default_cursor (GimpPreview *preview,
-                                             GdkCursor *cursor);
+                                             GdkCursor *cursor);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpPreview
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpPreview
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpPreview implements
  AtkImplementorIface.

 

 

-
Properties

+
Properties

 
 
   "update"               gboolean              : Read / Write / Construct
 

 

 

-
Style Properties

+
Style Properties

 
 
   "size"                 gint                  : Read
 

 

 

-
Signal Prototypes

+
Signals

 
 
 "invalidated"
             void        user_function      (GimpPreview *gimppreview,
-                                            gpointer user_data);
+                                            gpointer     user_data)        : Run first
 

 

 

-
Description

+
Description

 

 A widget providing a GimpPreviewArea plus framework to update the preview.
 

 

 

-
Details

+
Details

 

-

+

 GimpPreview

-
typedef struct _GimpPreview GimpPreview;

+
typedef struct _GimpPreview GimpPreview;

 

 
 

 

 

 

-

+

 gimp_preview_get_update ()

-
gboolean    gimp_preview_get_update         (GimpPreview *preview);

+
gboolean    gimp_preview_get_update         (GimpPreview *preview);

 

 

 

@@ -169,9 +172,9 @@ A widget providing a 
 

 

-

+

 gimp_preview_set_update ()

-
void        gimp_preview_set_update         (GimpPreview *preview,
+
void        gimp_preview_set_update         (GimpPreview *preview,
                                              gboolean update);

 

 Sets the state of the "Preview" check button.

@@ -201,9 +204,9 @@ Sets the state of the "Preview" check button.

 

 

 

-

+

 gimp_preview_set_bounds ()

-
void        gimp_preview_set_bounds         (GimpPreview *preview,
+
void        gimp_preview_set_bounds         (GimpPreview *preview,
                                              gint xmin,
                                              gint ymin,
                                              gint xmax,
@@ -255,9 +258,9 @@ maximum size of the 
 

 

-

+

 gimp_preview_get_size ()

-
void        gimp_preview_get_size           (GimpPreview *preview,
+
void        gimp_preview_get_size           (GimpPreview *preview,
                                              gint *width,
                                              gint *height);

 

@@ -293,9 +296,9 @@ maximum size of the 
 

 

-

+

 gimp_preview_get_position ()

-
void        gimp_preview_get_position       (GimpPreview *preview,
+
void        gimp_preview_get_position       (GimpPreview *preview,
                                              gint *x,
                                              gint *y);

 

@@ -331,9 +334,9 @@ maximum size of the 
 

 

-

+

 gimp_preview_draw ()

-
void        gimp_preview_draw               (GimpPreview *preview);

+
void        gimp_preview_draw               (GimpPreview *preview);

 

 Calls the GimpPreview::draw method. GimpPreview itself doesn't
 implement a default draw method so the behaviour is determined by
@@ -361,9 +364,9 @@ original, unmodified drawable to the preview<
 

 

 

-

+

 gimp_preview_draw_buffer ()

-
void        gimp_preview_draw_buffer        (GimpPreview *preview,
+
void        gimp_preview_draw_buffer        (GimpPreview *preview,
                                              const guchar *buffer,
                                              gint rowstride);

 

@@ -401,9 +404,9 @@ derived class implementing this method.

 

 

 

-

+

 gimp_preview_invalidate ()

-
void        gimp_preview_invalidate         (GimpPreview *preview);

+
void        gimp_preview_invalidate         (GimpPreview *preview);

 

 This function starts or renews a short low-priority timeout. When
 the timeout expires, the GimpPreview::invalidated signal is emitted
@@ -433,12 +436,10 @@ itself.

 

 

 

-

+

 gimp_preview_set_default_cursor ()

-
void        gimp_preview_set_default_cursor (GimpPreview *preview,
-                                             GdkCursor *cursor);

+
void        gimp_preview_set_default_cursor (GimpPreview *preview,
+                                             GdkCursor *cursor);

 

 Sets the default mouse cursor for the preview.  Note that this will
 be overriden by a GDK_FLEUR if the preview has scrollbars, or by a
@@ -458,9 +459,7 @@ be overriden by a GDK_FLEUR if the preview has scro
 
 
 cursor :
-  a GdkCursor or NULL
+  a GdkCursor or NULL
 
 
 
@@ -470,33 +469,33 @@ href="../gdk/gdk-Cursors.html#GdkCursor"
 

 

 

-
Properties

+
Property Details

 

-

+

 The "update" property

-
  "update"               gboolean              : Read / Write / Construct

+
  "update"               gboolean              : Read / Write / Construct

 

 
Default value: TRUE

 

 

 

-
Style Properties

+
Style Property Details

 

-

+

 The "size" style property

-
  "size"                 gint                  : Read

+
  "size"                 gint                  : Read

 

 
Allowed values: [1,1024]

 
Default value: 150

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "invalidated" signal

-
void        user_function                  (GimpPreview *gimppreview,
-                                            gpointer user_data);

+
void        user_function                  (GimpPreview *gimppreview,
+                                            gpointer     user_data)        : Run first

 

 
 

@@ -520,9 +519,5 @@ href="../gdk/gdk-Cursors.html#GdkCursor"
 

 

 

-
-
-
-
<< GimpPreviewAreaGimpScrolledPreview >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html
index a7f1f77c36..1d94d17d3b 100644
--- a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html
+++ b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,32 +20,39 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Properties
+
 

 

 

 
-
GimpPreviewArea

+
GimpPreviewArea

 
GimpPreviewArea — A general purpose preview widget which caches its pixel data.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpPreviewArea;
-GtkWidget*  gimp_preview_area_new           (void);
+GtkWidget*  gimp_preview_area_new           (void);
 void        gimp_preview_area_draw          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
@@ -100,37 +108,30 @@ void        gimp_p
                                              gint width,
                                              gint height);
 void        gimp_preview_area_menu_popup    (GimpPreviewArea *area,
-                                             GdkEventButton *event);
+                                             GdkEventButton *event);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpPreviewArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpPreviewArea
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpPreviewArea implements
  AtkImplementorIface.

 

 

-
Properties

+
Properties

 
 
   "check-size"           
 

 

-
Description

+
Description

 

 A general purpose preview widget which caches its pixel data.
 

 

 

-
Details

+
Details

 

-

+

 GimpPreviewArea

-
typedef struct _GimpPreviewArea GimpPreviewArea;

+
typedef struct _GimpPreviewArea GimpPreviewArea;

 

 
 

 

 

 

-

+

 gimp_preview_area_new ()

-
GtkWidget*  gimp_preview_area_new           (void);

+
GtkWidget*  gimp_preview_area_new           (void);

 

 

 

@@ -183,9 +182,9 @@ Since GIMP 2.2
 

 

 

-

+

 gimp_preview_area_draw ()

-
void        gimp_preview_area_draw          (GimpPreviewArea *area,
+
void        gimp_preview_area_draw          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
                                              gint width,
@@ -261,9 +260,9 @@ href="../libgimpbase/libgimpbase-gimpbaseenums.html#GimpImageType"
 

 

 

-

+

 gimp_preview_area_fill ()

-
void        gimp_preview_area_fill          (GimpPreviewArea *area,
+
void        gimp_preview_area_fill          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
                                              gint width,
@@ -336,9 +335,9 @@ Since GIMP 2.2

 

 

 

-

+

 gimp_preview_area_blend ()

-
void        gimp_preview_area_blend         (GimpPreviewArea *area,
+
void        gimp_preview_area_blend         (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
                                              gint width,
@@ -438,9 +437,9 @@ href="../libgimpbase/libgimpbase-gimpbaseenums.html#GimpImageType"
 

 

 

-

+

 gimp_preview_area_mask ()

-
void        gimp_preview_area_mask          (GimpPreviewArea *area,
+
void        gimp_preview_area_mask          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
                                              gint width,
@@ -548,9 +547,9 @@ href="../libgimpbase/libgimpbase-gimpbaseenums.html#GimpImageType"
 

 

 

-

+

 gimp_preview_area_set_offsets ()

-
void        gimp_preview_area_set_offsets   (GimpPreviewArea *area,
+
void        gimp_preview_area_set_offsets   (GimpPreviewArea *area,
                                              gint x,
                                              gint y);

 

@@ -587,9 +586,9 @@ when drawing the checkerboard and to determine the dither offsets.

 

 

 

-

+

 gimp_preview_area_set_colormap ()

-
void        gimp_preview_area_set_colormap  (GimpPreviewArea *area,
+
void        gimp_preview_area_set_colormap  (GimpPreviewArea *area,
                                              const guchar *colormap,
                                              gint num_colors);

 

@@ -628,9 +627,9 @@ Since GIMP 2.2

 

 

 

-

+

 gimp_preview_area_set_max_size ()

-
void        gimp_preview_area_set_max_size  (GimpPreviewArea *area,
+
void        gimp_preview_area_set_max_size  (GimpPreviewArea *area,
                                              gint width,
                                              gint height);

 

@@ -669,12 +668,10 @@ preview will draw itself centered into the allocated area.

 

 

 

-

+

 gimp_preview_area_menu_popup ()

-
void        gimp_preview_area_menu_popup    (GimpPreviewArea *area,
-                                             GdkEventButton *event);

+
void        gimp_preview_area_menu_popup    (GimpPreviewArea *area,
+                                             GdkEventButton *event);

 

 Creates a popup menu that allows to configure the size and type of
 the checkerboard pattern that the area uses to visualize transparency.

@@ -703,11 +700,11 @@ the checkerboard pattern that the area u
 

 

 

-
Properties

+
Property Details

 

-

+

 The "check-size" property

-
  "check-size"           
  "check-size"           GimpCheckSize         : Read / Write

 

@@ -715,9 +712,9 @@ href="../libgimpbase/libgimpbase-gimpbaseenums.html#GimpCheckSize"
 

 

 

-

+

 The "check-type" property

-
  "check-type"           
  "check-type"           GimpCheckType         : Read / Write

 

@@ -725,9 +722,5 @@ href="../libgimpbase/libgimpbase-gimpbaseenums.html#GimpCheckType"
 

 

 

-
-
-
-
<< GimpPixmapGimpPreview >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html
index 5ff50f9d4d..818082a29e 100644
--- a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html
+++ b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,33 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpSizeEntry

+
GimpSizeEntry

 
GimpSizeEntry — Widget for entering pixel values and resolutions.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -44,9 +54,7 @@
             GimpSizeEntry;
             GimpSizeEntryField;
 enum        GimpSizeEntryUpdatePolicy;
-GtkWidget*  gimp_size_entry_new             (gint number_of_fields,
+GtkWidget*  gimp_size_entry_new             (gint number_of_fields,
                                              GimpUnit unit,
@@ -57,15 +65,9 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
                                              gint spinbutton_width,
                                              GimpSizeEntryUpdatePolicy update_policy);
 void        gimp_size_entry_add_field       (GimpSizeEntry *gse,
-                                             GtkSpinButton *value_spinbutton,
-                                             GtkSpinButton *refval_spinbutton);
-GtkWidget*  gimp_size_entry_attach_label    (GimpSizeEntry *gse,
+                                             GtkSpinButton *value_spinbutton,
+                                             GtkSpinButton *refval_spinbutton);
+GtkWidget*  gimp_size_entry_attach_label    (GimpSizeEntry *gse,
                                              const gchar *text,
                                              gint row,
                                              gint column,
@@ -113,56 +115,47 @@ void        gimp_s
                                             (GimpSizeEntry *gse,
                                              gint digits);
 void        gimp_size_entry_grab_focus      (GimpSizeEntry *gse);
-GtkWidget*  gimp_size_entry_get_help_widget (GimpSizeEntry *gse,
+GtkWidget*  gimp_size_entry_get_help_widget (GimpSizeEntry *gse,
                                              gint field);
 
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTable
-                           +----GimpSizeEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkTable
+                                 +----GimpSizeEntry
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpSizeEntry implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "refval-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 "unit-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 "value-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 

 

 

-
Description

+
Description

 

 This widget is used to enter pixel distances/sizes and resolutions.
 

@@ -178,13 +171,9 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 >GimpUnit of the displayed values.
 

 

-For each field, there can be one or two GtkSpinButton's to enter
+For each field, there can be one or two GtkSpinButton's to enter
 "value" and "reference value". If you specify show_refval as FALSE
-in gimp_size_entry_new() there will be only one GtkSpinButton and the
+in gimp_size_entry_new() there will be only one GtkSpinButton and the
 GimpUnitMenu will contain an item for selecting GIMP_UNIT_PIXEL.
 

 

@@ -198,29 +187,29 @@ real-world-unit.
 

 

 

-
Details

+
Details

 

-

+

 GimpSizeEntry

-
typedef struct _GimpSizeEntry GimpSizeEntry;

+
typedef struct _GimpSizeEntry GimpSizeEntry;

 

 
 

 

 

 

-

+

 GimpSizeEntryField

-
typedef struct _GimpSizeEntryField GimpSizeEntryField;

+
typedef struct _GimpSizeEntryField GimpSizeEntryField;

 

 
 

 

 

 

-

+

 enum GimpSizeEntryUpdatePolicy

-
typedef enum
+
typedef enum
 {
   GIMP_SIZE_ENTRY_UPDATE_NONE       = 0,
   GIMP_SIZE_ENTRY_UPDATE_SIZE       = 1,
@@ -233,11 +222,9 @@ real-world-unit.
 

 

 

-

+

 gimp_size_entry_new ()

-
GtkWidget*  gimp_size_entry_new             (gint number_of_fields,
+
GtkWidget*  gimp_size_entry_new             (gint number_of_fields,
                                              GimpUnit unit,
@@ -280,9 +267,7 @@ For each input field:
 7. gimp_size_entry_set_refval() (or gimp_size_entry_set_value())
 

 

-The GimpSizeEntry is derived from GtkTable and will have
+The GimpSizeEntry is derived from GtkTable and will have
 an empty border of one cell width on each side plus an empty column left
 of the GimpUnitMenu to allow the caller to add labels or a
 GimpChainButton.

@@ -336,9 +321,7 @@ of the GimpU
 
 
 spinbutton_width :
-  The minimal horizontal size of the GtkSpinButton's.
+  The minimal horizontal size of the GtkSpinButton's.
 
 
 
@@ -359,24 +342,18 @@ href="../gtk/GtkSpinButton.html"
 

 

 

-

+

 gimp_size_entry_add_field ()

-
void        gimp_size_entry_add_field       (GimpSizeEntry *gse,
-                                             GtkSpinButton *value_spinbutton,
-                                             GtkSpinButton *refval_spinbutton);

+
void        gimp_size_entry_add_field       (GimpSizeEntry *gse,
+                                             GtkSpinButton *value_spinbutton,
+                                             GtkSpinButton *refval_spinbutton);

 

 Adds an input field to the GimpSizeEntry.
 

 

 The new input field will have the index 0. If you specified show_refval
 as TRUE in gimp_size_entry_new() you have to pass an additional
-GtkSpinButton to hold the reference value. If show_refval was FALSE,
+GtkSpinButton to hold the reference value. If show_refval was FALSE,
 refval_spinbutton will be ignored.

 

 
@@ -407,21 +384,15 @@ href="../gtk/GtkSpinButton.html"
 

 

 

-

+

 gimp_size_entry_attach_label ()

-
GtkWidget*  gimp_size_entry_attach_label    (GimpSizeEntry *gse,
+
GtkWidget*  gimp_size_entry_attach_label    (GimpSizeEntry *gse,
                                              const gchar *text,
                                              gint row,
                                              gint column,
                                              gfloat alignment);

 

-Attaches a GtkLabel to the GimpSizeEntry (which is a GtkTable).

+Attaches a GtkLabel to the GimpSizeEntry (which is a GtkTable).

 

 
 

@@ -461,9 +432,7 @@ href="../gtk/GtkTable.html"
 
 
 Returns :
- A pointer to the new GtkLabel widget.
+ A pointer to the new GtkLabel widget.
 
 
 
@@ -471,9 +440,9 @@ href="../gtk/GtkLabel.html"
 

 

 

-

+

 gimp_size_entry_set_resolution ()

-
void        gimp_size_entry_set_resolution  (GimpSizeEntry *gse,
+
void        gimp_size_entry_set_resolution  (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble resolution,
                                              gboolean keep_size);

@@ -527,9 +496,9 @@ This function does nothing if the 
-

+

 gimp_size_entry_set_size ()

-
void        gimp_size_entry_set_size        (GimpSizeEntry *gse,
+
void        gimp_size_entry_set_size        (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble lower,
                                              gdouble upper);

@@ -580,9 +549,9 @@ This function does nothing if the 
-

+

 gimp_size_entry_set_value_boundaries ()

-
void        gimp_size_entry_set_value_boundaries
+
void        gimp_size_entry_set_value_boundaries
                                             (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble lower,
@@ -636,9 +605,9 @@ NOTE: In most cases you won't be interested in these values because the
 

 

 

-

+

 gimp_size_entry_get_value ()

-
gdouble     gimp_size_entry_get_value       (GimpSizeEntry *gse,
+
gdouble     gimp_size_entry_get_value       (GimpSizeEntry *gse,
                                              gint field);

 

 Returns the value of field # field of the GimpSizeEntry.
@@ -683,9 +652,9 @@ NOTE: In most cases you won't be interested in this value because the
 

 

 

-

+

 gimp_size_entry_set_value ()

-
void        gimp_size_entry_set_value       (GimpSizeEntry *gse,
+
void        gimp_size_entry_set_value       (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble value);

 

@@ -731,9 +700,9 @@ NOTE: In most cases you won't be interested in this value because the
 

 

 

-

+

 gimp_size_entry_set_refval_boundaries ()

-
void        gimp_size_entry_set_refval_boundaries
+
void        gimp_size_entry_set_refval_boundaries
                                             (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble lower,
@@ -781,9 +750,9 @@ The current reference value of the field
 

 

 

-

+

 gimp_size_entry_set_refval_digits ()

-
void        gimp_size_entry_set_refval_digits
+
void        gimp_size_entry_set_refval_digits
                                             (GimpSizeEntry *gse,
                                              gint field,
                                              gint digits);

@@ -816,9 +785,7 @@ of digits will equal to 0 for GIMP_SIZE_ENTRY_UPDATE_SIZE
 
 digits :
- The new number of decimal digits for the GtkSpinButton which
+ The new number of decimal digits for the GtkSpinButton which
          displays field's reference value.
 
 
@@ -827,9 +794,9 @@ href="../gtk/GtkSpinButton.html"
 

 

 

-

+

 gimp_size_entry_get_refval ()

-
gdouble     gimp_size_entry_get_refval      (GimpSizeEntry *gse,
+
gdouble     gimp_size_entry_get_refval      (GimpSizeEntry *gse,
                                              gint field);

 

 Returns the reference value for field # field of the GimpSizeEntry.
@@ -867,9 +834,9 @@ in dpi, depending on which 
-

+

 gimp_size_entry_set_refval ()

-
void        gimp_size_entry_set_refval      (GimpSizeEntry *gse,
+
void        gimp_size_entry_set_refval      (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble refval);

 

@@ -908,9 +875,9 @@ depending on which 
 

 

-

+

 gimp_size_entry_get_unit ()

-
GimpUnit    gimp_size_entry_get_unit        (GimpSizeEntry *gse);

 

@@ -941,9 +908,9 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 

 

 

-

+

 gimp_size_entry_set_unit ()

-
void        gimp_size_entry_set_unit        (GimpSizeEntry *gse,
+
void        gimp_size_entry_set_unit        (GimpSizeEntry *gse,
                                              GimpUnit unit);

@@ -975,9 +942,9 @@ according to which 
 

 

-

+

 gimp_size_entry_set_pixel_digits ()

-
void        gimp_size_entry_set_pixel_digits
+
void        gimp_size_entry_set_pixel_digits
                                             (GimpSizeEntry *gse,
                                              gint digits);

 

@@ -1006,16 +973,12 @@ you set up a 
-

+

 gimp_size_entry_grab_focus ()

-
void        gimp_size_entry_grab_focus      (GimpSizeEntry *gse);

+
void        gimp_size_entry_grab_focus      (GimpSizeEntry *gse);

 

 This function is rather ugly and just a workaround for the fact that
-it's impossible to implement gtk_widget_grab_focus() for a GtkTable.

+it's impossible to implement gtk_widget_grab_focus() for a GtkTable.

 

 
 

@@ -1031,11 +994,9 @@ href="../gtk/GtkTable.html"
 

 

 

-

+

 gimp_size_entry_get_help_widget ()

-
GtkWidget*  gimp_size_entry_get_help_widget (GimpSizeEntry *gse,
+
GtkWidget*  gimp_size_entry_get_help_widget (GimpSizeEntry *gse,
                                              gint field);

 

 You shouldn't fiddle with the internals of a GimpSizeEntry but
@@ -1062,9 +1023,7 @@ can use this function to get a pointer to the spinbuttons.

 
 
 Returns :
- a GtkWidget pointer that you can attach a tooltip to.
+ a GtkWidget pointer that you can attach a tooltip to.
 
 
 
@@ -1072,12 +1031,12 @@ href="../gtk/GtkWidget.html"
 

 

 

-
Signals

+
Signal Details

 

-

+

 The "refval-changed" signal

-
void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);

+
void        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first

 

 
 

@@ -1101,10 +1060,10 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 The "unit-changed" signal

-
void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);

+
void        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first

 

 
 

@@ -1128,10 +1087,10 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 The "value-changed" signal

-
void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);

+
void        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first

 

 
 

@@ -1155,7 +1114,7 @@ href="../gtk/GtkWidget.html"
 

 

 

-
See Also

+
See Also

 

 
 

 

-
-
-
-
<< GimpQueryBoxGimpStock >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html
index 1425c28b8d..b1500cc09a 100644
--- a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html
+++ b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,18 +20,27 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+                   | 
+                  Object Hierarchy
+                   | 
+                  Signals
+
 

 

 

 
-
GimpUnitMenu

+
GimpUnitMenu

 
GimpUnitMenu — Widget for selecting a GimpUnit.

@@ -38,15 +48,13 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 		
 

 

-
Synopsis

+
Synopsis

 
 
 
 
             GimpUnitMenu;
-GtkWidget*  gimp_unit_menu_new              (const gchar *format,
+GtkWidget*  gimp_unit_menu_new              (const gchar *format,
                                              GimpUnit unit,
@@ -67,52 +75,39 @@ void        gimp_uni
 

 

 

-
Object Hierarchy

+
Object Hierarchy

 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GtkOptionMenu
-                                       +----GimpUnitMenu
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GtkOptionMenu
+                                             +----GimpUnitMenu
 

 

 

-
Implemented Interfaces

+
Implemented Interfaces

 

 GimpUnitMenu implements
  AtkImplementorIface.

 

 

-
Signal Prototypes

+
Signals

 
 
 "unit-changed"
             void        user_function      (GimpUnitMenu *arg0,
-                                            gpointer user_data);
+                                            gpointer      user_data)      : Run first
 

 

 

-
Description

+
Description

 

-This widget provides a GtkOptionMenu which contains a list of GtkOptionMenu which contains a list of GimpUnit's.
 

@@ -131,22 +126,20 @@ Whenever the user selects a unit from the menu or the dialog, the
 

 

 

-
Details

+
Details

 

-

+

 GimpUnitMenu

-
typedef struct _GimpUnitMenu GimpUnitMenu;

+
typedef struct _GimpUnitMenu GimpUnitMenu;

 

 
 

 

 

 

-

+

 gimp_unit_menu_new ()

-
GtkWidget*  gimp_unit_menu_new              (const gchar *format,
+
GtkWidget*  gimp_unit_menu_new              (const gchar *format,
                                              GimpUnit unit,
@@ -244,9 +237,9 @@ The format string supports the following
 

 

 

-

+

 gimp_unit_menu_set_unit ()

-
void        gimp_unit_menu_set_unit         (GimpUnitMenu *menu,
+
void        gimp_unit_menu_set_unit         (GimpUnitMenu *menu,
                                              GimpUnit unit);

@@ -277,9 +270,9 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 

 

 

-

+

 gimp_unit_menu_get_unit ()

-
GimpUnit    gimp_unit_menu_get_unit         (GimpUnitMenu *menu);

 

@@ -309,9 +302,9 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 

 

 

-

+

 gimp_unit_menu_get_pixel_digits ()

-
gint        gimp_unit_menu_get_pixel_digits (GimpUnitMenu *menu);

+
gint        gimp_unit_menu_get_pixel_digits (GimpUnitMenu *menu);

 

 Retrieve the number of digits for a pixel size as set by
 gimp_unit_set_pixel_digits().

@@ -338,9 +331,9 @@ Retrieve the number of digits for a pixel size as set by
 

 

 

-

+

 gimp_unit_menu_set_pixel_digits ()

-
void        gimp_unit_menu_set_pixel_digits (GimpUnitMenu *menu,
+
void        gimp_unit_menu_set_pixel_digits (GimpUnitMenu *menu,
                                              gint digits);

 

 A GimpUnitMenu can be setup to control the number of digits shown
@@ -376,12 +369,12 @@ here. You should do this after attaching your spinbuttons.

 

 

 

-
Signals

+
Signal Details

 

-

+

 The "unit-changed" signal

-
void        user_function                  (GimpUnitMenu *arg0,
-                                            gpointer user_data);

+
void        user_function                  (GimpUnitMenu *arg0,
+                                            gpointer      user_data)      : Run first

 

 This signal is emitted whenever the user selects a GimpUnit
 

 

 

-
See Also

+
See Also

 

 
 

 

-
-
-
-
<< GimpScrolledPreviewCell Renderers for GtkTreeView >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/index.html b/devel-docs/libgimpwidgets/html/index.html
index 153e05b644..fa76ef5c93 100644
--- a/devel-docs/libgimpwidgets/html/index.html
+++ b/devel-docs/libgimpwidgets/html/index.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -5,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -16,13 +17,12 @@
 
 
 
-
-

+

 

 

-
GIMP Widgets Library Reference Manual

+

 

-      for GIMP 2.2.9
+      for GIMP 2.2.12
 
     

 

@@ -162,10 +162,5 @@ helper functions.
 
 
 

-

-
-
-
-
Part I. GIMP Widgets >>

-
+

 
diff --git a/devel-docs/libgimpwidgets/html/index.sgml b/devel-docs/libgimpwidgets/html/index.sgml
index af6a82c9ff..5201d63b3a 100644
--- a/devel-docs/libgimpwidgets/html/index.sgml
+++ b/devel-docs/libgimpwidgets/html/index.sgml
@@ -203,6 +203,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html
index 96bd34a6b0..17a77ba324 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,27 +20,30 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
GimpHelpUI

-
GimpHelpUI — Functions for setting GtkTooltips and help identifier used by GIMP help
+
GimpHelpUI

+
GimpHelpUI — Functions for setting GtkTooltips and help identifier used by GIMP help
 system.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -51,35 +55,29 @@ void        g
 void        gimp_help_disable_tooltips      (void);
 void        gimp_standard_help_func         (const gchar *help_id,
                                              gpointer help_data);
-void        gimp_help_connect               (GtkWidget *widget,
+void        gimp_help_connect               (GtkWidget *widget,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              gpointer help_data);
-void        gimp_help_set_help_data         (GtkWidget *widget,
+void        gimp_help_set_help_data         (GtkWidget *widget,
                                              const gchar *tooltip,
                                              const gchar *help_id);
-void        gimp_context_help               (GtkWidget *widget);
+void        gimp_context_help               (GtkWidget *widget);
 
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 GimpHelpFunc ()

-
void        (*GimpHelpFunc)                 (const gchar *help_id,
+
void        (*GimpHelpFunc)                 (const gchar *help_id,
                                              gpointer help_data);

 

 This is the prototype for all functions you pass as help_func to the
@@ -126,9 +124,9 @@ the help.
 

 

 

-

+

 GIMP_HELP_ID

-
#define GIMP_HELP_ID (gimp_help_id_quark ())
+
#define GIMP_HELP_ID (gimp_help_id_quark ())
 

 

 Since: GIMP 2.2
@@ -136,35 +134,31 @@ Since: GIMP 2.2
 

 

 

-

+

 gimp_help_enable_tooltips ()

-
void        gimp_help_enable_tooltips       (void);

+
void        gimp_help_enable_tooltips       (void);

 

-This function calls gtk_tooltips_enable().

+This function calls gtk_tooltips_enable().

 

 
 

 

 

 

-

+

 gimp_help_disable_tooltips ()

-
void        gimp_help_disable_tooltips      (void);

+
void        gimp_help_disable_tooltips      (void);

 

-This function calls gtk_tooltips_disable().

+This function calls gtk_tooltips_disable().

 

 
 

 

 

 

-

+

 gimp_standard_help_func ()

-
void        gimp_standard_help_func         (const gchar *help_id,
+
void        gimp_standard_help_func         (const gchar *help_id,
                                              gpointer help_data);

 

 This is the standard GIMP help function which does nothing but calling
@@ -194,11 +188,9 @@ href="../libgimp/libgimp-gimphelp.html#gimp-help"
 

 

 

-

+

 gimp_help_connect ()

-
void        gimp_help_connect               (GtkWidget *widget,
+
void        gimp_help_connect               (GtkWidget *widget,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              gpointer help_data);

@@ -216,9 +208,7 @@ constructors. You only have to call it for windows/dialogs you created
 
 widget :
  The widget you want to connect the help accelerator for. Will
-         be a GtkWindow in most cases.
+         be a GtkWindow in most cases.
 
 
 
@@ -244,17 +234,13 @@ href="../gtk/GtkWindow.html"
 

 

 

-

+

 gimp_help_set_help_data ()

-
void        gimp_help_set_help_data         (GtkWidget *widget,
+
void        gimp_help_set_help_data         (GtkWidget *widget,
                                              const gchar *tooltip,
                                              const gchar *help_id);

 

-The reason why we don't use gtk_tooltips_set_tip() is that it's
+The reason why we don't use gtk_tooltips_set_tip() is that it's
 impossible to set a private_tip (aka help_id) without a visible
 tooltip.
 

@@ -271,9 +257,7 @@ a visible tooltip.

 
 
 widget :
-  The GtkWidget you want to set a tooltip and/or help_id for.
+  The GtkWidget you want to set a tooltip and/or help_id for.
 
 
 
@@ -285,9 +269,7 @@ href="../gtk/GtkWidget.html"
 
 
 help_id :
- The help_id for the GtkTipsQuery tooltips inspector.
+ The help_id for the GtkTipsQuery tooltips inspector.
 
 
 
@@ -295,11 +277,9 @@ href="../gtk/GtkTipsQuery.html"
 

 

 

-

+

 gimp_context_help ()

-
void        gimp_context_help               (GtkWidget *widget);

+
void        gimp_context_help               (GtkWidget *widget);

 

 This function invokes the context help inspector.
 

@@ -321,18 +301,12 @@ case at least for every window/dialog).

 
 
 widget :
- Any GtkWidget on the screen.
+ Any GtkWidget on the screen.
 
 
 

 

 

 

-
-
-
-
<< Part V. GIMP Widgets UtilitiesGimpQueryBox >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
index 5b21cad866..94ae0a35e1 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,62 +20,53 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
GimpQueryBox

+
GimpQueryBox

 
GimpQueryBox — Some simple dialogs to enter a single int, double, string or boolean value.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
-void        (*GimpQueryStringCallback)      (GtkWidget *query_box,
+void        (*GimpQueryStringCallback)      (GtkWidget *query_box,
                                              const gchar *string,
                                              gpointer data);
-void        (*GimpQueryIntCallback)         (GtkWidget *query_box,
+void        (*GimpQueryIntCallback)         (GtkWidget *query_box,
                                              gint value,
                                              gpointer data);
-void        (*GimpQueryDoubleCallback)      (GtkWidget *query_box,
+void        (*GimpQueryDoubleCallback)      (GtkWidget *query_box,
                                              gdouble value,
                                              gpointer data);
-void        (*GimpQuerySizeCallback)        (GtkWidget *query_box,
+void        (*GimpQuerySizeCallback)        (GtkWidget *query_box,
                                              gdouble size,
                                              GimpUnit unit,
                                              gpointer data);
-void        (*GimpQueryBooleanCallback)     (GtkWidget *query_box,
+void        (*GimpQueryBooleanCallback)     (GtkWidget *query_box,
                                              gboolean value,
                                              gpointer data);
-GtkWidget*  gimp_query_string_box           (const gchar *title,
-                                             GtkWidget *parent,
+GtkWidget*  gimp_query_string_box           (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -83,12 +75,8 @@ href="../gtk/GtkWidget.html"
                                              const gchar *signal,
                                              GimpQueryStringCallback callback,
                                              gpointer data);
-GtkWidget*  gimp_query_int_box              (const gchar *title,
-                                             GtkWidget *parent,
+GtkWidget*  gimp_query_int_box              (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -99,12 +87,8 @@ href="../gtk/GtkWidget.html"
                                              const gchar *signal,
                                              GimpQueryIntCallback callback,
                                              gpointer data);
-GtkWidget*  gimp_query_double_box           (const gchar *title,
-                                             GtkWidget *parent,
+GtkWidget*  gimp_query_double_box           (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -116,12 +100,8 @@ href="../gtk/GtkWidget.html"
                                              const gchar *signal,
                                              GimpQueryDoubleCallback callback,
                                              gpointer data);
-GtkWidget*  gimp_query_size_box             (const gchar *title,
-                                             GtkWidget *parent,
+GtkWidget*  gimp_query_size_box             (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -138,12 +118,8 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
                                              const gchar *signal,
                                              GimpQuerySizeCallback callback,
                                              gpointer data);
-GtkWidget*  gimp_query_boolean_box          (const gchar *title,
-                                             GtkWidget *parent,
+GtkWidget*  gimp_query_boolean_box          (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *stock_id,
@@ -158,18 +134,14 @@ href="../gtk/GtkWidget.html"
 

 

 

-
Description

+
Description

 

 These functions provide simple dialogs for entering a single string,
 integer, double, boolean or pixel size value.
 

 

-They return a pointer to a GtkDialog which has to be shown with
-gtk_widget_show() by the caller.
+They return a pointer to a GtkDialog which has to be shown with
+gtk_widget_show() by the caller.
 

 

 The dialogs contain an entry widget for the kind of value they ask for
@@ -179,13 +151,11 @@ callback function is called and returns the entered value.
 

 

 

-
Details

+
Details

 

-

+

 GimpQueryStringCallback ()

-
void        (*GimpQueryStringCallback)      (GtkWidget *query_box,
+
void        (*GimpQueryStringCallback)      (GtkWidget *query_box,
                                              const gchar *string,
                                              gpointer data);

 

@@ -219,11 +189,9 @@ Note that you have to g_free() the returned string
 

 

 

-

+

 GimpQueryIntCallback ()

-
void        (*GimpQueryIntCallback)         (GtkWidget *query_box,
+
void        (*GimpQueryIntCallback)         (GtkWidget *query_box,
                                              gint value,
                                              gpointer data);

 

@@ -257,11 +225,9 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 GimpQueryDoubleCallback ()

-
void        (*GimpQueryDoubleCallback)      (GtkWidget *query_box,
+
void        (*GimpQueryDoubleCallback)      (GtkWidget *query_box,
                                              gdouble value,
                                              gpointer data);

 

@@ -295,11 +261,9 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 GimpQuerySizeCallback ()

-
void        (*GimpQuerySizeCallback)        (GtkWidget *query_box,
+
void        (*GimpQuerySizeCallback)        (GtkWidget *query_box,
                                              gdouble size,
                                              
 

 

-

+

 GimpQueryBooleanCallback ()

-
void        (*GimpQueryBooleanCallback)     (GtkWidget *query_box,
+
void        (*GimpQueryBooleanCallback)     (GtkWidget *query_box,
                                              gboolean value,
                                              gpointer data);

 

@@ -380,14 +342,10 @@ href="../gtk/GtkWidget.html"
 

 

 

-

+

 gimp_query_string_box ()

-
GtkWidget*  gimp_query_string_box           (const gchar *title,
-                                             GtkWidget *parent,
+
GtkWidget*  gimp_query_string_box           (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -397,9 +355,7 @@ href="../gtk/GtkWidget.html"
                                              GimpQueryStringCallback callback,
                                              gpointer data);

 

-Creates a new GtkDialog that queries the user for a string value.

+Creates a new GtkDialog that queries the user for a string value.

 

 
 

@@ -469,9 +425,7 @@ href="../gtk/GtkDialog.html"
 
 
 Returns :
- A pointer to the new GtkDialog.
+ A pointer to the new GtkDialog.
 
 
 
@@ -479,14 +433,10 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_query_int_box ()

-
GtkWidget*  gimp_query_int_box              (const gchar *title,
-                                             GtkWidget *parent,
+
GtkWidget*  gimp_query_int_box              (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -498,9 +448,7 @@ href="../gtk/GtkWidget.html"
                                              GimpQueryIntCallback callback,
                                              gpointer data);

 

-Creates a new GtkDialog that queries the user for an integer value.

+Creates a new GtkDialog that queries the user for an integer value.

 

 
 

@@ -582,9 +530,7 @@ href="../gtk/GtkDialog.html"
 
 
 Returns :
- A pointer to the new GtkDialog.
+ A pointer to the new GtkDialog.
 
 
 
@@ -592,14 +538,10 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_query_double_box ()

-
GtkWidget*  gimp_query_double_box           (const gchar *title,
-                                             GtkWidget *parent,
+
GtkWidget*  gimp_query_double_box           (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -612,9 +554,7 @@ href="../gtk/GtkWidget.html"
                                              GimpQueryDoubleCallback callback,
                                              gpointer data);

 

-Creates a new GtkDialog that queries the user for a double value.

+Creates a new GtkDialog that queries the user for a double value.

 

 
 

@@ -672,9 +612,7 @@ href="../gtk/GtkDialog.html"
 
 
 digits :
-    The number of decimal digits the GtkSpinButton will provide.
+    The number of decimal digits the GtkSpinButton will provide.
 
 
 
@@ -704,9 +642,7 @@ href="../gtk/GtkSpinButton.html"
 
 
 Returns :
- A pointer to the new GtkDialog.
+ A pointer to the new GtkDialog.
 
 
 
@@ -714,14 +650,10 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_query_size_box ()

-
GtkWidget*  gimp_query_size_box             (const gchar *title,
-                                             GtkWidget *parent,
+
GtkWidget*  gimp_query_size_box             (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *message,
@@ -739,9 +671,7 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
                                              GimpQuerySizeCallback callback,
                                              gpointer data);

 

-Creates a new GtkDialog that queries the user for a size using a
+Creates a new GtkDialog that queries the user for a size using a
 GimpSizeEntry.

 

 
@@ -851,9 +781,7 @@ href="../gtk/GtkDialog.html"
 
 
 Returns :
- A pointer to the new GtkDialog.
+ A pointer to the new GtkDialog.
 
 
 
@@ -861,14 +789,10 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 gimp_query_boolean_box ()

-
GtkWidget*  gimp_query_boolean_box          (const gchar *title,
-                                             GtkWidget *parent,
+
GtkWidget*  gimp_query_boolean_box          (const gchar *title,
+                                             GtkWidget *parent,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
                                              const gchar *stock_id,
@@ -880,9 +804,7 @@ href="../gtk/GtkWidget.html"
                                              GimpQueryBooleanCallback callback,
                                              gpointer data);

 

-Creates a new GtkDialog that asks the user to do a boolean decision.

+Creates a new GtkDialog that asks the user to do a boolean decision.

 

 
 

@@ -967,9 +889,7 @@ href="../gtk/GtkDialog.html"
 
 
 Returns :
- A pointer to the new GtkDialog.
+ A pointer to the new GtkDialog.
 
 
 
@@ -977,13 +897,11 @@ href="../gtk/GtkDialog.html"
 

 

 

-

+

 GIMP_QUERY_BOX_VBOX()

-
#define     GIMP_QUERY_BOX_VBOX(qbox)

+
#define     GIMP_QUERY_BOX_VBOX(qbox)

 

-A macro to access the GtkVBox in a GimpQueryBox. Useful if you want to add
+A macro to access the GtkVBox in a GimpQueryBox. Useful if you want to add
 more widgets.
 

 

@@ -1000,7 +918,7 @@ more widgets.
 

-
See Also

+
See Also

 

 GimpSizeEntry
 

@@ -1009,9 +927,5 @@ GimpUnitMenu
 

 

-

 
 
 

-
-
-
<< GimpHelpUIGimpSizeEntry >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpScrolledPreview.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpScrolledPreview.html
index 740458c0fb..32ec7af5b0 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpScrolledPreview.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpScrolledPreview.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,29 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
GimpScrolledPreview

+
GimpScrolledPreview

 
GimpScrolledPreview — A widget providing a GimpPreview enhanced by scrolling capabilities.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -46,17 +52,17 @@
 

 

 

-
Description

+
Description

 

 A widget providing a GimpPreview enhanced by scrolling capabilities.
 

 

 

-
Details

+
Details

 

-

+

 GimpScrolledPreview

-
typedef struct {
+
typedef struct {
   GimpPreview   parent_instance;
 } GimpScrolledPreview;
 

@@ -66,9 +72,5 @@ A widget providing a 
 

 

-
-
-
-
<< GimpPreviewGimpUnitMenu >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html
index 24b88b0bd4..75b1351e09 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,24 +20,29 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
GimpStock

+
GimpStock

 
GimpStock — Prebuilt common menu/toolbar items and corresponding icons

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
@@ -224,7 +230,7 @@ void        gimp_stock_i
 

 

 

-
Description

+
Description

 

 GIMP registers a set of menu/toolbar items and corresponding icons in
 addition to the standard GTK+ stock items. These can be used just like
@@ -237,11 +243,11 @@ locales.
 

 

 

-
Details

+
Details

 

-

+

 gimp_stock_init ()

-
void        gimp_stock_init                 (void);

+
void        gimp_stock_init                 (void);

 

 Initializes the GIMP stock icon factory.
 

@@ -256,1820 +262,1820 @@ this for you.

 

 

 

-

+

 GIMP_STOCK_ANCHOR

-
#define GIMP_STOCK_ANCHOR                   "gimp-anchor"
+
#define GIMP_STOCK_ANCHOR                   "gimp-anchor"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CENTER

-
#define GIMP_STOCK_CENTER                   "gimp-center"
+
#define GIMP_STOCK_CENTER                   "gimp-center"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_DUPLICATE

-
#define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
+
#define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_EDIT

-
#define GIMP_STOCK_EDIT                     "gimp-edit"
+
#define GIMP_STOCK_EDIT                     "gimp-edit"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_RESET

-
#define GIMP_STOCK_RESET                    "gimp-reset"
+
#define GIMP_STOCK_RESET                    "gimp-reset"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CLOSE

-
#define GIMP_STOCK_CLOSE                    "gimp-close"
+
#define GIMP_STOCK_CLOSE                    "gimp-close"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_MENU_LEFT

-
#define GIMP_STOCK_MENU_LEFT                "gimp-menu-left"
+
#define GIMP_STOCK_MENU_LEFT                "gimp-menu-left"
 

 

-
+
 RTL variant
-
+
 

 

 

 

-

+

 GIMP_STOCK_MENU_RIGHT

-
#define GIMP_STOCK_MENU_RIGHT               "gimp-menu-right"
+
#define GIMP_STOCK_MENU_RIGHT               "gimp-menu-right"
 

 

-
+
 RTL variant
-
+
 

 

 

 

-

+

 GIMP_STOCK_MOVE_TO_SCREEN

-
#define GIMP_STOCK_MOVE_TO_SCREEN           "gimp_move-to-screen"
+
#define GIMP_STOCK_MOVE_TO_SCREEN           "gimp_move-to-screen"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_INVERT

-
#define GIMP_STOCK_INVERT                   "gimp-invert"
+
#define GIMP_STOCK_INVERT                   "gimp-invert"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_LAYER_TO_IMAGESIZE

-
#define GIMP_STOCK_LAYER_TO_IMAGESIZE       "gimp-layer-to-imagesize"
+
#define GIMP_STOCK_LAYER_TO_IMAGESIZE       "gimp-layer-to-imagesize"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_MERGE_DOWN

-
#define GIMP_STOCK_MERGE_DOWN               "gimp-merge-down"
+
#define GIMP_STOCK_MERGE_DOWN               "gimp-merge-down"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_NAVIGATION

-
#define GIMP_STOCK_NAVIGATION               "gimp-navigation"
+
#define GIMP_STOCK_NAVIGATION               "gimp-navigation"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PASTE_AS_NEW

-
#define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
+
#define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PASTE_INTO

-
#define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"
+
#define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PATH_STROKE

-
#define GIMP_STOCK_PATH_STROKE              "gimp-path-stroke"
+
#define GIMP_STOCK_PATH_STROKE              "gimp-path-stroke"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PLUGIN

-
#define GIMP_STOCK_PLUGIN                   "gimp-plugin"
+
#define GIMP_STOCK_PLUGIN                   "gimp-plugin"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_QMASK_OFF

-
#define GIMP_STOCK_QMASK_OFF                "gimp-qmask-off"
+
#define GIMP_STOCK_QMASK_OFF                "gimp-qmask-off"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_QMASK_ON

-
#define GIMP_STOCK_QMASK_ON                 "gimp-qmask-on"
+
#define GIMP_STOCK_QMASK_ON                 "gimp-qmask-on"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_HISTOGRAM

-
#define GIMP_STOCK_HISTOGRAM                "gimp-histogram"
+
#define GIMP_STOCK_HISTOGRAM                "gimp-histogram"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_HISTOGRAM_LINEAR

-
#define GIMP_STOCK_HISTOGRAM_LINEAR         "gimp-histogram-linear"
+
#define GIMP_STOCK_HISTOGRAM_LINEAR         "gimp-histogram-linear"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_HISTOGRAM_LOGARITHMIC

-
#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC    "gimp-histogram-logarithmic"
+
#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC    "gimp-histogram-logarithmic"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_RESHOW_FILTER

-
#define GIMP_STOCK_RESHOW_FILTER            "gimp-reshow-filter"
+
#define GIMP_STOCK_RESHOW_FILTER            "gimp-reshow-filter"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_RESIZE

-
#define GIMP_STOCK_RESIZE                   "gimp-resize"
+
#define GIMP_STOCK_RESIZE                   "gimp-resize"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_FLIP_HORIZONTAL

-
#define GIMP_STOCK_FLIP_HORIZONTAL          "gimp-flip-horizontal"
+
#define GIMP_STOCK_FLIP_HORIZONTAL          "gimp-flip-horizontal"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_FLIP_VERTICAL

-
#define GIMP_STOCK_FLIP_VERTICAL            "gimp-flip-vertical"
+
#define GIMP_STOCK_FLIP_VERTICAL            "gimp-flip-vertical"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_ROTATE_180

-
#define GIMP_STOCK_ROTATE_180               "gimp-rotate-180"
+
#define GIMP_STOCK_ROTATE_180               "gimp-rotate-180"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_ROTATE_270

-
#define GIMP_STOCK_ROTATE_270               "gimp-rotate-270"
+
#define GIMP_STOCK_ROTATE_270               "gimp-rotate-270"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_ROTATE_90

-
#define GIMP_STOCK_ROTATE_90                "gimp-rotate-90"
+
#define GIMP_STOCK_ROTATE_90                "gimp-rotate-90"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SCALE

-
#define GIMP_STOCK_SCALE                    "gimp-scale"
+
#define GIMP_STOCK_SCALE                    "gimp-scale"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_LINKED

-
#define GIMP_STOCK_LINKED                   "gimp-linked"
+
#define GIMP_STOCK_LINKED                   "gimp-linked"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_VISIBLE

-
#define GIMP_STOCK_VISIBLE                  "gimp-visible"
+
#define GIMP_STOCK_VISIBLE                  "gimp-visible"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_LIST

-
#define GIMP_STOCK_LIST                     "gimp-list"
+
#define GIMP_STOCK_LIST                     "gimp-list"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRID

-
#define GIMP_STOCK_GRID                     "gimp-grid"
+
#define GIMP_STOCK_GRID                     "gimp-grid"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PORTRAIT

-
#define GIMP_STOCK_PORTRAIT                 "gimp-portrait"
+
#define GIMP_STOCK_PORTRAIT                 "gimp-portrait"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_LANDSCAPE

-
#define GIMP_STOCK_LANDSCAPE                "gimp-landscape"
+
#define GIMP_STOCK_LANDSCAPE                "gimp-landscape"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_VIDEO

-
#define GIMP_STOCK_VIDEO                    "gimp-video"
+
#define GIMP_STOCK_VIDEO                    "gimp-video"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_WEB

-
#define GIMP_STOCK_WEB                      "gimp-web"
+
#define GIMP_STOCK_WEB                      "gimp-web"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_IMAGE

-
#define GIMP_STOCK_IMAGE                    "gimp-image"
+
#define GIMP_STOCK_IMAGE                    "gimp-image"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_LAYER

-
#define GIMP_STOCK_LAYER                    "gimp-layer"
+
#define GIMP_STOCK_LAYER                    "gimp-layer"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_LAYER_MASK

-
#define GIMP_STOCK_LAYER_MASK               "gimp-layer-mask"
+
#define GIMP_STOCK_LAYER_MASK               "gimp-layer-mask"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL

-
#define GIMP_STOCK_CHANNEL                  "gimp-channel"
+
#define GIMP_STOCK_CHANNEL                  "gimp-channel"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_RED

-
#define GIMP_STOCK_CHANNEL_RED              "gimp-channel-red"
+
#define GIMP_STOCK_CHANNEL_RED              "gimp-channel-red"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_GREEN

-
#define GIMP_STOCK_CHANNEL_GREEN            "gimp-channel-green"
+
#define GIMP_STOCK_CHANNEL_GREEN            "gimp-channel-green"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_BLUE

-
#define GIMP_STOCK_CHANNEL_BLUE             "gimp-channel-blue"
+
#define GIMP_STOCK_CHANNEL_BLUE             "gimp-channel-blue"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_GRAY

-
#define GIMP_STOCK_CHANNEL_GRAY             "gimp-channel-gray"
+
#define GIMP_STOCK_CHANNEL_GRAY             "gimp-channel-gray"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_INDEXED

-
#define GIMP_STOCK_CHANNEL_INDEXED          "gimp-channel-indexed"
+
#define GIMP_STOCK_CHANNEL_INDEXED          "gimp-channel-indexed"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNEL_ALPHA

-
#define GIMP_STOCK_CHANNEL_ALPHA            "gimp-channel-alpha"
+
#define GIMP_STOCK_CHANNEL_ALPHA            "gimp-channel-alpha"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_PATH

-
#define GIMP_STOCK_PATH                     "gimp-path"
+
#define GIMP_STOCK_PATH                     "gimp-path"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TEXT_LAYER

-
#define GIMP_STOCK_TEXT_LAYER               "gimp-text-layer"
+
#define GIMP_STOCK_TEXT_LAYER               "gimp-text-layer"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_FLOATING_SELECTION

-
#define GIMP_STOCK_FLOATING_SELECTION       "gimp-floating-selection"
+
#define GIMP_STOCK_FLOATING_SELECTION       "gimp-floating-selection"
 

 

-
-
-
-
+
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_TEMPLATE

-
#define GIMP_STOCK_TEMPLATE                 "gimp-template"
+
#define GIMP_STOCK_TEMPLATE                 "gimp-template"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_IMAGES

-
#define GIMP_STOCK_IMAGES                   "gimp-images"
+
#define GIMP_STOCK_IMAGES                   "gimp-images"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_LAYERS

-
#define GIMP_STOCK_LAYERS                   "gimp-layers"
+
#define GIMP_STOCK_LAYERS                   "gimp-layers"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_CHANNELS

-
#define GIMP_STOCK_CHANNELS                 "gimp-channels"
+
#define GIMP_STOCK_CHANNELS                 "gimp-channels"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_PATHS

-
#define GIMP_STOCK_PATHS                    "gimp-paths"
+
#define GIMP_STOCK_PATHS                    "gimp-paths"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_INDEXED_PALETTE

-
#define GIMP_STOCK_INDEXED_PALETTE          "gimp-indexed-palette"
+
#define GIMP_STOCK_INDEXED_PALETTE          "gimp-indexed-palette"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_SHAPE_CIRCLE

-
#define GIMP_STOCK_SHAPE_CIRCLE             "gimp-shape-circle"
+
#define GIMP_STOCK_SHAPE_CIRCLE             "gimp-shape-circle"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SHAPE_SQUARE

-
#define GIMP_STOCK_SHAPE_SQUARE             "gimp-shape-square"
+
#define GIMP_STOCK_SHAPE_SQUARE             "gimp-shape-square"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SHAPE_DIAMOND

-
#define GIMP_STOCK_SHAPE_DIAMOND            "gimp-shape-diamond"
+
#define GIMP_STOCK_SHAPE_DIAMOND            "gimp-shape-diamond"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CAP_BUTT

-
#define GIMP_STOCK_CAP_BUTT                 "gimp-cap-butt"
+
#define GIMP_STOCK_CAP_BUTT                 "gimp-cap-butt"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CAP_ROUND

-
#define GIMP_STOCK_CAP_ROUND                "gimp-cap-round"
+
#define GIMP_STOCK_CAP_ROUND                "gimp-cap-round"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CAP_SQUARE

-
#define GIMP_STOCK_CAP_SQUARE               "gimp-cap-square"
+
#define GIMP_STOCK_CAP_SQUARE               "gimp-cap-square"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_JOIN_MITER

-
#define GIMP_STOCK_JOIN_MITER               "gimp-join-miter"
+
#define GIMP_STOCK_JOIN_MITER               "gimp-join-miter"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_JOIN_ROUND

-
#define GIMP_STOCK_JOIN_ROUND               "gimp-join-round"
+
#define GIMP_STOCK_JOIN_ROUND               "gimp-join-round"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_JOIN_BEVEL

-
#define GIMP_STOCK_JOIN_BEVEL               "gimp-join-bevel"
+
#define GIMP_STOCK_JOIN_BEVEL               "gimp-join-bevel"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION

-
#define GIMP_STOCK_SELECTION                "gimp-selection"
+
#define GIMP_STOCK_SELECTION                "gimp-selection"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_ALL

-
#define GIMP_STOCK_SELECTION_ALL            "gimp-selection-all"
+
#define GIMP_STOCK_SELECTION_ALL            "gimp-selection-all"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_NONE

-
#define GIMP_STOCK_SELECTION_NONE           "gimp-selection-none"
+
#define GIMP_STOCK_SELECTION_NONE           "gimp-selection-none"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_GROW

-
#define GIMP_STOCK_SELECTION_GROW           "gimp-selection-grow"
+
#define GIMP_STOCK_SELECTION_GROW           "gimp-selection-grow"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_SHRINK

-
#define GIMP_STOCK_SELECTION_SHRINK         "gimp-selection-shrink"
+
#define GIMP_STOCK_SELECTION_SHRINK         "gimp-selection-shrink"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_BORDER

-
#define GIMP_STOCK_SELECTION_BORDER         "gimp-selection-border"
+
#define GIMP_STOCK_SELECTION_BORDER         "gimp-selection-border"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_ADD

-
#define GIMP_STOCK_SELECTION_ADD            "gimp-selection-add"
+
#define GIMP_STOCK_SELECTION_ADD            "gimp-selection-add"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_SUBTRACT

-
#define GIMP_STOCK_SELECTION_SUBTRACT       "gimp-selection-subtract"
+
#define GIMP_STOCK_SELECTION_SUBTRACT       "gimp-selection-subtract"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_REPLACE

-
#define GIMP_STOCK_SELECTION_REPLACE        "gimp-selection-replace"
+
#define GIMP_STOCK_SELECTION_REPLACE        "gimp-selection-replace"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_INTERSECT

-
#define GIMP_STOCK_SELECTION_INTERSECT      "gimp-selection-intersect"
+
#define GIMP_STOCK_SELECTION_INTERSECT      "gimp-selection-intersect"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_STROKE

-
#define GIMP_STOCK_SELECTION_STROKE         "gimp-selection-stroke"
+
#define GIMP_STOCK_SELECTION_STROKE         "gimp-selection-stroke"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_TO_CHANNEL

-
#define GIMP_STOCK_SELECTION_TO_CHANNEL     "gimp-selection-to-channel"
+
#define GIMP_STOCK_SELECTION_TO_CHANNEL     "gimp-selection-to-channel"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SELECTION_TO_PATH

-
#define GIMP_STOCK_SELECTION_TO_PATH        "gimp-selection-to-path"
+
#define GIMP_STOCK_SELECTION_TO_PATH        "gimp-selection-to-path"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_LINEAR

-
#define GIMP_STOCK_GRADIENT_LINEAR               "gimp-gradient-linear"
+
#define GIMP_STOCK_GRADIENT_LINEAR               "gimp-gradient-linear"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_BILINEAR

-
#define GIMP_STOCK_GRADIENT_BILINEAR             "gimp-gradient-bilinear"
+
#define GIMP_STOCK_GRADIENT_BILINEAR             "gimp-gradient-bilinear"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_RADIAL

-
#define GIMP_STOCK_GRADIENT_RADIAL               "gimp-gradient-radial"
+
#define GIMP_STOCK_GRADIENT_RADIAL               "gimp-gradient-radial"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SQUARE

-
#define GIMP_STOCK_GRADIENT_SQUARE               "gimp-gradient-square"
+
#define GIMP_STOCK_GRADIENT_SQUARE               "gimp-gradient-square"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC

-
#define GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC    "gimp-gradient-conical-symmetric"
+
#define GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC    "gimp-gradient-conical-symmetric"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC

-
#define GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC   "gimp-gradient-conical-asymmetric"
+
#define GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC   "gimp-gradient-conical-asymmetric"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
+
#define GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR   "gimp-gradient-shapeburst-angular"
+
#define GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR   "gimp-gradient-shapeburst-angular"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED   "gimp-gradient-shapeburst-dimpled"
+
#define GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED   "gimp-gradient-shapeburst-dimpled"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE

-
#define GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE     "gimp-gradient-spiral-clockwise"
+
#define GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE     "gimp-gradient-spiral-clockwise"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE

-
#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
+
#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_NORTH_WEST

-
#define GIMP_STOCK_GRAVITY_NORTH_WEST       "gimp-gravity-north-west"
+
#define GIMP_STOCK_GRAVITY_NORTH_WEST       "gimp-gravity-north-west"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_NORTH

-
#define GIMP_STOCK_GRAVITY_NORTH            "gimp-gravity-north"
+
#define GIMP_STOCK_GRAVITY_NORTH            "gimp-gravity-north"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_NORTH_EAST

-
#define GIMP_STOCK_GRAVITY_NORTH_EAST       "gimp-gravity-north-east"
+
#define GIMP_STOCK_GRAVITY_NORTH_EAST       "gimp-gravity-north-east"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_WEST

-
#define GIMP_STOCK_GRAVITY_WEST             "gimp-gravity-west"
+
#define GIMP_STOCK_GRAVITY_WEST             "gimp-gravity-west"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_EAST

-
#define GIMP_STOCK_GRAVITY_EAST             "gimp-gravity-east"
+
#define GIMP_STOCK_GRAVITY_EAST             "gimp-gravity-east"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_SOUTH_WEST

-
#define GIMP_STOCK_GRAVITY_SOUTH_WEST       "gimp-gravity-south-west"
+
#define GIMP_STOCK_GRAVITY_SOUTH_WEST       "gimp-gravity-south-west"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_SOUTH

-
#define GIMP_STOCK_GRAVITY_SOUTH            "gimp-gravity-south"
+
#define GIMP_STOCK_GRAVITY_SOUTH            "gimp-gravity-south"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_GRAVITY_SOUTH_EAST

-
#define GIMP_STOCK_GRAVITY_SOUTH_EAST       "gimp-gravity-south-east"
+
#define GIMP_STOCK_GRAVITY_SOUTH_EAST       "gimp-gravity-south-east"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CHAR_PICKER

-
#define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
+
#define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_LETTER_SPACING

-
#define GIMP_STOCK_LETTER_SPACING           "gimp-letter-spacing"
+
#define GIMP_STOCK_LETTER_SPACING           "gimp-letter-spacing"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_LINE_SPACING

-
#define GIMP_STOCK_LINE_SPACING             "gimp-line-spacing"
+
#define GIMP_STOCK_LINE_SPACING             "gimp-line-spacing"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_TEXT_DIR_LTR

-
#define GIMP_STOCK_TEXT_DIR_LTR             "gimp-text-dir-ltr"
+
#define GIMP_STOCK_TEXT_DIR_LTR             "gimp-text-dir-ltr"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_TEXT_DIR_RTL

-
#define GIMP_STOCK_TEXT_DIR_RTL             "gimp-text-dir-rtl"
+
#define GIMP_STOCK_TEXT_DIR_RTL             "gimp-text-dir-rtl"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_PRINT_RESOLUTION

-
#define GIMP_STOCK_PRINT_RESOLUTION         "gimp-print-resolution"
+
#define GIMP_STOCK_PRINT_RESOLUTION         "gimp-print-resolution"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOLS

-
#define GIMP_STOCK_TOOLS                    "gimp-tools"
+
#define GIMP_STOCK_TOOLS                    "gimp-tools"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_OPTIONS

-
#define GIMP_STOCK_TOOL_OPTIONS             "gimp-tool-options"
+
#define GIMP_STOCK_TOOL_OPTIONS             "gimp-tool-options"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_DEVICE_STATUS

-
#define GIMP_STOCK_DEVICE_STATUS            "gimp-device-status"
+
#define GIMP_STOCK_DEVICE_STATUS            "gimp-device-status"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_DISPLAY_FILTER

-
#define GIMP_STOCK_DISPLAY_FILTER           "gimp-display-filter"
+
#define GIMP_STOCK_DISPLAY_FILTER           "gimp-display-filter"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_CURVE_FREE

-
#define GIMP_STOCK_CURVE_FREE               "gimp-curve-free"
+
#define GIMP_STOCK_CURVE_FREE               "gimp-curve-free"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CURVE_SMOOTH

-
#define GIMP_STOCK_CURVE_SMOOTH             "gimp-curve-smooth"
+
#define GIMP_STOCK_CURVE_SMOOTH             "gimp-curve-smooth"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_COLOR_PICKER_BLACK

-
#define GIMP_STOCK_COLOR_PICKER_BLACK       "gimp-color-picker-black"
+
#define GIMP_STOCK_COLOR_PICKER_BLACK       "gimp-color-picker-black"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_COLOR_PICKER_GRAY

-
#define GIMP_STOCK_COLOR_PICKER_GRAY        "gimp-color-picker-gray"
+
#define GIMP_STOCK_COLOR_PICKER_GRAY        "gimp-color-picker-gray"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_COLOR_PICKER_WHITE

-
#define GIMP_STOCK_COLOR_PICKER_WHITE       "gimp-color-picker-white"
+
#define GIMP_STOCK_COLOR_PICKER_WHITE       "gimp-color-picker-white"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_COLOR_TRIANGLE

-
#define GIMP_STOCK_COLOR_TRIANGLE           "gimp-color-triangle"
+
#define GIMP_STOCK_COLOR_TRIANGLE           "gimp-color-triangle"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_COLOR_PICK_FROM_SCREEN

-
#define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
+
#define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CONVERT_GRAYSCALE

-
#define GIMP_STOCK_CONVERT_GRAYSCALE        "gimp-convert-grayscale"
+
#define GIMP_STOCK_CONVERT_GRAYSCALE        "gimp-convert-grayscale"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CONVERT_INDEXED

-
#define GIMP_STOCK_CONVERT_INDEXED          "gimp-convert-indexed"
+
#define GIMP_STOCK_CONVERT_INDEXED          "gimp-convert-indexed"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_CONVERT_RGB

-
#define GIMP_STOCK_CONVERT_RGB              "gimp-convert-rgb"
+
#define GIMP_STOCK_CONVERT_RGB              "gimp-convert-rgb"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_TRANSPARENCY

-
#define GIMP_STOCK_TRANSPARENCY             "gimp-transparency"
+
#define GIMP_STOCK_TRANSPARENCY             "gimp-transparency"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_DEFAULT_COLORS

-
#define GIMP_STOCK_DEFAULT_COLORS           "gimp-default-colors"
+
#define GIMP_STOCK_DEFAULT_COLORS           "gimp-default-colors"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_SWAP_COLORS

-
#define GIMP_STOCK_SWAP_COLORS              "gimp-swap-colors"
+
#define GIMP_STOCK_SWAP_COLORS              "gimp-swap-colors"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_UNDO_HISTORY

-
#define GIMP_STOCK_UNDO_HISTORY             "gimp-undo-history"
+
#define GIMP_STOCK_UNDO_HISTORY             "gimp-undo-history"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_AIRBRUSH

-
#define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
+
#define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_BLEND

-
#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
+
#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_BLUR

-
#define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
+
#define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST

-
#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
+
#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_BUCKET_FILL

-
#define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
+
#define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_BY_COLOR_SELECT

-
#define GIMP_STOCK_TOOL_BY_COLOR_SELECT     "gimp-tool-by-color-select"
+
#define GIMP_STOCK_TOOL_BY_COLOR_SELECT     "gimp-tool-by-color-select"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_CLONE

-
#define GIMP_STOCK_TOOL_CLONE               "gimp-tool-clone"
+
#define GIMP_STOCK_TOOL_CLONE               "gimp-tool-clone"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_COLOR_BALANCE

-
#define GIMP_STOCK_TOOL_COLOR_BALANCE       "gimp-tool-color-balance"
+
#define GIMP_STOCK_TOOL_COLOR_BALANCE       "gimp-tool-color-balance"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_COLOR_PICKER

-
#define GIMP_STOCK_TOOL_COLOR_PICKER        "gimp-tool-color-picker"
+
#define GIMP_STOCK_TOOL_COLOR_PICKER        "gimp-tool-color-picker"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_COLORIZE

-
#define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
+
#define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_CROP

-
#define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
+
#define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_CURVES

-
#define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
+
#define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_DODGE

-
#define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
+
#define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_ELLIPSE_SELECT

-
#define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
+
#define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_ERASER

-
#define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
+
#define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_FLIP

-
#define GIMP_STOCK_TOOL_FLIP                "gimp-tool-flip"
+
#define GIMP_STOCK_TOOL_FLIP                "gimp-tool-flip"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_FREE_SELECT

-
#define GIMP_STOCK_TOOL_FREE_SELECT         "gimp-tool-free-select"
+
#define GIMP_STOCK_TOOL_FREE_SELECT         "gimp-tool-free-select"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_FUZZY_SELECT

-
#define GIMP_STOCK_TOOL_FUZZY_SELECT        "gimp-tool-fuzzy-select"
+
#define GIMP_STOCK_TOOL_FUZZY_SELECT        "gimp-tool-fuzzy-select"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_HUE_SATURATION

-
#define GIMP_STOCK_TOOL_HUE_SATURATION      "gimp-tool-hue-saturation"
+
#define GIMP_STOCK_TOOL_HUE_SATURATION      "gimp-tool-hue-saturation"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_INK

-
#define GIMP_STOCK_TOOL_INK                 "gimp-tool-ink"
+
#define GIMP_STOCK_TOOL_INK                 "gimp-tool-ink"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_ISCISSORS

-
#define GIMP_STOCK_TOOL_ISCISSORS           "gimp-tool-iscissors"
+
#define GIMP_STOCK_TOOL_ISCISSORS           "gimp-tool-iscissors"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_LEVELS

-
#define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
+
#define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_MEASURE

-
#define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
+
#define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_MOVE

-
#define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
+
#define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_PAINTBRUSH

-
#define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
+
#define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_PATH

-
#define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
+
#define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_PENCIL

-
#define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
+
#define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_PERSPECTIVE

-
#define GIMP_STOCK_TOOL_PERSPECTIVE         "gimp-tool-perspective"
+
#define GIMP_STOCK_TOOL_PERSPECTIVE         "gimp-tool-perspective"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_POSTERIZE

-
#define GIMP_STOCK_TOOL_POSTERIZE           "gimp-tool-posterize"
+
#define GIMP_STOCK_TOOL_POSTERIZE           "gimp-tool-posterize"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_RECT_SELECT

-
#define GIMP_STOCK_TOOL_RECT_SELECT         "gimp-tool-rect-select"
+
#define GIMP_STOCK_TOOL_RECT_SELECT         "gimp-tool-rect-select"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_ROTATE

-
#define GIMP_STOCK_TOOL_ROTATE              "gimp-tool-rotate"
+
#define GIMP_STOCK_TOOL_ROTATE              "gimp-tool-rotate"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_SCALE

-
#define GIMP_STOCK_TOOL_SCALE               "gimp-tool-scale"
+
#define GIMP_STOCK_TOOL_SCALE               "gimp-tool-scale"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_SHEAR

-
#define GIMP_STOCK_TOOL_SHEAR               "gimp-tool-shear"
+
#define GIMP_STOCK_TOOL_SHEAR               "gimp-tool-shear"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_SMUDGE

-
#define GIMP_STOCK_TOOL_SMUDGE              "gimp-tool-smudge"
+
#define GIMP_STOCK_TOOL_SMUDGE              "gimp-tool-smudge"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_TEXT

-
#define GIMP_STOCK_TOOL_TEXT                "gimp-tool-text"
+
#define GIMP_STOCK_TOOL_TEXT                "gimp-tool-text"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_THRESHOLD

-
#define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
+
#define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_TOOL_ZOOM

-
#define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
+
#define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_HCHAIN

-
#define GIMP_STOCK_HCHAIN                   "gimp-hchain"
+
#define GIMP_STOCK_HCHAIN                   "gimp-hchain"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_HCHAIN_BROKEN

-
#define GIMP_STOCK_HCHAIN_BROKEN            "gimp-hchain-broken"
+
#define GIMP_STOCK_HCHAIN_BROKEN            "gimp-hchain-broken"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_VCHAIN

-
#define GIMP_STOCK_VCHAIN                   "gimp-vchain"
+
#define GIMP_STOCK_VCHAIN                   "gimp-vchain"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_VCHAIN_BROKEN

-
#define GIMP_STOCK_VCHAIN_BROKEN            "gimp-vchain-broken"
+
#define GIMP_STOCK_VCHAIN_BROKEN            "gimp-vchain-broken"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_TEXTURE

-
#define GIMP_STOCK_TEXTURE                  "gimp-texture"
+
#define GIMP_STOCK_TEXTURE                  "gimp-texture"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_FRAME

-
#define GIMP_STOCK_FRAME                    "gimp-frame"
+
#define GIMP_STOCK_FRAME                    "gimp-frame"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_ERROR

-
#define GIMP_STOCK_ERROR                    "gimp-error"
+
#define GIMP_STOCK_ERROR                    "gimp-error"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_INFO

-
#define GIMP_STOCK_INFO                     "gimp-info"
+
#define GIMP_STOCK_INFO                     "gimp-info"
 

 

-
-
-
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_QUESTION

-
#define GIMP_STOCK_QUESTION                 "gimp-question"
+
#define GIMP_STOCK_QUESTION                 "gimp-question"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_WARNING

-
#define GIMP_STOCK_WARNING                  "gimp-warning"
+
#define GIMP_STOCK_WARNING                  "gimp-warning"
 

 

-
-
-
+
+
+
 

 

 

 

-

+

 GIMP_STOCK_WILBER

-
#define GIMP_STOCK_WILBER                   "gimp-wilber"
+
#define GIMP_STOCK_WILBER                   "gimp-wilber"
 

 

-
-
+
+
 

 

 

 

-

+

 GIMP_STOCK_WILBER_EEK

-
#define GIMP_STOCK_WILBER_EEK               "gimp-wilber-eek"
+
#define GIMP_STOCK_WILBER_EEK               "gimp-wilber-eek"
 

 

-
+
 

 

 

 

-

+

 GIMP_STOCK_BRUSH

-
#define GIMP_STOCK_BRUSH                    GIMP_STOCK_TOOL_PAINTBRUSH
+
#define GIMP_STOCK_BRUSH                    GIMP_STOCK_TOOL_PAINTBRUSH
 

 

 
@@ -2077,9 +2083,9 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_BUFFER

-
#define GIMP_STOCK_BUFFER                   GTK_STOCK_PASTE
+
#define GIMP_STOCK_BUFFER                   GTK_STOCK_PASTE
 

 

 
@@ -2087,9 +2093,9 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_FONT

-
#define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
+
#define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
 

 

 
@@ -2097,9 +2103,9 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_GRADIENT

-
#define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
+
#define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
 

 

 
@@ -2107,9 +2113,9 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_PALETTE

-
#define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
+
#define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 

 

 
@@ -2117,9 +2123,9 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_PATTERN

-
#define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
+
#define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 

 

 
@@ -2127,19 +2133,15 @@ RTL variant
 

 

 

-

+

 GIMP_STOCK_ZOOM_FOLLOW_WINDOW

-
#define GIMP_STOCK_ZOOM_FOLLOW_WINDOW       "gimp-zoom-follow-window"
+
#define GIMP_STOCK_ZOOM_FOLLOW_WINDOW       "gimp-zoom-follow-window"
 

 

-
+
 

 

 

 

-
-
-
-
<< GimpSizeEntryGimpWidgets >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html~ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html~
deleted file mode 100644
index 6105008d0c..0000000000
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html~
+++ /dev/null
@@ -1,2145 +0,0 @@
-
-
-
-GimpStock
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
PrevUpHomeGIMP Widgets Library Reference ManualNext

-

-

-

-
-
-

-
GimpStock

-
GimpStock — Prebuilt common menu/toolbar items and corresponding icons

-

-

-
Synopsis

-
-
-
-
-void        gimp_stock_init                 (void);
-
-#define     GIMP_STOCK_ANCHOR
-#define     GIMP_STOCK_CENTER
-#define     GIMP_STOCK_DUPLICATE
-#define     GIMP_STOCK_EDIT
-#define     GIMP_STOCK_RESET
-#define     GIMP_STOCK_CLOSE
-#define     GIMP_STOCK_MENU_LEFT
-#define     GIMP_STOCK_MENU_RIGHT
-#define     GIMP_STOCK_MOVE_TO_SCREEN
-#define     GIMP_STOCK_INVERT
-#define     GIMP_STOCK_LAYER_TO_IMAGESIZE
-#define     GIMP_STOCK_MERGE_DOWN
-#define     GIMP_STOCK_NAVIGATION
-#define     GIMP_STOCK_PASTE_AS_NEW
-#define     GIMP_STOCK_PASTE_INTO
-#define     GIMP_STOCK_PATH_STROKE
-#define     GIMP_STOCK_PLUGIN
-#define     GIMP_STOCK_QMASK_OFF
-#define     GIMP_STOCK_QMASK_ON
-#define     GIMP_STOCK_HISTOGRAM
-#define     GIMP_STOCK_HISTOGRAM_LINEAR
-#define     GIMP_STOCK_HISTOGRAM_LOGARITHMIC
-#define     GIMP_STOCK_RESHOW_FILTER
-#define     GIMP_STOCK_RESIZE
-#define     GIMP_STOCK_FLIP_HORIZONTAL
-#define     GIMP_STOCK_FLIP_VERTICAL
-#define     GIMP_STOCK_ROTATE_180
-#define     GIMP_STOCK_ROTATE_270
-#define     GIMP_STOCK_ROTATE_90
-#define     GIMP_STOCK_SCALE
-#define     GIMP_STOCK_LINKED
-#define     GIMP_STOCK_VISIBLE
-#define     GIMP_STOCK_LIST
-#define     GIMP_STOCK_GRID
-#define     GIMP_STOCK_PORTRAIT
-#define     GIMP_STOCK_LANDSCAPE
-#define     GIMP_STOCK_VIDEO
-#define     GIMP_STOCK_WEB
-#define     GIMP_STOCK_IMAGE
-#define     GIMP_STOCK_LAYER
-#define     GIMP_STOCK_LAYER_MASK
-#define     GIMP_STOCK_CHANNEL
-#define     GIMP_STOCK_CHANNEL_RED
-#define     GIMP_STOCK_CHANNEL_GREEN
-#define     GIMP_STOCK_CHANNEL_BLUE
-#define     GIMP_STOCK_CHANNEL_GRAY
-#define     GIMP_STOCK_CHANNEL_INDEXED
-#define     GIMP_STOCK_CHANNEL_ALPHA
-#define     GIMP_STOCK_PATH
-#define     GIMP_STOCK_TEXT_LAYER
-#define     GIMP_STOCK_FLOATING_SELECTION
-#define     GIMP_STOCK_TEMPLATE
-#define     GIMP_STOCK_IMAGES
-#define     GIMP_STOCK_LAYERS
-#define     GIMP_STOCK_CHANNELS
-#define     GIMP_STOCK_PATHS
-#define     GIMP_STOCK_INDEXED_PALETTE
-#define     GIMP_STOCK_SHAPE_CIRCLE
-#define     GIMP_STOCK_SHAPE_SQUARE
-#define     GIMP_STOCK_SHAPE_DIAMOND
-#define     GIMP_STOCK_CAP_BUTT
-#define     GIMP_STOCK_CAP_ROUND
-#define     GIMP_STOCK_CAP_SQUARE
-#define     GIMP_STOCK_JOIN_MITER
-#define     GIMP_STOCK_JOIN_ROUND
-#define     GIMP_STOCK_JOIN_BEVEL
-#define     GIMP_STOCK_SELECTION
-#define     GIMP_STOCK_SELECTION_ALL
-#define     GIMP_STOCK_SELECTION_NONE
-#define     GIMP_STOCK_SELECTION_GROW
-#define     GIMP_STOCK_SELECTION_SHRINK
-#define     GIMP_STOCK_SELECTION_BORDER
-#define     GIMP_STOCK_SELECTION_ADD
-#define     GIMP_STOCK_SELECTION_SUBTRACT
-#define     GIMP_STOCK_SELECTION_REPLACE
-#define     GIMP_STOCK_SELECTION_INTERSECT
-#define     GIMP_STOCK_SELECTION_STROKE
-#define     GIMP_STOCK_SELECTION_TO_CHANNEL
-#define     GIMP_STOCK_SELECTION_TO_PATH
-#define     GIMP_STOCK_GRADIENT_LINEAR
-#define     GIMP_STOCK_GRADIENT_BILINEAR
-#define     GIMP_STOCK_GRADIENT_RADIAL
-#define     GIMP_STOCK_GRADIENT_SQUARE
-#define     GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC
-#define     GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC
-#define     GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL
-#define     GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR
-#define     GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED
-#define     GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE
-#define     GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE
-#define     GIMP_STOCK_GRAVITY_NORTH_WEST
-#define     GIMP_STOCK_GRAVITY_NORTH
-#define     GIMP_STOCK_GRAVITY_NORTH_EAST
-#define     GIMP_STOCK_GRAVITY_WEST
-#define     GIMP_STOCK_GRAVITY_EAST
-#define     GIMP_STOCK_GRAVITY_SOUTH_WEST
-#define     GIMP_STOCK_GRAVITY_SOUTH
-#define     GIMP_STOCK_GRAVITY_SOUTH_EAST
-#define     GIMP_STOCK_CHAR_PICKER
-#define     GIMP_STOCK_LETTER_SPACING
-#define     GIMP_STOCK_LINE_SPACING
-#define     GIMP_STOCK_TEXT_DIR_LTR
-#define     GIMP_STOCK_TEXT_DIR_RTL
-#define     GIMP_STOCK_PRINT_RESOLUTION
-#define     GIMP_STOCK_TOOLS
-#define     GIMP_STOCK_TOOL_OPTIONS
-#define     GIMP_STOCK_DEVICE_STATUS
-#define     GIMP_STOCK_DISPLAY_FILTER
-#define     GIMP_STOCK_CURVE_FREE
-#define     GIMP_STOCK_CURVE_SMOOTH
-#define     GIMP_STOCK_COLOR_PICKER_BLACK
-#define     GIMP_STOCK_COLOR_PICKER_GRAY
-#define     GIMP_STOCK_COLOR_PICKER_WHITE
-#define     GIMP_STOCK_COLOR_TRIANGLE
-#define     GIMP_STOCK_COLOR_PICK_FROM_SCREEN
-#define     GIMP_STOCK_CONVERT_GRAYSCALE
-#define     GIMP_STOCK_CONVERT_INDEXED
-#define     GIMP_STOCK_CONVERT_RGB
-#define     GIMP_STOCK_TRANSPARENCY
-#define     GIMP_STOCK_DEFAULT_COLORS
-#define     GIMP_STOCK_SWAP_COLORS
-#define     GIMP_STOCK_UNDO_HISTORY
-#define     GIMP_STOCK_TOOL_AIRBRUSH
-#define     GIMP_STOCK_TOOL_BLEND
-#define     GIMP_STOCK_TOOL_BLUR
-#define     GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST
-#define     GIMP_STOCK_TOOL_BUCKET_FILL
-#define     GIMP_STOCK_TOOL_BY_COLOR_SELECT
-#define     GIMP_STOCK_TOOL_CLONE
-#define     GIMP_STOCK_TOOL_COLOR_BALANCE
-#define     GIMP_STOCK_TOOL_COLOR_PICKER
-#define     GIMP_STOCK_TOOL_COLORIZE
-#define     GIMP_STOCK_TOOL_CROP
-#define     GIMP_STOCK_TOOL_CURVES
-#define     GIMP_STOCK_TOOL_DODGE
-#define     GIMP_STOCK_TOOL_ELLIPSE_SELECT
-#define     GIMP_STOCK_TOOL_ERASER
-#define     GIMP_STOCK_TOOL_FLIP
-#define     GIMP_STOCK_TOOL_FREE_SELECT
-#define     GIMP_STOCK_TOOL_FUZZY_SELECT
-#define     GIMP_STOCK_TOOL_HUE_SATURATION
-#define     GIMP_STOCK_TOOL_INK
-#define     GIMP_STOCK_TOOL_ISCISSORS
-#define     GIMP_STOCK_TOOL_LEVELS
-#define     GIMP_STOCK_TOOL_MEASURE
-#define     GIMP_STOCK_TOOL_MOVE
-#define     GIMP_STOCK_TOOL_PAINTBRUSH
-#define     GIMP_STOCK_TOOL_PATH
-#define     GIMP_STOCK_TOOL_PENCIL
-#define     GIMP_STOCK_TOOL_PERSPECTIVE
-#define     GIMP_STOCK_TOOL_POSTERIZE
-#define     GIMP_STOCK_TOOL_RECT_SELECT
-#define     GIMP_STOCK_TOOL_ROTATE
-#define     GIMP_STOCK_TOOL_SCALE
-#define     GIMP_STOCK_TOOL_SHEAR
-#define     GIMP_STOCK_TOOL_SMUDGE
-#define     GIMP_STOCK_TOOL_TEXT
-#define     GIMP_STOCK_TOOL_THRESHOLD
-#define     GIMP_STOCK_TOOL_ZOOM
-#define     GIMP_STOCK_HCHAIN
-#define     GIMP_STOCK_HCHAIN_BROKEN
-#define     GIMP_STOCK_VCHAIN
-#define     GIMP_STOCK_VCHAIN_BROKEN
-#define     GIMP_STOCK_TEXTURE
-#define     GIMP_STOCK_FRAME
-#define     GIMP_STOCK_ERROR
-#define     GIMP_STOCK_INFO
-#define     GIMP_STOCK_QUESTION
-#define     GIMP_STOCK_WARNING
-#define     GIMP_STOCK_WILBER
-#define     GIMP_STOCK_WILBER_EEK
-#define     GIMP_STOCK_BRUSH
-#define     GIMP_STOCK_BUFFER
-#define     GIMP_STOCK_FONT
-#define     GIMP_STOCK_GRADIENT
-#define     GIMP_STOCK_PALETTE
-#define     GIMP_STOCK_PATTERN
-#define     GIMP_STOCK_ZOOM_FOLLOW_WINDOW
-

-

-

-
Description

-

-GIMP registers a set of menu/toolbar items and corresponding icons in
-addition to the standard GTK+ stock items. These can be used just like
-GTK+ stock items. GIMP also overrides a few of the GTK+ icons (namely
-the ones in dialog size).
-

-

-Stock icons may have a RTL variant which gets used for right-to-left
-locales.
-

-

-

-
Details

-

-

-gimp_stock_init ()

-
void        gimp_stock_init                 (void);

-

-Initializes the GIMP stock icon factory.
-

-

-You don't need to call this function as gimp_ui_init() already does
-this for you.

-

-
-

-

-

-

-

-GIMP_STOCK_ANCHOR

-
#define GIMP_STOCK_ANCHOR                   "gimp-anchor"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CENTER

-
#define GIMP_STOCK_CENTER                   "gimp-center"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_DUPLICATE

-
#define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
-

-

-
-

-

-

-

-

-GIMP_STOCK_EDIT

-
#define GIMP_STOCK_EDIT                     "gimp-edit"
-

-

-
-

-

-

-

-

-GIMP_STOCK_RESET

-
#define GIMP_STOCK_RESET                    "gimp-reset"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CLOSE

-
#define GIMP_STOCK_CLOSE                    "gimp-close"
-

-

-
-

-

-

-

-

-GIMP_STOCK_MENU_LEFT

-
#define GIMP_STOCK_MENU_LEFT                "gimp-menu-left"
-

-

-
-RTL variant
-
-

-

-

-

-

-GIMP_STOCK_MENU_RIGHT

-
#define GIMP_STOCK_MENU_RIGHT               "gimp-menu-right"
-

-

-
-RTL variant
-
-

-

-

-

-

-GIMP_STOCK_MOVE_TO_SCREEN

-
#define GIMP_STOCK_MOVE_TO_SCREEN           "gimp_move-to-screen"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_INVERT

-
#define GIMP_STOCK_INVERT                   "gimp-invert"
-

-

-
-

-

-

-

-

-GIMP_STOCK_LAYER_TO_IMAGESIZE

-
#define GIMP_STOCK_LAYER_TO_IMAGESIZE       "gimp-layer-to-imagesize"
-

-

-
-

-

-

-

-

-GIMP_STOCK_MERGE_DOWN

-
#define GIMP_STOCK_MERGE_DOWN               "gimp-merge-down"
-

-

-
-

-

-

-

-

-GIMP_STOCK_NAVIGATION

-
#define GIMP_STOCK_NAVIGATION               "gimp-navigation"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PASTE_AS_NEW

-
#define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PASTE_INTO

-
#define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PATH_STROKE

-
#define GIMP_STOCK_PATH_STROKE              "gimp-path-stroke"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PLUGIN

-
#define GIMP_STOCK_PLUGIN                   "gimp-plugin"
-

-

-
-

-

-

-

-

-GIMP_STOCK_QMASK_OFF

-
#define GIMP_STOCK_QMASK_OFF                "gimp-qmask-off"
-

-

-
-

-

-

-

-

-GIMP_STOCK_QMASK_ON

-
#define GIMP_STOCK_QMASK_ON                 "gimp-qmask-on"
-

-

-
-

-

-

-

-

-GIMP_STOCK_HISTOGRAM

-
#define GIMP_STOCK_HISTOGRAM                "gimp-histogram"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_HISTOGRAM_LINEAR

-
#define GIMP_STOCK_HISTOGRAM_LINEAR         "gimp-histogram-linear"
-

-

-
-

-

-

-

-

-GIMP_STOCK_HISTOGRAM_LOGARITHMIC

-
#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC    "gimp-histogram-logarithmic"
-

-

-
-

-

-

-

-

-GIMP_STOCK_RESHOW_FILTER

-
#define GIMP_STOCK_RESHOW_FILTER            "gimp-reshow-filter"
-

-

-
-

-

-

-

-

-GIMP_STOCK_RESIZE

-
#define GIMP_STOCK_RESIZE                   "gimp-resize"
-

-

-
-

-

-

-

-

-GIMP_STOCK_FLIP_HORIZONTAL

-
#define GIMP_STOCK_FLIP_HORIZONTAL          "gimp-flip-horizontal"
-

-

-
-

-

-

-

-

-GIMP_STOCK_FLIP_VERTICAL

-
#define GIMP_STOCK_FLIP_VERTICAL            "gimp-flip-vertical"
-

-

-
-

-

-

-

-

-GIMP_STOCK_ROTATE_180

-
#define GIMP_STOCK_ROTATE_180               "gimp-rotate-180"
-

-

-
-

-

-

-

-

-GIMP_STOCK_ROTATE_270

-
#define GIMP_STOCK_ROTATE_270               "gimp-rotate-270"
-

-

-
-

-

-

-

-

-GIMP_STOCK_ROTATE_90

-
#define GIMP_STOCK_ROTATE_90                "gimp-rotate-90"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SCALE

-
#define GIMP_STOCK_SCALE                    "gimp-scale"
-

-

-
-

-

-

-

-

-GIMP_STOCK_LINKED

-
#define GIMP_STOCK_LINKED                   "gimp-linked"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_VISIBLE

-
#define GIMP_STOCK_VISIBLE                  "gimp-visible"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_LIST

-
#define GIMP_STOCK_LIST                     "gimp-list"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRID

-
#define GIMP_STOCK_GRID                     "gimp-grid"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PORTRAIT

-
#define GIMP_STOCK_PORTRAIT                 "gimp-portrait"
-

-

-
-

-

-

-

-

-GIMP_STOCK_LANDSCAPE

-
#define GIMP_STOCK_LANDSCAPE                "gimp-landscape"
-

-

-
-

-

-

-

-

-GIMP_STOCK_VIDEO

-
#define GIMP_STOCK_VIDEO                    "gimp-video"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_WEB

-
#define GIMP_STOCK_WEB                      "gimp-web"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_IMAGE

-
#define GIMP_STOCK_IMAGE                    "gimp-image"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_LAYER

-
#define GIMP_STOCK_LAYER                    "gimp-layer"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_LAYER_MASK

-
#define GIMP_STOCK_LAYER_MASK               "gimp-layer-mask"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL

-
#define GIMP_STOCK_CHANNEL                  "gimp-channel"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_RED

-
#define GIMP_STOCK_CHANNEL_RED              "gimp-channel-red"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_GREEN

-
#define GIMP_STOCK_CHANNEL_GREEN            "gimp-channel-green"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_BLUE

-
#define GIMP_STOCK_CHANNEL_BLUE             "gimp-channel-blue"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_GRAY

-
#define GIMP_STOCK_CHANNEL_GRAY             "gimp-channel-gray"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_INDEXED

-
#define GIMP_STOCK_CHANNEL_INDEXED          "gimp-channel-indexed"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_CHANNEL_ALPHA

-
#define GIMP_STOCK_CHANNEL_ALPHA            "gimp-channel-alpha"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_PATH

-
#define GIMP_STOCK_PATH                     "gimp-path"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TEXT_LAYER

-
#define GIMP_STOCK_TEXT_LAYER               "gimp-text-layer"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_FLOATING_SELECTION

-
#define GIMP_STOCK_FLOATING_SELECTION       "gimp-floating-selection"
-

-

-
-
-
-
-

-

-

-

-

-GIMP_STOCK_TEMPLATE

-
#define GIMP_STOCK_TEMPLATE                 "gimp-template"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_IMAGES

-
#define GIMP_STOCK_IMAGES                   "gimp-images"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_LAYERS

-
#define GIMP_STOCK_LAYERS                   "gimp-layers"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_CHANNELS

-
#define GIMP_STOCK_CHANNELS                 "gimp-channels"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_PATHS

-
#define GIMP_STOCK_PATHS                    "gimp-paths"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_INDEXED_PALETTE

-
#define GIMP_STOCK_INDEXED_PALETTE          "gimp-indexed-palette"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_SHAPE_CIRCLE

-
#define GIMP_STOCK_SHAPE_CIRCLE             "gimp-shape-circle"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SHAPE_SQUARE

-
#define GIMP_STOCK_SHAPE_SQUARE             "gimp-shape-square"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SHAPE_DIAMOND

-
#define GIMP_STOCK_SHAPE_DIAMOND            "gimp-shape-diamond"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CAP_BUTT

-
#define GIMP_STOCK_CAP_BUTT                 "gimp-cap-butt"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CAP_ROUND

-
#define GIMP_STOCK_CAP_ROUND                "gimp-cap-round"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CAP_SQUARE

-
#define GIMP_STOCK_CAP_SQUARE               "gimp-cap-square"
-

-

-
-

-

-

-

-

-GIMP_STOCK_JOIN_MITER

-
#define GIMP_STOCK_JOIN_MITER               "gimp-join-miter"
-

-

-
-

-

-

-

-

-GIMP_STOCK_JOIN_ROUND

-
#define GIMP_STOCK_JOIN_ROUND               "gimp-join-round"
-

-

-
-

-

-

-

-

-GIMP_STOCK_JOIN_BEVEL

-
#define GIMP_STOCK_JOIN_BEVEL               "gimp-join-bevel"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION

-
#define GIMP_STOCK_SELECTION                "gimp-selection"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_ALL

-
#define GIMP_STOCK_SELECTION_ALL            "gimp-selection-all"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_NONE

-
#define GIMP_STOCK_SELECTION_NONE           "gimp-selection-none"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_GROW

-
#define GIMP_STOCK_SELECTION_GROW           "gimp-selection-grow"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_SHRINK

-
#define GIMP_STOCK_SELECTION_SHRINK         "gimp-selection-shrink"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_BORDER

-
#define GIMP_STOCK_SELECTION_BORDER         "gimp-selection-border"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_ADD

-
#define GIMP_STOCK_SELECTION_ADD            "gimp-selection-add"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_SUBTRACT

-
#define GIMP_STOCK_SELECTION_SUBTRACT       "gimp-selection-subtract"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_REPLACE

-
#define GIMP_STOCK_SELECTION_REPLACE        "gimp-selection-replace"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_INTERSECT

-
#define GIMP_STOCK_SELECTION_INTERSECT      "gimp-selection-intersect"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_STROKE

-
#define GIMP_STOCK_SELECTION_STROKE         "gimp-selection-stroke"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_TO_CHANNEL

-
#define GIMP_STOCK_SELECTION_TO_CHANNEL     "gimp-selection-to-channel"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SELECTION_TO_PATH

-
#define GIMP_STOCK_SELECTION_TO_PATH        "gimp-selection-to-path"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_LINEAR

-
#define GIMP_STOCK_GRADIENT_LINEAR               "gimp-gradient-linear"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_BILINEAR

-
#define GIMP_STOCK_GRADIENT_BILINEAR             "gimp-gradient-bilinear"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_RADIAL

-
#define GIMP_STOCK_GRADIENT_RADIAL               "gimp-gradient-radial"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SQUARE

-
#define GIMP_STOCK_GRADIENT_SQUARE               "gimp-gradient-square"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC

-
#define GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC    "gimp-gradient-conical-symmetric"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC

-
#define GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC   "gimp-gradient-conical-asymmetric"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR   "gimp-gradient-shapeburst-angular"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED

-
#define GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED   "gimp-gradient-shapeburst-dimpled"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE

-
#define GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE     "gimp-gradient-spiral-clockwise"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE

-
#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_NORTH_WEST

-
#define GIMP_STOCK_GRAVITY_NORTH_WEST       "gimp-gravity-north-west"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_NORTH

-
#define GIMP_STOCK_GRAVITY_NORTH            "gimp-gravity-north"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_NORTH_EAST

-
#define GIMP_STOCK_GRAVITY_NORTH_EAST       "gimp-gravity-north-east"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_WEST

-
#define GIMP_STOCK_GRAVITY_WEST             "gimp-gravity-west"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_EAST

-
#define GIMP_STOCK_GRAVITY_EAST             "gimp-gravity-east"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_SOUTH_WEST

-
#define GIMP_STOCK_GRAVITY_SOUTH_WEST       "gimp-gravity-south-west"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_SOUTH

-
#define GIMP_STOCK_GRAVITY_SOUTH            "gimp-gravity-south"
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRAVITY_SOUTH_EAST

-
#define GIMP_STOCK_GRAVITY_SOUTH_EAST       "gimp-gravity-south-east"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CHAR_PICKER

-
#define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
-

-

-
-

-

-

-

-

-GIMP_STOCK_LETTER_SPACING

-
#define GIMP_STOCK_LETTER_SPACING           "gimp-letter-spacing"
-

-

-
-

-

-

-

-

-GIMP_STOCK_LINE_SPACING

-
#define GIMP_STOCK_LINE_SPACING             "gimp-line-spacing"
-

-

-
-

-

-

-

-

-GIMP_STOCK_TEXT_DIR_LTR

-
#define GIMP_STOCK_TEXT_DIR_LTR             "gimp-text-dir-ltr"
-

-

-
-

-

-

-

-

-GIMP_STOCK_TEXT_DIR_RTL

-
#define GIMP_STOCK_TEXT_DIR_RTL             "gimp-text-dir-rtl"
-

-

-
-

-

-

-

-

-GIMP_STOCK_PRINT_RESOLUTION

-
#define GIMP_STOCK_PRINT_RESOLUTION         "gimp-print-resolution"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOLS

-
#define GIMP_STOCK_TOOLS                    "gimp-tools"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_OPTIONS

-
#define GIMP_STOCK_TOOL_OPTIONS             "gimp-tool-options"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_DEVICE_STATUS

-
#define GIMP_STOCK_DEVICE_STATUS            "gimp-device-status"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_DISPLAY_FILTER

-
#define GIMP_STOCK_DISPLAY_FILTER           "gimp-display-filter"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_CURVE_FREE

-
#define GIMP_STOCK_CURVE_FREE               "gimp-curve-free"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CURVE_SMOOTH

-
#define GIMP_STOCK_CURVE_SMOOTH             "gimp-curve-smooth"
-

-

-
-

-

-

-

-

-GIMP_STOCK_COLOR_PICKER_BLACK

-
#define GIMP_STOCK_COLOR_PICKER_BLACK       "gimp-color-picker-black"
-

-

-
-

-

-

-

-

-GIMP_STOCK_COLOR_PICKER_GRAY

-
#define GIMP_STOCK_COLOR_PICKER_GRAY        "gimp-color-picker-gray"
-

-

-
-

-

-

-

-

-GIMP_STOCK_COLOR_PICKER_WHITE

-
#define GIMP_STOCK_COLOR_PICKER_WHITE       "gimp-color-picker-white"
-

-

-
-

-

-

-

-

-GIMP_STOCK_COLOR_TRIANGLE

-
#define GIMP_STOCK_COLOR_TRIANGLE           "gimp-color-triangle"
-

-

-
-

-

-

-

-

-GIMP_STOCK_COLOR_PICK_FROM_SCREEN

-
#define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CONVERT_GRAYSCALE

-
#define GIMP_STOCK_CONVERT_GRAYSCALE        "gimp-convert-grayscale"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CONVERT_INDEXED

-
#define GIMP_STOCK_CONVERT_INDEXED          "gimp-convert-indexed"
-

-

-
-

-

-

-

-

-GIMP_STOCK_CONVERT_RGB

-
#define GIMP_STOCK_CONVERT_RGB              "gimp-convert-rgb"
-

-

-
-

-

-

-

-

-GIMP_STOCK_TRANSPARENCY

-
#define GIMP_STOCK_TRANSPARENCY             "gimp-transparency"
-

-

-
-

-

-

-

-

-GIMP_STOCK_DEFAULT_COLORS

-
#define GIMP_STOCK_DEFAULT_COLORS           "gimp-default-colors"
-

-

-
-

-

-

-

-

-GIMP_STOCK_SWAP_COLORS

-
#define GIMP_STOCK_SWAP_COLORS              "gimp-swap-colors"
-

-

-
-

-

-

-

-

-GIMP_STOCK_UNDO_HISTORY

-
#define GIMP_STOCK_UNDO_HISTORY             "gimp-undo-history"
-

-

-
-

-

-

-

-

-GIMP_STOCK_TOOL_AIRBRUSH

-
#define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_BLEND

-
#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_BLUR

-
#define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST

-
#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_BUCKET_FILL

-
#define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_BY_COLOR_SELECT

-
#define GIMP_STOCK_TOOL_BY_COLOR_SELECT     "gimp-tool-by-color-select"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_CLONE

-
#define GIMP_STOCK_TOOL_CLONE               "gimp-tool-clone"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_COLOR_BALANCE

-
#define GIMP_STOCK_TOOL_COLOR_BALANCE       "gimp-tool-color-balance"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_COLOR_PICKER

-
#define GIMP_STOCK_TOOL_COLOR_PICKER        "gimp-tool-color-picker"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_COLORIZE

-
#define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_CROP

-
#define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_CURVES

-
#define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_DODGE

-
#define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_ELLIPSE_SELECT

-
#define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_ERASER

-
#define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_FLIP

-
#define GIMP_STOCK_TOOL_FLIP                "gimp-tool-flip"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_FREE_SELECT

-
#define GIMP_STOCK_TOOL_FREE_SELECT         "gimp-tool-free-select"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_FUZZY_SELECT

-
#define GIMP_STOCK_TOOL_FUZZY_SELECT        "gimp-tool-fuzzy-select"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_HUE_SATURATION

-
#define GIMP_STOCK_TOOL_HUE_SATURATION      "gimp-tool-hue-saturation"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_INK

-
#define GIMP_STOCK_TOOL_INK                 "gimp-tool-ink"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_ISCISSORS

-
#define GIMP_STOCK_TOOL_ISCISSORS           "gimp-tool-iscissors"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_LEVELS

-
#define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_MEASURE

-
#define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_MOVE

-
#define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_PAINTBRUSH

-
#define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_PATH

-
#define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_PENCIL

-
#define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_PERSPECTIVE

-
#define GIMP_STOCK_TOOL_PERSPECTIVE         "gimp-tool-perspective"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_POSTERIZE

-
#define GIMP_STOCK_TOOL_POSTERIZE           "gimp-tool-posterize"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_RECT_SELECT

-
#define GIMP_STOCK_TOOL_RECT_SELECT         "gimp-tool-rect-select"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_ROTATE

-
#define GIMP_STOCK_TOOL_ROTATE              "gimp-tool-rotate"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_SCALE

-
#define GIMP_STOCK_TOOL_SCALE               "gimp-tool-scale"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_SHEAR

-
#define GIMP_STOCK_TOOL_SHEAR               "gimp-tool-shear"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_SMUDGE

-
#define GIMP_STOCK_TOOL_SMUDGE              "gimp-tool-smudge"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_TEXT

-
#define GIMP_STOCK_TOOL_TEXT                "gimp-tool-text"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_THRESHOLD

-
#define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_TOOL_ZOOM

-
#define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_HCHAIN

-
#define GIMP_STOCK_HCHAIN                   "gimp-hchain"
-

-

-
-

-

-

-

-

-GIMP_STOCK_HCHAIN_BROKEN

-
#define GIMP_STOCK_HCHAIN_BROKEN            "gimp-hchain-broken"
-

-

-
-

-

-

-

-

-GIMP_STOCK_VCHAIN

-
#define GIMP_STOCK_VCHAIN                   "gimp-vchain"
-

-

-
-

-

-

-

-

-GIMP_STOCK_VCHAIN_BROKEN

-
#define GIMP_STOCK_VCHAIN_BROKEN            "gimp-vchain-broken"
-

-

-
-

-

-

-

-

-GIMP_STOCK_TEXTURE

-
#define GIMP_STOCK_TEXTURE                  "gimp-texture"
-

-

-
-

-

-

-

-

-GIMP_STOCK_FRAME

-
#define GIMP_STOCK_FRAME                    "gimp-frame"
-

-

-
-

-

-

-

-

-GIMP_STOCK_ERROR

-
#define GIMP_STOCK_ERROR                    "gimp-error"
-

-

-
-

-

-

-

-

-GIMP_STOCK_INFO

-
#define GIMP_STOCK_INFO                     "gimp-info"
-

-

-
-
-
-

-

-

-

-

-GIMP_STOCK_QUESTION

-
#define GIMP_STOCK_QUESTION                 "gimp-question"
-

-

-
-

-

-

-

-

-GIMP_STOCK_WARNING

-
#define GIMP_STOCK_WARNING                  "gimp-warning"
-

-

-
-
-
-

-

-

-

-

-GIMP_STOCK_WILBER

-
#define GIMP_STOCK_WILBER                   "gimp-wilber"
-

-

-
-
-

-

-

-

-

-GIMP_STOCK_WILBER_EEK

-
#define GIMP_STOCK_WILBER_EEK               "gimp-wilber-eek"
-

-

-
-

-

-

-

-

-GIMP_STOCK_BRUSH

-
#define GIMP_STOCK_BRUSH                    GIMP_STOCK_TOOL_PAINTBRUSH
-

-

-
-

-

-

-

-

-GIMP_STOCK_BUFFER

-
#define GIMP_STOCK_BUFFER                   GTK_STOCK_PASTE
-

-

-
-

-

-

-

-

-GIMP_STOCK_FONT

-
#define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
-

-

-
-

-

-

-

-

-GIMP_STOCK_GRADIENT

-
#define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
-

-

-
-

-

-

-

-

-GIMP_STOCK_PALETTE

-
#define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
-

-

-
-

-

-

-

-

-GIMP_STOCK_PATTERN

-
#define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
-

-

-
-

-

-

-

-

-GIMP_STOCK_ZOOM_FOLLOW_WINDOW

-
#define GIMP_STOCK_ZOOM_FOLLOW_WINDOW       "gimp-zoom-follow-window"
-

-

-
-

-

-

-

-
-
-
-
<< GimpSizeEntryGimpWidgets >>

-
-
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
index cf83f85596..50f50af247 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,63 +20,54 @@
 
 
 
-
+

+
-
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
GimpWidgets

+
GimpWidgets

 
GimpWidgets — A collection of convenient widget constructors, standard callbacks and
 helper functions.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
-GtkWidget*  gimp_radio_group_new            (gboolean in_frame,
+GtkWidget*  gimp_radio_group_new            (gboolean in_frame,
                                              const gchar *frame_title,
                                              ...);
-GtkWidget*  gimp_radio_group_new2           (gboolean in_frame,
+GtkWidget*  gimp_radio_group_new2           (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
                                              gpointer radio_button_callback_data,
                                              gpointer initial,
                                              ...);
-void        gimp_radio_group_set_active     (GtkRadioButton *radio_button,
+void        gimp_radio_group_set_active     (GtkRadioButton *radio_button,
                                              gpointer item_data);
-GtkWidget*  gimp_int_radio_group_new        (gboolean in_frame,
+GtkWidget*  gimp_int_radio_group_new        (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
                                              gpointer radio_button_callback_data,
                                              gint initial,
                                              ...);
-void        gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
+void        gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
                                              gint item_data);
-GtkWidget*  gimp_spin_button_new            (GtkObject **adjustment,
+GtkWidget*  gimp_spin_button_new            (GtkObject **adjustment,
                                              gdouble value,
                                              gdouble lower,
                                              gdouble upper,
@@ -89,11 +81,7 @@ href="../gtk/GtkObject.html"
 #define     GIMP_SCALE_ENTRY_SCALE_ADJ      (adj)
 #define     GIMP_SCALE_ENTRY_SPINBUTTON     (adj)
 #define     GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj)
-GtkObject*  gimp_scale_entry_new            (GtkTable *table,
+GtkObject*  gimp_scale_entry_new            (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *text,
@@ -110,24 +98,14 @@ href="../gtk/GtkTable.html"
                                              gdouble unconstrained_upper,
                                              const gchar *tooltip,
                                              const gchar *help_id);
-void        gimp_scale_entry_set_sensitive  (GtkObject *adjustment,
+void        gimp_scale_entry_set_sensitive  (GtkObject *adjustment,
                                              gboolean sensitive);
 void        gimp_scale_entry_set_logarithmic
-                                            (GtkObject *adjustment,
+                                            (GtkObject *adjustment,
                                              gboolean logarithmic);
 gboolean    gimp_scale_entry_get_logarithmic
-                                            (GtkObject *adjustment);
-GtkObject*  gimp_color_scale_entry_new      (GtkTable *table,
+                                            (GtkObject *adjustment);
+GtkObject*  gimp_color_scale_entry_new      (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *text,
@@ -144,14 +122,10 @@ href="../gtk/GtkTable.html"
 #define     GIMP_RANDOM_SEED_SPINBUTTON     (hbox)
 #define     GIMP_RANDOM_SEED_SPINBUTTON_ADJ (hbox)
 #define     GIMP_RANDOM_SEED_TOGGLE         (hbox)
-GtkWidget*  gimp_random_seed_new            (guint32 *seed,
+GtkWidget*  gimp_random_seed_new            (guint32 *seed,
                                              gboolean *random_seed);
 #define     GIMP_COORDINATES_CHAINBUTTON    (sizeentry)
-GtkWidget*  gimp_coordinates_new            (gimp_coordinates_new            (GimpUnit unit,
                                              const gchar *unit_format,
@@ -175,84 +149,54 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
                                              gdouble upper_boundary_y,
                                              gdouble ysize_0,
                                              gdouble ysize_100);
-GtkWidget*  gimp_pixmap_button_new          (gchar **xpm_data,
+GtkWidget*  gimp_pixmap_button_new          (gchar **xpm_data,
                                              const gchar *text);
 void        gimp_toggle_button_sensitive_update
-                                            (GtkToggleButton *toggle_button);
-void        gimp_toggle_button_update       (GtkWidget *widget,
+                                            (GtkToggleButton *toggle_button);
+void        gimp_toggle_button_update       (GtkWidget *widget,
                                              gpointer data);
-void        gimp_radio_button_update        (GtkWidget *widget,
+void        gimp_radio_button_update        (GtkWidget *widget,
                                              gpointer data);
-void        gimp_int_adjustment_update      (GtkAdjustment *adjustment,
+void        gimp_int_adjustment_update      (GtkAdjustment *adjustment,
                                              gpointer data);
-void        gimp_uint_adjustment_update     (GtkAdjustment *adjustment,
+void        gimp_uint_adjustment_update     (GtkAdjustment *adjustment,
                                              gpointer data);
-void        gimp_float_adjustment_update    (GtkAdjustment *adjustment,
+void        gimp_float_adjustment_update    (GtkAdjustment *adjustment,
                                              gpointer data);
-void        gimp_double_adjustment_update   (GtkAdjustment *adjustment,
+void        gimp_double_adjustment_update   (GtkAdjustment *adjustment,
                                              gpointer data);
-void        gimp_unit_menu_update           (GtkWidget *widget,
+void        gimp_unit_menu_update           (GtkWidget *widget,
                                              gpointer data);
-GtkWidget*  gimp_table_attach_aligned       (GtkTable *table,
+GtkWidget*  gimp_table_attach_aligned       (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *label_text,
                                              gfloat xalign,
                                              gfloat yalign,
-                                             GtkWidget *widget,
+                                             GtkWidget *widget,
                                              gint colspan,
                                              gboolean left_align);
-void        gimp_label_set_attributes       (GtkLabel *label,
+void        gimp_label_set_attributes       (GtkLabel *label,
                                              ...);
 

 

 

-
Description

+
Description

 

 
 

 

 

-
Details

+
Details

 

-

+

 gimp_radio_group_new ()

-
GtkWidget*  gimp_radio_group_new            (gboolean in_frame,
+
GtkWidget*  gimp_radio_group_new            (gboolean in_frame,
                                              const gchar *frame_title,
                                              ...);

 

 Convenience function to create a group of radio buttons embedded into
-a GtkFrame or GtkVbox.

+a GtkFrame or GtkVbox.

 

 
 

@@ -262,9 +206,7 @@ href="../gtk/GtkFrame.html"
 
 
 in_frame :
-    TRUE if you want a GtkFrame around the radio button group.
+    TRUE if you want a GtkFrame around the radio button group.
 
 
 
@@ -282,9 +224,7 @@ href="../gtk/GtkFrame.html"
 
 
 Returns :
- A GtkFrame or GtkVbox (depending on in_frame).
+ A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
@@ -292,11 +232,9 @@ href="../gtk/GtkFrame.html"
 

 

 

-

+

 gimp_radio_group_new2 ()

-
GtkWidget*  gimp_radio_group_new2           (gboolean in_frame,
+
GtkWidget*  gimp_radio_group_new2           (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
                                              gpointer radio_button_callback_data,
@@ -304,9 +242,7 @@ href="../gtk/GtkWidget.html"
                                              ...);

 

 Convenience function to create a group of radio buttons embedded into
-a GtkFrame or GtkVbox.

+a GtkFrame or GtkVbox.

 

 
 

@@ -316,9 +252,7 @@ href="../gtk/GtkFrame.html"
 
 
 in_frame :
-              TRUE if you want a GtkFrame around the
+              TRUE if you want a GtkFrame around the
                         radio button group.
 
 
@@ -359,9 +293,7 @@ href="../gtk/GtkFrame.html"
 
 
 Returns :
- A GtkFrame or GtkVbox (depending on in_frame).
+ A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
@@ -369,16 +301,12 @@ href="../gtk/GtkFrame.html"
 

 

 

-

+

 gimp_radio_group_set_active ()

-
void        gimp_radio_group_set_active     (GtkRadioButton *radio_button,
+
void        gimp_radio_group_set_active     (GtkRadioButton *radio_button,
                                              gpointer item_data);

 

-Calls gtk_toggle_button_set_active() with the radio button that was
+Calls gtk_toggle_button_set_active() with the radio button that was
 created with a matching item_data.

 

 
@@ -389,9 +317,7 @@ created with a matching item_data.

 
 
 radio_button :
- Pointer to a GtkRadioButton.
+ Pointer to a GtkRadioButton.
 
 
 
@@ -405,11 +331,9 @@ href="../gtk/GtkRadioButton.html"
 

 

 

-

+

 gimp_int_radio_group_new ()

-
GtkWidget*  gimp_int_radio_group_new        (gboolean in_frame,
+
GtkWidget*  gimp_int_radio_group_new        (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
                                              gpointer radio_button_callback_data,
@@ -417,9 +341,7 @@ href="../gtk/GtkWidget.html"
                                              ...);

 

 Convenience function to create a group of radio buttons embedded into
-a GtkFrame or GtkVbox. This function does the same thing as
+a GtkFrame or GtkVbox. This function does the same thing as
 gimp_radio_group_new2(), but it takes integers as item_data instead of
 pointers, since that is a very common case (mapping an enum to a radio
 group).

@@ -432,9 +354,7 @@ group).

 
 
 in_frame :
-              TRUE if you want a GtkFrame around the
+              TRUE if you want a GtkFrame around the
                         radio button group.
 
 
@@ -475,9 +395,7 @@ href="../gtk/GtkFrame.html"
 
 
 Returns :
- A GtkFrame or GtkVbox (depending on in_frame).
+ A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
@@ -485,16 +403,12 @@ href="../gtk/GtkFrame.html"
 

 

 

-

+

 gimp_int_radio_group_set_active ()

-
void        gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
+
void        gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
                                              gint item_data);

 

-Calls gtk_toggle_button_set_active() with the radio button that was created
+Calls gtk_toggle_button_set_active() with the radio button that was created
 with a matching item_data. This function does the same thing as
 gimp_radio_group_set_active(), but takes integers as item_data instead
 of pointers.

@@ -507,9 +421,7 @@ of pointers.

 
 
 radio_button :
- Pointer to a GtkRadioButton.
+ Pointer to a GtkRadioButton.
 
 
 
@@ -523,13 +435,9 @@ href="../gtk/GtkRadioButton.html"
 

 

 

-

+

 gimp_spin_button_new ()

-
GtkWidget*  gimp_spin_button_new            (GtkObject **adjustment,
+
GtkWidget*  gimp_spin_button_new            (GtkObject **adjustment,
                                              gdouble value,
                                              gdouble lower,
                                              gdouble upper,
@@ -539,12 +447,8 @@ href="../gtk/GtkObject.html"
                                              gdouble climb_rate,
                                              guint digits);

 

-This function is a shortcut for gtk_adjustment_new() and a subsequent
-gtk_spin_button_new() and does some more initialisation stuff like
+This function is a shortcut for gtk_adjustment_new() and a subsequent
+gtk_spin_button_new() and does some more initialisation stuff like
 setting a standard minimum horizontal size.

 

 
@@ -555,9 +459,7 @@ setting a standard minimum horizontal size.

 
 
 adjustment :
-     Returns the spinbutton's GtkAdjustment.
+     Returns the spinbutton's GtkAdjustment.
 
 
 
@@ -611,9 +513,7 @@ href="../gtk/GtkAdjustment.html"
 
 
 Returns :
- A GtkSpinbutton and it's GtkAdjustment.
+ A GtkSpinbutton and it's GtkAdjustment.
 
 
 
@@ -621,22 +521,18 @@ href="../gtk/GtkAdjustment.html"
 

 

 

-

+

 GIMP_SCALE_ENTRY_LABEL()

-
#define     GIMP_SCALE_ENTRY_LABEL(adj)

+
#define     GIMP_SCALE_ENTRY_LABEL(adj)

 

-Returns the scale_entry's GtkLabel.
+Returns the scale_entry's GtkLabel.
 

 

-
@@ -645,22 +541,18 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 GIMP_SCALE_ENTRY_SCALE()

-
#define     GIMP_SCALE_ENTRY_SCALE(adj)

+
#define     GIMP_SCALE_ENTRY_SCALE(adj)

 

-Returns the scale_entry's GtkHScale.
+Returns the scale_entry's GtkHScale.
 

 

 
 

 
 adj :The GtkAdjustment returned by gimp_scale_entry_new().
+The GtkAdjustment returned by gimp_scale_entry_new().
 
 
 
 
 

-
@@ -669,24 +561,18 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 GIMP_SCALE_ENTRY_SCALE_ADJ()

-
#define     GIMP_SCALE_ENTRY_SCALE_ADJ(adj)

+
#define     GIMP_SCALE_ENTRY_SCALE_ADJ(adj)

 

-Returns the GtkAdjustment of the scale_entry's GtkHScale.
+Returns the GtkAdjustment of the scale_entry's GtkHScale.
 

 

 
 

 
 adj :The GtkAdjustment returned by gimp_scale_entry_new().
+The GtkAdjustment returned by gimp_scale_entry_new().
 
 
 
 
 

-
@@ -695,22 +581,18 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 GIMP_SCALE_ENTRY_SPINBUTTON()

-
#define     GIMP_SCALE_ENTRY_SPINBUTTON(adj)

+
#define     GIMP_SCALE_ENTRY_SPINBUTTON(adj)

 

-Returns the scale_entry's GtkSpinButton.
+Returns the scale_entry's GtkSpinButton.
 

 

 
 

 
 adj :The GtkAdjustment returned by gimp_scale_entry_new().
+The GtkAdjustment returned by gimp_scale_entry_new().
 
 
 
 
 

-
@@ -719,24 +601,18 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 GIMP_SCALE_ENTRY_SPINBUTTON_ADJ()

-
#define     GIMP_SCALE_ENTRY_SPINBUTTON_ADJ(adj)

+
#define     GIMP_SCALE_ENTRY_SPINBUTTON_ADJ(adj)

 

-Returns the GtkAdjustment of the scale_entry's GtkSpinButton.
+Returns the GtkAdjustment of the scale_entry's GtkSpinButton.
 

 

 
 

 
 adj :The GtkAdjustment returned by gimp_scale_entry_new().
+The GtkAdjustment returned by gimp_scale_entry_new().
 
 
 
 
 

-
@@ -745,13 +621,9 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_scale_entry_new ()

-
GtkObject*  gimp_scale_entry_new            (GtkTable *table,
+
GtkObject*  gimp_scale_entry_new            (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *text,
@@ -769,16 +641,8 @@ href="../gtk/GtkTable.html"
                                              const gchar *tooltip,
                                              const gchar *help_id);

 

-This function creates a GtkLabel, a GtkHScale and a GtkSpinButton and
-attaches them to a 3-column GtkTable.

+This function creates a GtkLabel, a GtkHScale and a GtkSpinButton and
+attaches them to a 3-column GtkTable.

 

 
 

@@ -788,9 +652,7 @@ href="../gtk/GtkTable.html"
 

-
@@ -808,28 +670,20 @@ href="../gtk/GtkTable.html"
 
-
-
-
@@ -872,11 +726,7 @@ href="../gtk/GtkSpinButton.html"
 
@@ -908,11 +758,7 @@ href="../gtk/GtkHScale.html"
 
-
@@ -920,18 +766,12 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_scale_entry_set_sensitive ()

-
void        gimp_scale_entry_set_sensitive  (GtkObject *adjustment,
+
void        gimp_scale_entry_set_sensitive  (GtkObject *adjustment,
                                              gboolean sensitive);

 

-Sets the sensitivity of the scale_entry's GtkLabel, GtkHScale and
+Sets the sensitivity of the scale_entry's GtkLabel, GtkHScale and
 GtkSpinbutton.

 

 
@@ -942,18 +782,14 @@ href="../gtk/GtkHScale.html"
 

-
@@ -961,12 +797,10 @@ href="../gtk/GtkWidget.html#gtk-widget-set-sensitive"
 

-

+

 gimp_scale_entry_set_logarithmic ()

-
void        gimp_scale_entry_set_logarithmic
-                                            (GtkObject *adjustment,
+
void        gimp_scale_entry_set_logarithmic
+                                            (GtkObject *adjustment,
                                              gboolean logarithmic);

 

 Sets whether the scale_entry's scale widget will behave in a linear
@@ -982,9 +816,7 @@ adjustment.

 

-
@@ -1001,12 +833,10 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_scale_entry_get_logarithmic ()

-
gboolean    gimp_scale_entry_get_logarithmic
-                                            (GtkObject *adjustment);

+
gboolean    gimp_scale_entry_get_logarithmic
+                                            (GtkObject *adjustment);

 

 

 

@@ -1018,9 +848,7 @@ href="../gtk/GtkObject.html"
 

-
@@ -1038,13 +866,9 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_color_scale_entry_new ()

-
GtkObject*  gimp_color_scale_entry_new      (GtkTable *table,
+
GtkObject*  gimp_color_scale_entry_new      (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *text,
@@ -1059,14 +883,8 @@ href="../gtk/GtkTable.html"
                                              const gchar *tooltip,
                                              const gchar *help_id);

 

-This function creates a GtkLabel, a GimpColorScale and a
-GtkSpinButton and attaches them to a 3-column GtkTable.

+This function creates a GtkLabel, a GimpColorScale and a
+GtkSpinButton and attaches them to a 3-column GtkTable.

 

 
 

@@ -1076,9 +894,7 @@ href="../gtk/GtkTable.html"
 

-
@@ -1096,28 +912,20 @@ href="../gtk/GtkTable.html"
 
-
-
-
@@ -1171,11 +979,7 @@ href="../gtk/GtkSpinButton.html"
 
-
@@ -1183,22 +987,18 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 GIMP_RANDOM_SEED_SPINBUTTON()

-
#define     GIMP_RANDOM_SEED_SPINBUTTON(hbox)

+
#define     GIMP_RANDOM_SEED_SPINBUTTON(hbox)

 

-Returns the random_seed's GtkSpinButton.
+Returns the random_seed's GtkSpinButton.
 

 

 
 

 
 adj :The GtkAdjustment returned by gimp_scale_entry_new().
+The GtkAdjustment returned by gimp_scale_entry_new().
 
 
 
 
 

 
 table :               The GtkTable the widgets will be attached to.
+               The GtkTable the widgets will be attached to.
 
 

 

 
 text :                The text for the GtkLabel which will appear
-                      left of the GtkHScale.
+                The text for the GtkLabel which will appear
+                      left of the GtkHScale.
 
 

 

 
 scale_width :         The minimum horizontal size of the GtkHScale.
+         The minimum horizontal size of the GtkHScale.
 
 

 

 
 spinbutton_width :    The minimum horizontal size of the GtkSpinButton.
+    The minimum horizontal size of the GtkSpinButton.
 
 

 

 constrain :
            TRUE if the range of possible values of the
-                      GtkSpinButton should be the same as of the GtkHScale.
+                      GtkSpinButton should be the same as of the GtkHScale.
 
 

 

 
 Returns : The GtkSpinButton's GtkAdjustment.
+ The GtkSpinButton's GtkAdjustment.
 
 

 
 
 

 
 adjustment : a GtkAdjustment returned by gimp_scale_entry_new()
+ a GtkAdjustment returned by gimp_scale_entry_new()
 
 

 

 
 sensitive :
   a boolean value with the same semantics as the sensitive
-             parameter of gtk_widget_set_sensitive()
+             parameter of gtk_widget_set_sensitive()
 
 

 
 
 

 
 adjustment :  a  GtkAdjustment as returned by gimp_scale_entry_new()
+  a  GtkAdjustment as returned by gimp_scale_entry_new()
 
 

 

 
 

 
 adjustment : a  GtkAdjustment as returned by gimp_scale_entry_new()
+ a  GtkAdjustment as returned by gimp_scale_entry_new()
 
 

 

 
 

 
 table :               The GtkTable the widgets will be attached to.
+               The GtkTable the widgets will be attached to.
 
 

 

 
 text :                The text for the GtkLabel which will appear
-                      left of the GtkHScale.
+                The text for the GtkLabel which will appear
+                      left of the GtkHScale.
 
 

 

 
 scale_width :         The minimum horizontal size of the GtkHScale.
+         The minimum horizontal size of the GtkHScale.
 
 

 

 
 spinbutton_width :    The minimum horizontal size of the GtkSpinButton.
+    The minimum horizontal size of the GtkSpinButton.
 
 

 

 
 Returns : The GtkSpinButton's GtkAdjustment.
+ The GtkSpinButton's GtkAdjustment.
 
 

 
 
 

-
@@ -1207,24 +1007,18 @@ href="../gtk/GtkHBox.html"
 

-

+

 GIMP_RANDOM_SEED_SPINBUTTON_ADJ()

-
#define     GIMP_RANDOM_SEED_SPINBUTTON_ADJ(hbox)

+
#define     GIMP_RANDOM_SEED_SPINBUTTON_ADJ(hbox)

 

-Returns the GtkAdjustment of the random_seed's GtkSpinButton.
+Returns the GtkAdjustment of the random_seed's GtkSpinButton.
 

 

 
 

 
 hbox :The GtkHBox returned by gimp_random_seed_new().
+The GtkHBox returned by gimp_random_seed_new().
 
 
 
 
 

-
@@ -1233,9 +1027,9 @@ href="../gtk/GtkHBox.html"
 

-

+

 GIMP_RANDOM_SEED_TOGGLE()

-
#define     GIMP_RANDOM_SEED_TOGGLE(hbox)

+
#define     GIMP_RANDOM_SEED_TOGGLE(hbox)

 

 
 

@@ -1253,11 +1047,9 @@ href="../gtk/GtkHBox.html"
 

-

+

 gimp_random_seed_new ()

-
GtkWidget*  gimp_random_seed_new            (guint32 *seed,
+
GtkWidget*  gimp_random_seed_new            (guint32 *seed,
                                              gboolean *random_seed);

 

 Creates a widget that allows the user to control how the random number
@@ -1284,14 +1076,8 @@ generator is initialized.

 

-
@@ -1299,9 +1085,9 @@ href="../gtk/GtkButton.html"
 

-

+

 GIMP_COORDINATES_CHAINBUTTON()

-
#define     GIMP_COORDINATES_CHAINBUTTON(sizeentry)

+
#define     GIMP_COORDINATES_CHAINBUTTON(sizeentry)

 

 Returns the GimpChainButton which is attached to the GimpSizeEntry.
 

@@ -1319,11 +1105,9 @@ Returns the 
-

+

 gimp_coordinates_new ()

-
GtkWidget*  gimp_coordinates_new            (
GtkWidget*  gimp_coordinates_new            (GimpUnit unit,
                                              const gchar *unit_format,
@@ -1388,9 +1172,7 @@ two fields' values or the ratio between them.

 

@@ -1509,23 +1291,17 @@ href="../gtk/GtkSpinButton.html"
 

-

+

 gimp_pixmap_button_new ()

-
GtkWidget*  gimp_pixmap_button_new          (gchar **xpm_data,
+
GtkWidget*  gimp_pixmap_button_new          (gchar **xpm_data,
                                              const gchar *text);

 

 
Warning

 
gimp_pixmap_button_new is deprecated and should not be used in newly-written code.

 

 

-Convenience function that creates a GtkButton with a GimpPixmap
-and an optional GtkLabel.

+Convenience function that creates a GtkButton with a GimpPixmap
+and an optional GtkLabel.

 

 
 

@@ -1547,9 +1323,7 @@ href="../gtk/GtkLabel.html"
 

-
@@ -1557,19 +1331,13 @@ href="../gtk/GtkButton.html"
 

-

+

 gimp_toggle_button_sensitive_update ()

-
void        gimp_toggle_button_sensitive_update
-                                            (GtkToggleButton *toggle_button);

+
void        gimp_toggle_button_sensitive_update
+                                            (GtkToggleButton *toggle_button);

 

-If you attached a pointer to a GtkWidget with g_object_set_data() and
-the "set_sensitive" key to the GtkToggleButton, the sensitive state of
+If you attached a pointer to a GtkWidget with g_object_set_data() and
+the "set_sensitive" key to the GtkToggleButton, the sensitive state of
 the attached widget will be set according to the toggle button's
 "active" state.
 

@@ -1589,9 +1357,7 @@ button's inverse "active" state by attaching widgets with the
 

-
@@ -1599,11 +1365,9 @@ href="../gtk/GtkToggleButton.html"
 

-

+

 gimp_toggle_button_update ()

-
void        gimp_toggle_button_update       (GtkWidget *widget,
+
void        gimp_toggle_button_update       (GtkWidget *widget,
                                              gpointer data);

 

 Note that this function calls gimp_toggle_button_sensitive_update().

@@ -1616,18 +1380,14 @@ Note that this function calls widget :
-

@@ -1635,11 +1395,9 @@ href="../gtk/GtkToggleButton.html#gtk-toggle-button-get-active"
 
 

 

-

+

 gimp_radio_button_update ()

-
void        gimp_radio_button_update        (GtkWidget *widget,
+
void        gimp_radio_button_update        (GtkWidget *widget,
                                              gpointer data);

 

 Note that this function calls gimp_toggle_button_sensitive_update().

@@ -1652,9 +1410,7 @@ Note that this function calls widget :
-

@@ -1669,16 +1425,12 @@ href="../gtk/GtkRadioButton.html"
 
 

 

-

+

 gimp_int_adjustment_update ()

-
void        gimp_int_adjustment_update      (GtkAdjustment *adjustment,
+
void        gimp_int_adjustment_update      (GtkAdjustment *adjustment,
                                              gpointer data);

 

-Note that the GtkAdjustment's value (which is a gdouble) will be
+Note that the GtkAdjustment's value (which is a gdouble) will be
 rounded with RINT().

@@ -1691,9 +1443,7 @@ href="../libgimpmath/libgimpmath-GimpMath.html#RINT:CAPS"
 

-
@@ -1708,16 +1458,12 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_uint_adjustment_update ()

-
void        gimp_uint_adjustment_update     (GtkAdjustment *adjustment,
+
void        gimp_uint_adjustment_update     (GtkAdjustment *adjustment,
                                              gpointer data);

 

-Note that the GtkAdjustment's value (which is a gdouble) will be rounded
+Note that the GtkAdjustment's value (which is a gdouble) will be rounded
 with (guint) (value + 0.5).

 

 
@@ -1728,9 +1474,7 @@ with (guint) (value + 0.5).

 

-
@@ -1745,11 +1489,9 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_float_adjustment_update ()

-
void        gimp_float_adjustment_update    (GtkAdjustment *adjustment,
+
void        gimp_float_adjustment_update    (GtkAdjustment *adjustment,
                                              gpointer data);

 

 

@@ -1762,9 +1504,7 @@ href="../gtk/GtkAdjustment.html"
 

-
@@ -1779,11 +1519,9 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_double_adjustment_update ()

-
void        gimp_double_adjustment_update   (GtkAdjustment *adjustment,
+
void        gimp_double_adjustment_update   (GtkAdjustment *adjustment,
                                              gpointer data);

 

 

@@ -1796,9 +1534,7 @@ href="../gtk/GtkAdjustment.html"
 

-
@@ -1813,17 +1549,13 @@ href="../gtk/GtkAdjustment.html"
 

-

+

 gimp_unit_menu_update ()

-
void        gimp_unit_menu_update           (GtkWidget *widget,
+
void        gimp_unit_menu_update           (GtkWidget *widget,
                                              gpointer data);

 

 This callback can set the number of decimal digits of an arbitrary number
-of GtkSpinButton's. To use this functionality, attach the spinbuttons
+of GtkSpinButton's. To use this functionality, attach the spinbuttons
 as list of data pointers attached with g_object_set_data() with the
 "set_digits" key.
 

@@ -1856,21 +1588,15 @@ href="../libgimpbase/libgimpbase-gimpunit.html#GimpUnit"
 

-

+

 gimp_table_attach_aligned ()

-
GtkWidget*  gimp_table_attach_aligned       (GtkTable *table,
+
GtkWidget*  gimp_table_attach_aligned       (GtkTable *table,
                                              gint column,
                                              gint row,
                                              const gchar *label_text,
                                              gfloat xalign,
                                              gfloat yalign,
-                                             GtkWidget *widget,
+                                             GtkWidget *widget,
                                              gint colspan,
                                              gboolean left_align);

 

@@ -1885,9 +1611,7 @@ attached starting at (column + 1) in thi
 

-
@@ -1905,34 +1629,26 @@ href="../gtk/GtkTable.html"
 
-
-
-
-
@@ -1950,9 +1666,7 @@ href="../gtk/GtkWidget.html"
 
-
@@ -1960,25 +1674,17 @@ href="../gtk/GtkLabel.html"
 

-

+

 gimp_label_set_attributes ()

-
void        gimp_label_set_attributes       (GtkLabel *label,
+
void        gimp_label_set_attributes       (GtkLabel *label,
                                              ...);

 

-Sets Pango attributes on a GtkLabel in a more convenient way than
-gtk_label_set_attributes().
+Sets Pango attributes on a GtkLabel in a more convenient way than
+gtk_label_set_attributes().
 

 

 This function is useful if you want to change the font attributes
-of a GtkLabel. This is an alternative to using PangoMarkup which
+of a GtkLabel. This is an alternative to using PangoMarkup which
 is slow to parse and akward to handle in an i18n-friendly way.
 

 

@@ -1994,9 +1700,7 @@ use the PangoAttributes API directly.

 

-
@@ -2012,9 +1716,5 @@ href="../gtk/GtkLabel.html"
 
-

 
 

 
 hbox :The GtkHBox returned by gimp_random_seed_new().
+The GtkHBox returned by gimp_random_seed_new().
 
 
 
 
 
 
 

 
 Returns : A GtkHBox containing a GtkSpinButton for the seed and
-         a GtkButton for setting a random seed.
+ A GtkHBox containing a GtkSpinButton for the seed and
+         a GtkButton for setting a random seed.
 
 

 
 
 

 spinbutton_width :
        The horizontal size of the GimpSizeEntry's
-                          GtkSpinButton's.
+                          GtkSpinButton's.
 
 

 

 
 

 
 Returns : The new GtkButton.
+ The new GtkButton.
 
 

 
 
 

 
 toggle_button : The GtkToggleButton the "set_sensitive" and
+ The GtkToggleButton the "set_sensitive" and
                 "inverse_sensitive" lists are attached to.
 
 

 
 
 A GtkToggleButton.
+ A GtkToggleButton.
 
 

 

 
 data :
    A pointer to a gint variable which will store the value of
-         gtk_toggle_button_get_active().
+         gtk_toggle_button_get_active().
 
 

 
 A GtkRadioButton.
+ A GtkRadioButton.
 
 

 

 
 adjustment : A GtkAdjustment.
+ A GtkAdjustment.
 
 

 

 
 

 
 adjustment : A GtkAdjustment.
+ A GtkAdjustment.
 
 

 

 
 

 
 adjustment : A GtkAdjustment.
+ A GtkAdjustment.
 
 

 

 
 

 
 adjustment : A GtkAdjustment.
+ A GtkAdjustment.
 
 

 

 
 
 
 

 
 table :      The GtkTable the widgets will be attached to.
+      The GtkTable the widgets will be attached to.
 
 

 

 
 label_text : The text for the GtkLabel which will be attached left of
+ The text for the GtkLabel which will be attached left of
              the widget.
 
 

 

 
 xalign :     The horizontal alignment of the GtkLabel.
+     The horizontal alignment of the GtkLabel.
 
 

 

 
 yalign :     The vertival alignment of the GtkLabel.
+     The vertival alignment of the GtkLabel.
 
 

 

 
 widget :     The GtkWidget to attach right of the label.
+     The GtkWidget to attach right of the label.
 
 

 

 
 Returns : The created GtkLabel.
+ The created GtkLabel.
 
 

 
 
 

 
 label : a GtkLabel
+ a GtkLabel
 
 

 

 
 

-
-
-
<< GimpStockPart VI. Deprecated API >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
index b6a848e784..aa866a3336 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,8 +20,9 @@
 
 
 
-
+

+
@@ -37,9 +39,5 @@
 
-
-
-
-
<< GimpUnitMenuGimpCellRendererColor >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
index a6ebaa17c0..ba25c5836b 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,17 +20,14 @@
 
 
 
-
+

+
 

 GIMP Display Filters

-
-
-
-
<< GimpCellRendererToggleGimpColorDisplay >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
index 0649db928b..95fa08c15d 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,17 +20,14 @@
 
 
 
-
+

+
 

 GIMP Color Selectors

-
-
-
-
<< GimpColorDisplayStackGimpColorSelector >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
index 115b2ea968..56321972b0 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,8 +20,9 @@
 
 
 
-
+

+
@@ -32,9 +34,5 @@
       Note that the controller API is work in progress.
     

-
-
-
-
<< GimpColorSelectGimpController >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
index 67370fae87..74822f6f5e 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,17 +20,14 @@
 
 
 
-
+

+
 

 Deprecated API

-
-
-
-
<< GimpWidgetsgimpoldwidgets >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-gimpoldwidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-gimpoldwidgets.html
index 90b00b4f2a..248a9031be 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-gimpoldwidgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-gimpoldwidgets.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -6,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,91 +19,79 @@
 
 
 
-
+

+
-
+ 
+
+Top
+                   | 
+                  Description
+
 

 

 

 
-
gimpoldwidgets

+
gimpoldwidgets

 
gimpoldwidgets — Old API that is still available but declared as deprecated.

 		
 
 

 

-
Synopsis

+
Synopsis

 
 
 
 
-GtkWidget*  gimp_int_option_menu_new        (gboolean menu_only,
+GtkWidget*  gimp_int_option_menu_new        (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
                                              gint initial,
                                              ...);
 void        gimp_int_option_menu_set_history
-                                            (GtkOptionMenu *option_menu,
+                                            (GtkOptionMenu *option_menu,
                                              gint item_data);
 gboolean    (*GimpIntOptionMenuSensitivityCallback)
                                             (gint item_data,
                                              gpointer callback_data);
 void        gimp_int_option_menu_set_sensitive
-                                            (GtkOptionMenu *option_menu,
+                                            (GtkOptionMenu *option_menu,
                                              GimpIntOptionMenuSensitivityCallback callback,
                                              gpointer callback_data);
-GtkWidget*  gimp_option_menu_new            (gboolean menu_only,
+GtkWidget*  gimp_option_menu_new            (gboolean menu_only,
                                              ...);
-GtkWidget*  gimp_option_menu_new2           (gboolean menu_only,
+GtkWidget*  gimp_option_menu_new2           (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
                                              gpointer initial,
                                              ...);
-void        gimp_option_menu_set_history    (GtkOptionMenu *option_menu,
+void        gimp_option_menu_set_history    (GtkOptionMenu *option_menu,
                                              gpointer item_data);
 gboolean    (*GimpOptionMenuSensitivityCallback)
                                             (gpointer item_data,
                                              gpointer callback_data);
-void        gimp_option_menu_set_sensitive  (GtkOptionMenu *option_menu,
+void        gimp_option_menu_set_sensitive  (GtkOptionMenu *option_menu,
                                              GimpOptionMenuSensitivityCallback callback,
                                              gpointer callback_data);
-void        gimp_menu_item_update           (GtkWidget *widget,
+void        gimp_menu_item_update           (GtkWidget *widget,
                                              gpointer data);
 

 

 

-
Description

+
Description

 

 These functions are not defined if you define GIMP_DISABLE_DEPRECATED.
 

 

 

-
Details

+
Details

 

-

+

 gimp_int_option_menu_new ()

-
GtkWidget*  gimp_int_option_menu_new        (gboolean menu_only,
+
GtkWidget*  gimp_int_option_menu_new        (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
                                              gint initial,
@@ -112,11 +101,7 @@ href="../gtk/GtkWidget.html"
 
gimp_int_option_menu_new is deprecated and should not be used in newly-written code.

 

 

-Convenience function to create a GtkOptionMenu or a GtkMenu. This
+Convenience function to create a GtkOptionMenu or a GtkMenu. This
 function does the same thing as the deprecated function
 gimp_option_menu_new2(), but it takes integers as item_data
 instead of pointers, since that is a very common case (mapping an
@@ -130,9 +115,7 @@ enum to a menu).

 
 
 menu_only :
-          TRUE if the function should return a GtkMenu only.
+          TRUE if the function should return a GtkMenu only.
 
 
 
@@ -164,11 +147,7 @@ href="../gtk/GtkMenu.html"
 
 
 Returns :
- A GtkOptionMenu or a GtkMenu (depending on menu_only).
+ A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
@@ -176,24 +155,18 @@ href="../gtk/GtkMenu.html"
 

 

 

-

+

 gimp_int_option_menu_set_history ()

-
void        gimp_int_option_menu_set_history
-                                            (GtkOptionMenu *option_menu,
+
void        gimp_int_option_menu_set_history
+                                            (GtkOptionMenu *option_menu,
                                              gint item_data);

 

 
Warning

 
gimp_int_option_menu_set_history is deprecated and should not be used in newly-written code.

 

 

-Iterates over all entries in a GtkOptionMenu and selects the one with the
-matching item_data. Probably only makes sense to use with a GtkOptionMenu
+Iterates over all entries in a GtkOptionMenu and selects the one with the
+matching item_data. Probably only makes sense to use with a GtkOptionMenu
 that was created using gimp_int_option_menu_new(). This function does the
 same thing as gimp_option_menu_set_history(), but takes integers as
 item_data instead of pointers.

@@ -206,9 +179,7 @@ same thing as option_menu :
- A GtkOptionMenu as returned by gimp_int_option_menu_new().
+ A GtkOptionMenu as returned by gimp_int_option_menu_new().
 
 
 
@@ -222,9 +193,9 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 GimpIntOptionMenuSensitivityCallback ()

-
gboolean    (*GimpIntOptionMenuSensitivityCallback)
+
gboolean    (*GimpIntOptionMenuSensitivityCallback)
                                             (gint item_data,
                                              gpointer callback_data);

 

@@ -262,12 +233,10 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 gimp_int_option_menu_set_sensitive ()

-
void        gimp_int_option_menu_set_sensitive
-                                            (GtkOptionMenu *option_menu,
+
void        gimp_int_option_menu_set_sensitive
+                                            (GtkOptionMenu *option_menu,
                                              GimpIntOptionMenuSensitivityCallback callback,
                                              gpointer callback_data);

 

@@ -289,9 +258,7 @@ same thing as option_menu :
- a GtkOptionMenu as returned by gimp_option_menu_new() or
+ a GtkOptionMenu as returned by gimp_option_menu_new() or
            gimp_option_menu_new2().
 
 
@@ -313,22 +280,16 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 gimp_option_menu_new ()

-
GtkWidget*  gimp_option_menu_new            (gboolean menu_only,
+
GtkWidget*  gimp_option_menu_new            (gboolean menu_only,
                                              ...);

 

 
Warning

 
gimp_option_menu_new is deprecated and should not be used in newly-written code.

 

 

-Convenience function to create a GtkOptionMenu or a GtkMenu.

+Convenience function to create a GtkOptionMenu or a GtkMenu.

 

 
 

@@ -338,9 +299,7 @@ href="../gtk/GtkMenu.html"
 
 
 menu_only :
- TRUE if the function should return a GtkMenu only.
+ TRUE if the function should return a GtkMenu only.
 
 
 
@@ -352,11 +311,7 @@ href="../gtk/GtkMenu.html"
 
 
 Returns :
- A GtkOptionMenu or a GtkMenu (depending on menu_only).
+ A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
@@ -364,11 +319,9 @@ href="../gtk/GtkMenu.html"
 

 

 

-

+

 gimp_option_menu_new2 ()

-
GtkWidget*  gimp_option_menu_new2           (gboolean menu_only,
+
GtkWidget*  gimp_option_menu_new2           (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
                                              gpointer initial,
@@ -378,11 +331,7 @@ href="../gtk/GtkWidget.html"
 
gimp_option_menu_new2 is deprecated and should not be used in newly-written code.

 

 

-Convenience function to create a GtkOptionMenu or a GtkMenu.

+Convenience function to create a GtkOptionMenu or a GtkMenu.

 

 
 

@@ -392,9 +341,7 @@ href="../gtk/GtkMenu.html"
 
 
 menu_only :
-          TRUE if the function should return a GtkMenu only.
+          TRUE if the function should return a GtkMenu only.
 
 
 
@@ -426,11 +373,7 @@ href="../gtk/GtkMenu.html"
 
 
 Returns :
- A GtkOptionMenu or a GtkMenu (depending on menu_only).
+ A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
@@ -438,24 +381,18 @@ href="../gtk/GtkMenu.html"
 

 

 

-

+

 gimp_option_menu_set_history ()

-
void        gimp_option_menu_set_history    (GtkOptionMenu *option_menu,
+
void        gimp_option_menu_set_history    (GtkOptionMenu *option_menu,
                                              gpointer item_data);

 

 
Warning

 
gimp_option_menu_set_history is deprecated and should not be used in newly-written code.

 

 

-Iterates over all entries in a GtkOptionMenu and selects the one
+Iterates over all entries in a GtkOptionMenu and selects the one
 with the matching item_data. Probably only makes sense to use with
-a GtkOptionMenu that was created using gimp_option_menu_new() or
+a GtkOptionMenu that was created using gimp_option_menu_new() or
 gimp_option_menu_new2().

 

 
@@ -466,9 +403,7 @@ href="../gtk/GtkOptionMenu.html"
 
 
 option_menu :
- A GtkOptionMenu as returned by gimp_option_menu_new() or
+ A GtkOptionMenu as returned by gimp_option_menu_new() or
               gimp_option_menu_new2().
 
 
@@ -483,9 +418,9 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 GimpOptionMenuSensitivityCallback ()

-
gboolean    (*GimpOptionMenuSensitivityCallback)
+
gboolean    (*GimpOptionMenuSensitivityCallback)
                                             (gpointer item_data,
                                              gpointer callback_data);

 

@@ -523,11 +458,9 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 gimp_option_menu_set_sensitive ()

-
void        gimp_option_menu_set_sensitive  (GtkOptionMenu *option_menu,
+
void        gimp_option_menu_set_sensitive  (GtkOptionMenu *option_menu,
                                              GimpOptionMenuSensitivityCallback callback,
                                              gpointer callback_data);

 

@@ -547,9 +480,7 @@ according to the return value of this function.

 
 
 option_menu :
- a GtkOptionMenu as returned by gimp_option_menu_new() or
+ a GtkOptionMenu as returned by gimp_option_menu_new() or
            gimp_option_menu_new2().
 
 
@@ -571,11 +502,9 @@ href="../gtk/GtkOptionMenu.html"
 

 

 

-

+

 gimp_menu_item_update ()

-
void        gimp_menu_item_update           (GtkWidget *widget,
+
void        gimp_menu_item_update           (GtkWidget *widget,
                                              gpointer data);

 

 
Warning

@@ -592,9 +521,7 @@ href="../gtk/GtkWidget.html"
 
 
 widget :
- A GtkMenuItem.
+ A GtkMenuItem.
 
 
 
@@ -609,15 +536,11 @@ href="../gtk/GtkMenuItem.html"
 

 

 

-
See Also

+
See Also

 

 GimpIntComboBox
 

 

 

-
-
-
-
<< Part VI. Deprecated API

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
index d21112bbe0..679c3b7395 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,7 +20,7 @@
 
 
 
-
+

@@ -31,110 +32,61 @@
 Object Hierarchy
     GObject
-        GtkObject
-            GtkWidget
-                GtkContainer
-                    GtkBin
-                        GtkButton
-                            GimpButton
-                                GimpColorButton
-                            GimpPickButton
-                            GtkOptionMenu
-                                GimpUnitMenu
-                        GtkWindow
-                            GtkDialog
-                                GimpDialog
-                        GtkFrame
-                            GimpFrame
-                        GtkComboBox
-                            GimpIntComboBox
-                    GtkTable
-                        GimpChainButton
-                        GimpSizeEntry
-                    GtkBox
-                        GtkVBox
-                            GimpColorSelector
-                                GimpColorNotebook
-                                GimpColorScales
-                                GimpColorSelect
-                            GimpColorSelection
-                            GimpPathEditor
-                            GimpPreview
-                        GtkHBox
-                            GimpFileEntry
-                            GimpMemsizeEntry
-                GtkDrawingArea
-                    GimpColorArea
-                    GimpOffsetArea
-                    GimpPreviewArea
-                GtkEntry
-                    GimpColorHexEntry
-                GtkRange
-                    GtkScale
-                        GimpColorScale
-                GtkMisc
-                    GtkImage
-                        GimpPixmap
-            GtkCellRenderer
-                GimpCellRendererColor
-                GtkCellRendererToggle
-                    GimpCellRendererToggle
+        GInitiallyUnowned
+            GtkObject
+                GtkWidget
+                    GtkContainer
+                        GtkBin
+                            GtkButton
+                                GimpButton
+                                    GimpColorButton
+                                GimpPickButton
+                                GtkOptionMenu
+                                    GimpUnitMenu
+                            GtkWindow
+                                GtkDialog
+                                    GimpDialog
+                            GtkFrame
+                                GimpFrame
+                            GtkComboBox
+                                GimpIntComboBox
+                        GtkTable
+                            GimpChainButton
+                            GimpSizeEntry
+                        GtkBox
+                            GtkVBox
+                                GimpColorSelector
+                                    GimpColorNotebook
+                                    GimpColorScales
+                                    GimpColorSelect
+                                GimpColorSelection
+                                GimpPathEditor
+                                GimpPreview
+                            GtkHBox
+                                GimpFileEntry
+                                GimpMemsizeEntry
+                    GtkDrawingArea
+                        GimpColorArea
+                        GimpOffsetArea
+                        GimpPreviewArea
+                    GtkEntry
+                        GimpColorHexEntry
+                    GtkRange
+                        GtkScale
+                            GimpColorScale
+                    GtkMisc
+                        GtkImage
+                            GimpPixmap
+                GtkCellRenderer
+                    GimpCellRendererColor
+                    GtkCellRendererToggle
+                        GimpCellRendererToggle
         GimpColorDisplay
         GimpColorDisplayStack
         GimpController
-        GtkListStore
+        GtkListStore
             GimpIntStore
 

-
-
-
-
<< Part I. GIMP WidgetsGimpButton >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html
index d63bc25ca4..5eca80fd08 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,17 +20,14 @@
 
 
 
-
+

+
 

 GIMP Widgets Utilities

-
-
-
-
<< GimpControllerGimpHelpUI >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html
index 3203914acc..41002d998d 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html
@@ -1,3 +1,4 @@
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,17 +20,14 @@
 
 
 
-
+

+
 

 GIMP Widgets

-
-
-
-
<< GIMP Widgets Library Reference ManualObject Hierarchy >>

 
 
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp
index b250df6682..e7984cff59 100644
--- a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp
@@ -1,4 +1,5 @@
 
+
 
   
     
diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2
new file mode 100644
index 0000000000..b3c1797961
--- /dev/null
+++ b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2
@@ -0,0 +1,532 @@
+
+
+
+  
+    
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/devel-docs/libgimpwidgets/html/style.css b/devel-docs/libgimpwidgets/html/style.css
index c9cabe7830..261896b214 100644
--- a/devel-docs/libgimpwidgets/html/style.css
+++ b/devel-docs/libgimpwidgets/html/style.css
@@ -19,12 +19,22 @@
 {
   vertical-align: top;
 }
-table.navigation 
+div a[name]
+{
+  position: relative;
+  top: -4.5em;
+}
+table.navigation#top
 {
   background: #ffeeee;
   border: solid 1px #ffaaaa;
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
+  margin-top: 0;
+  margin-bottom: 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 2em;
+  z-index: 1;
 }
 .navigation a 
 {
@@ -38,6 +48,18 @@ table.navigation
 {
   font-size: 200%;
 }
+td.shortcuts
+{
+  color: #770000;
+  font-size: 80%;
+}
+
+div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1
+{
+  position: relative;
+  top: 3em;
+  z-index: 0;
+}
 div.refnamediv 
 {
   margin-top: 2em;
diff --git a/devel-docs/libgimpwidgets/xml/gimpbutton.xml b/devel-docs/libgimpwidgets/xml/gimpbutton.xml
index c496b87d92..86d76b1822 100644
--- a/devel-docs/libgimpwidgets/xml/gimpbutton.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpbutton.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpButton
+GimpButton
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpButtonA GtkButton with a little extra functionality.
+GimpButton
+A GtkButton with a little extra functionality.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -27,26 +30,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpButton
-                                       +----GimpColorButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpButton
+                                             +----GimpColorButton
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpButton implements
  AtkImplementorIface.
@@ -55,20 +59,20 @@ GimpButton implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "extended-clicked"
-            void        user_function      (GimpButton *gimpbutton,
-                                            GdkModifierType arg1,
-                                            gpointer user_data);
+            void        user_function      (GimpButton      *gimpbutton,
+                                            GdkModifierType *arg1,
+                                            gpointer         user_data)       : Run first
 
 
 
 
-
-Description
+
+Description
 
 GimpButton adds an extra signal to the GtkButton widget that allows
 to distinguish a normal click from a click that was performed with
@@ -76,16 +80,16 @@ modifier keys pressed.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpButton-struct"/>GimpButton
+<anchor id="GimpButton-struct" role="struct"/>GimpButton
 GimpButtontypedef struct _GimpButton GimpButton;
 
 
 
 
-<anchor id="gimp-button-new"/>gimp_button_new ()
+<anchor id="gimp-button-new" role="function"/>gimp_button_new ()
 gimp_button_newGtkWidget*  gimp_button_new                 (void);
 
 Creates a new GimpButton widget.
@@ -96,7 +100,7 @@ Creates a new GimpButton widget.<
 
 
 
-<anchor id="gimp-button-extended-clicked"/>gimp_button_extended_clicked ()
+<anchor id="gimp-button-extended-clicked" role="function"/>gimp_button_extended_clicked ()
 gimp_button_extended_clickedvoid        gimp_button_extended_clicked    (GimpButton *button,
                                              GdkModifierType state);
 
@@ -114,12 +118,12 @@ Emits the button's "extended_clicked" signal.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpButton-extended-clicked"/>The "extended-clicked" signal
-void        user_function                  (GimpButton *gimpbutton,
-                                            GdkModifierType arg1,
-                                            gpointer user_data);
+GimpButton::extended-clickedvoid        user_function                  (GimpButton      *gimpbutton,
+                                            GdkModifierType *arg1,
+                                            gpointer         user_data)       : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcellrenderercolor.xml b/devel-docs/libgimpwidgets/xml/gimpcellrenderercolor.xml
index b4c8ab3909..800e72473e 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcellrenderercolor.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcellrenderercolor.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpCellRendererColor
+GimpCellRendererColor
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpCellRendererColor
+GimpCellRendererColor
+
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -26,14 +29,15 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkCellRenderer
-               +----GimpCellRendererColor
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkCellRenderer
+                     +----GimpCellRendererColor
 
 
 
@@ -42,8 +46,8 @@
 
 
 
-
-Properties
+
+Properties
 
 
   "color"                GimpRGB               : Read / Write
@@ -54,23 +58,23 @@
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpCellRendererColor-struct"/>GimpCellRendererColor
+<anchor id="GimpCellRendererColor-struct" role="struct"/>GimpCellRendererColor
 GimpCellRendererColortypedef struct _GimpCellRendererColor GimpCellRendererColor;
 
 
 
 
-<anchor id="gimp-cell-renderer-color-new"/>gimp_cell_renderer_color_new ()
+<anchor id="gimp-cell-renderer-color-new" role="function" condition="since:GIMP 2.2"/>gimp_cell_renderer_color_new ()
 gimp_cell_renderer_color_newGtkCellRenderer* gimp_cell_renderer_color_new
                                             (void);
 
@@ -85,18 +89,18 @@ Creates a GtkCellRenderer th
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpCellRendererColor--color"/>The "<literal>color</literal>" property
-  "color"                GimpRGB               : Read / Write
+GimpCellRendererColor:color  "color"                GimpRGB               : Read / Write
 
 <anchor id="GimpCellRendererColor--icon-size"/>The "<literal>icon-size</literal>" property
-  "icon-size"            gint                  : Read / Write / Construct
+GimpCellRendererColor:icon-size  "icon-size"            gint                  : Read / Write / Construct
 Allowed values: >= 0
 Default value: 1
 
 <anchor id="GimpCellRendererColor--opaque"/>The "<literal>opaque</literal>" property
-  "opaque"               gboolean              : Read / Write / Construct
+GimpCellRendererColor:opaque  "opaque"               gboolean              : Read / Write / Construct
 Default value: TRUE
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcellrenderertoggle.xml b/devel-docs/libgimpwidgets/xml/gimpcellrenderertoggle.xml
index 646a99389d..7b06feaf93 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcellrenderertoggle.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcellrenderertoggle.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpCellRendererToggle
+GimpCellRendererToggle
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpCellRendererToggle
+GimpCellRendererToggle
+
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -30,15 +33,16 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkCellRenderer
-               +----GtkCellRendererToggle
-                     +----GimpCellRendererToggle
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkCellRenderer
+                     +----GtkCellRendererToggle
+                           +----GimpCellRendererToggle
 
 
 
@@ -47,8 +51,8 @@
 
 
 
-
-Properties
+
+Properties
 
 
   "stock-id"             gchararray            : Read / Write / Construct
@@ -56,35 +60,35 @@
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "clicked"   void        user_function      (GimpCellRendererToggle *gimpcellrenderertoggle,
-                                            gchar *arg1,
-                                            GdkModifierType arg2,
-                                            gpointer user_data);
+                                            gchar                  *arg1,
+                                            GdkModifierType        *arg2,
+                                            gpointer                user_data)                   : Run last
 
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpCellRendererToggle-struct"/>GimpCellRendererToggle
+<anchor id="GimpCellRendererToggle-struct" role="struct"/>GimpCellRendererToggle
 GimpCellRendererToggletypedef struct _GimpCellRendererToggle GimpCellRendererToggle;
 
 
 
 
-<anchor id="gimp-cell-renderer-toggle-new"/>gimp_cell_renderer_toggle_new ()
+<anchor id="gimp-cell-renderer-toggle-new" role="function" condition="since:GIMP 2.2"/>gimp_cell_renderer_toggle_new ()
 gimp_cell_renderer_toggle_newGtkCellRenderer* gimp_cell_renderer_toggle_new
                                             (const gchar *stock_id);
 
@@ -92,7 +96,7 @@ Creates a custom version of the GtkC
 showing the standard toggle button, it shows a stock icon if the
 cell is active and no icon otherwise. This cell renderer is for
 example used in the Layers treeview to indicate and control the
-layer's visibility by showing GIMP_STOCK_VISIBLE.
+layer's visibility by showing GIMP_STOCK_VISIBLE.
 
 
 
@@ -105,7 +109,7 @@ layer's visibility by showing GIMP_STOCK_VISIBLE.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-cell-renderer-toggle-clicked"/>gimp_cell_renderer_toggle_clicked ()
+<anchor id="gimp-cell-renderer-toggle-clicked" role="function" condition="since:GIMP 2.2"/>gimp_cell_renderer_toggle_clicked ()
 gimp_cell_renderer_toggle_clickedvoid        gimp_cell_renderer_toggle_clicked
                                             (GimpCellRendererToggle *cell,
                                              const gchar *path,
@@ -128,27 +132,27 @@ Emits the "clicked" signal from a G
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpCellRendererToggle--stock-id"/>The "<literal>stock-id</literal>" property
-  "stock-id"             gchararray            : Read / Write / Construct
+GimpCellRendererToggle:stock-id  "stock-id"             gchararray            : Read / Write / Construct
 Default value: NULL
 
 <anchor id="GimpCellRendererToggle--stock-size"/>The "<literal>stock-size</literal>" property
-  "stock-size"           gint                  : Read / Write / Construct
+GimpCellRendererToggle:stock-size  "stock-size"           gint                  : Read / Write / Construct
 Allowed values: >= 0
 Default value: 4
 
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpCellRendererToggle-clicked"/>The "clicked" signal
-void        user_function                  (GimpCellRendererToggle *gimpcellrenderertoggle,
-                                            gchar *arg1,
-                                            GdkModifierType arg2,
-                                            gpointer user_data);
+GimpCellRendererToggle::clickedvoid        user_function                  (GimpCellRendererToggle *gimpcellrenderertoggle,
+                                            gchar                  *arg1,
+                                            GdkModifierType        *arg2,
+                                            gpointer                user_data)                   : Run last
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpchainbutton.xml b/devel-docs/libgimpwidgets/xml/gimpchainbutton.xml
index 19915a7e90..38bdbced50 100644
--- a/devel-docs/libgimpwidgets/xml/gimpchainbutton.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpchainbutton.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpChainButton
+GimpChainButton
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpChainButtonWidget to visually connect two entry widgets.
+GimpChainButton
+Widget to visually connect two entry widgets.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -29,24 +32,25 @@ enum        GimpChainPosition;
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTable
-                           +----GimpChainButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkTable
+                                 +----GimpChainButton
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpChainButton implements
  AtkImplementorIface.
@@ -55,18 +59,18 @@ GimpChainButton implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "toggled"   void        user_function      (GimpChainButton *gimpchainbutton,
-                                            gpointer user_data);
+                                            gpointer         user_data)            : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget provides a button showing either a linked or a broken
 chain that can be used to link two entries, spinbuttons, colors
@@ -83,16 +87,16 @@ necessary.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpChainButton-struct"/>GimpChainButton
+<anchor id="GimpChainButton-struct" role="struct"/>GimpChainButton
 GimpChainButtontypedef struct _GimpChainButton GimpChainButton;
 
 
 
 
-<anchor id="GimpChainPosition"/>enum GimpChainPosition
+<anchor id="GimpChainPosition" role="enum"/>enum GimpChainPosition
 GimpChainPositiontypedef enum
 {
   GIMP_CHAIN_TOP,
@@ -105,7 +109,7 @@ necessary.
 
 
 
-<anchor id="gimp-chain-button-new"/>gimp_chain_button_new ()
+<anchor id="gimp-chain-button-new" role="function"/>gimp_chain_button_new ()
 gimp_chain_button_newGtkWidget*  gimp_chain_button_new           (GimpChainPosition position);
 
 Creates a new GimpChainButton widget.
@@ -130,12 +134,12 @@ for more than two widgets, but the look is optimized for two.
 
 
 
-<anchor id="gimp-chain-button-set-active"/>gimp_chain_button_set_active ()
+<anchor id="gimp-chain-button-set-active" role="function"/>gimp_chain_button_set_active ()
 gimp_chain_button_set_activevoid        gimp_chain_button_set_active    (GimpChainButton *button,
                                              gboolean active);
 
-Sets the state of the GimpChainButton to be either locked (TRUE) or
-unlocked (FALSE) and changes the showed pixmap to reflect the new state.
+Sets the state of the GimpChainButton to be either locked (TRUE) or
+unlocked (FALSE) and changes the showed pixmap to reflect the new state.
 
 
 
@@ -147,7 +151,7 @@ unlocked (FALSE) and changes the showed pixmap to reflect the
 
 
 
-<anchor id="gimp-chain-button-get-active"/>gimp_chain_button_get_active ()
+<anchor id="gimp-chain-button-get-active" role="function"/>gimp_chain_button_get_active ()
 gimp_chain_button_get_activegboolean    gimp_chain_button_get_active    (GimpChainButton *button);
 
 Checks the state of the GimpChainButton.
@@ -157,17 +161,17 @@ Checks the state of the GimpChainButtonbutton :
  Pointer to a GimpChainButton.
 
-Returns : TRUE if the GimpChainButton is active (locked).
+Returns : TRUE if the GimpChainButton is active (locked).
 
 
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpChainButton-toggled"/>The "toggled" signal
-void        user_function                  (GimpChainButton *gimpchainbutton,
-                                            gpointer user_data);
+GimpChainButton::toggledvoid        user_function                  (GimpChainButton *gimpchainbutton,
+                                            gpointer         user_data)            : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorarea.xml b/devel-docs/libgimpwidgets/xml/gimpcolorarea.xml
index 24b868e77a..7018f4a71a 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorarea.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorarea.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorArea
+GimpColorArea
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorAreaDisplays a GimpRGB color, optionally with alpha-channel.
+GimpColorArea
+Displays a GimpRGB color, optionally with alpha-channel.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -37,23 +40,24 @@ enum        GimpColorAreaType;
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpColorArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpColorArea
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorArea implements
  AtkImplementorIface.
@@ -62,34 +66,34 @@ GimpColorArea implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "color-changed"
             void        user_function      (GimpColorArea *gimpcolorarea,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorArea-struct"/>GimpColorArea
+<anchor id="GimpColorArea-struct" role="struct"/>GimpColorArea
 GimpColorAreatypedef struct _GimpColorArea GimpColorArea;
 
 
 
 
-<anchor id="GimpColorAreaType"/>enum GimpColorAreaType
+<anchor id="GimpColorAreaType" role="enum"/>enum GimpColorAreaType
 GimpColorAreaTypetypedef enum
 {
   GIMP_COLOR_AREA_FLAT = 0,
@@ -101,7 +105,7 @@ GimpColorArea implements
 
 
 
-<anchor id="gimp-color-area-new"/>gimp_color_area_new ()
+<anchor id="gimp-color-area-new" role="function"/>gimp_color_area_new ()
 gimp_color_area_newGtkWidget*  gimp_color_area_new             (const GimpRGB *color,
                                              GimpColorAreaType type,
                                              GdkModifierType drag_mask);
@@ -127,7 +131,7 @@ DND. If the color changes, the "color_changed" signal is emitted.
 
 
 
-<anchor id="gimp-color-area-set-color"/>gimp_color_area_set_color ()
+<anchor id="gimp-color-area-set-color" role="function"/>gimp_color_area_set_color ()
 gimp_color_area_set_colorvoid        gimp_color_area_set_color       (GimpColorArea *area,
                                              const GimpRGB *color);
 
@@ -143,7 +147,7 @@ Sets area to a different color.

 
 
-<anchor id="gimp-color-area-get-color"/>gimp_color_area_get_color ()
+<anchor id="gimp-color-area-get-color" role="function"/>gimp_color_area_get_color ()
 gimp_color_area_get_colorvoid        gimp_color_area_get_color       (GimpColorArea *area,
                                              GimpRGB *color);
 
@@ -159,7 +163,7 @@ Retrieves the current color of the area.
 
 
 
-<anchor id="gimp-color-area-has-alpha"/>gimp_color_area_has_alpha ()
+<anchor id="gimp-color-area-has-alpha" role="function"/>gimp_color_area_has_alpha ()
 gimp_color_area_has_alphagboolean    gimp_color_area_has_alpha       (GimpColorArea *area);
 
 Checks whether the area shows transparency information. This is determined
@@ -170,11 +174,11 @@ via the area's Gi
 area :
  Pointer to a GimpColorArea.
 
-Returns : TRUE if area shows transparency information, FALSE otherwise.
+Returns : TRUE if area shows transparency information, FALSE otherwise.
 
 
 
-<anchor id="gimp-color-area-set-type"/>gimp_color_area_set_type ()
+<anchor id="gimp-color-area-set-type" role="function"/>gimp_color_area_set_type ()
 gimp_color_area_set_typevoid        gimp_color_area_set_type        (GimpColorArea *area,
                                              GimpColorAreaType type);
 
@@ -192,7 +196,7 @@ the checkerboard used to do that.
 
 
 
-<anchor id="gimp-color-area-set-draw-border"/>gimp_color_area_set_draw_border ()
+<anchor id="gimp-color-area-set-draw-border" role="function"/>gimp_color_area_set_draw_border ()
 gimp_color_area_set_draw_bordervoid        gimp_color_area_set_draw_border (GimpColorArea *area,
                                              gboolean draw_border);
 
@@ -212,11 +216,11 @@ off. The default is not draw a border.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorArea-color-changed"/>The "color-changed" signal
-void        user_function                  (GimpColorArea *gimpcolorarea,
-                                            gpointer user_data);
+GimpColorArea::color-changedvoid        user_function                  (GimpColorArea *gimpcolorarea,
+                                            gpointer       user_data)          : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorbutton.xml b/devel-docs/libgimpwidgets/xml/gimpcolorbutton.xml
index 3dcad61f6c..d129f25083 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorbutton.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorbutton.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorButton
+GimpColorButton
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorButtonWidget for selecting a color from a simple button.
+GimpColorButton
+Widget for selecting a color from a simple button.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -39,26 +42,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpButton
-                                       +----GimpColorButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpButton
+                                             +----GimpColorButton
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorButton implements
  AtkImplementorIface.
@@ -67,19 +71,19 @@ GimpColorButton implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "color-changed"
             void        user_function      (GimpColorButton *gimpcolorbutton,
-                                            gpointer user_data);
+                                            gpointer         user_data)            : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget provides a simple button with a preview showing the
 color.
@@ -92,16 +96,16 @@ color, the "color_changed" signal is emitted.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorButton-struct"/>GimpColorButton
+<anchor id="GimpColorButton-struct" role="struct"/>GimpColorButton
 GimpColorButtontypedef struct _GimpColorButton GimpColorButton;
 
 
 
 
-<anchor id="gimp-color-button-new"/>gimp_color_button_new ()
+<anchor id="gimp-color-button-new" role="function"/>gimp_color_button_new ()
 gimp_color_button_newGtkWidget*  gimp_color_button_new           (const gchar *title,
                                              gint width,
                                              gint height,
@@ -138,7 +142,7 @@ signal is emitted.
 
 
 
-<anchor id="gimp-color-button-set-color"/>gimp_color_button_set_color ()
+<anchor id="gimp-color-button-set-color" role="function"/>gimp_color_button_set_color ()
 gimp_color_button_set_colorvoid        gimp_color_button_set_color     (GimpColorButton *button,
                                              const GimpRGB *color);
 
@@ -154,7 +158,7 @@ Sets the button to the given color
 
 
 
-<anchor id="gimp-color-button-get-color"/>gimp_color_button_get_color ()
+<anchor id="gimp-color-button-get-color" role="function"/>gimp_color_button_get_color ()
 gimp_color_button_get_colorvoid        gimp_color_button_get_color     (GimpColorButton *button,
                                              GimpRGB *color);
 
@@ -170,7 +174,7 @@ Retrieves the currently set color from the button.
 
 
 
-<anchor id="gimp-color-button-set-update"/>gimp_color_button_set_update ()
+<anchor id="gimp-color-button-set-update" role="function"/>gimp_color_button_set_update ()
 gimp_color_button_set_updatevoid        gimp_color_button_set_update    (GimpColorButton *button,
                                              gboolean continuous);
 
@@ -188,7 +192,7 @@ dialog.
 
 
 
-<anchor id="gimp-color-button-get-update"/>gimp_color_button_get_update ()
+<anchor id="gimp-color-button-get-update" role="function"/>gimp_color_button_get_update ()
 gimp_color_button_get_updategboolean    gimp_color_button_get_update    (GimpColorButton *button);
 
 Returns the color button's continuous_update property.
@@ -202,7 +206,7 @@ Returns the color button's continuous_update property.

 
 
-<anchor id="gimp-color-button-has-alpha"/>gimp_color_button_has_alpha ()
+<anchor id="gimp-color-button-has-alpha" role="function"/>gimp_color_button_has_alpha ()
 gimp_color_button_has_alphagboolean    gimp_color_button_has_alpha     (GimpColorButton *button);
 
 Checks whether the buttons shows transparency information.
@@ -212,12 +216,12 @@ Checks whether the buttons shows transparency information
 button :
  Pointer to a GimpColorButton.
 
-Returns : TRUE if the button shows transparency information, FALSE
+Returns : TRUE if the button shows transparency information, FALSE
 otherwise.
 
 
 
-<anchor id="gimp-color-button-set-type"/>gimp_color_button_set_type ()
+<anchor id="gimp-color-button-set-type" role="function"/>gimp_color_button_set_type ()
 gimp_color_button_set_typevoid        gimp_color_button_set_type      (GimpColorButton *button,
                                              GimpColorAreaType type);
 
@@ -235,11 +239,11 @@ Sets the button to the given type.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorButton-color-changed"/>The "color-changed" signal
-void        user_function                  (GimpColorButton *gimpcolorbutton,
-                                            gpointer user_data);
+GimpColorButton::color-changedvoid        user_function                  (GimpColorButton *gimpcolorbutton,
+                                            gpointer         user_data)            : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolordisplay.xml b/devel-docs/libgimpwidgets/xml/gimpcolordisplay.xml
index e12f47017b..ed31925055 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolordisplay.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolordisplay.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorDisplay
+GimpColorDisplay
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorDisplayPluggable GIMP display color correction modules.
+GimpColorDisplay
+Pluggable GIMP display color correction modules.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -42,8 +45,8 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
@@ -56,42 +59,42 @@
 
 
 
-
-Properties
+
+Properties
 
 
   "enabled"              gboolean              : Read / Write / Construct
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "changed"   void        user_function      (GimpColorDisplay *gimpcolordisplay,
-                                            gpointer user_data);
+                                            gpointer          user_data)             : Run first
 
 
 
 
-
-Description
+
+Description
 
 Functions and definitions for creating pluggable GIMP
 display color correction modules.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorDisplay-struct"/>GimpColorDisplay
+<anchor id="GimpColorDisplay-struct" role="struct"/>GimpColorDisplay
 GimpColorDisplaytypedef struct _GimpColorDisplay GimpColorDisplay;
 
 
 
 
-<anchor id="gimp-color-display-new"/>gimp_color_display_new ()
+<anchor id="gimp-color-display-new" role="function"/>gimp_color_display_new ()
 gimp_color_display_newGimpColorDisplay* gimp_color_display_new    (GType display_type);
 
 
@@ -105,7 +108,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-clone"/>gimp_color_display_clone ()
+<anchor id="gimp-color-display-clone" role="function"/>gimp_color_display_clone ()
 gimp_color_display_cloneGimpColorDisplay* gimp_color_display_clone  (GimpColorDisplay *display);
 
 
@@ -119,7 +122,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-set-enabled"/>gimp_color_display_set_enabled ()
+<anchor id="gimp-color-display-set-enabled" role="function"/>gimp_color_display_set_enabled ()
 gimp_color_display_set_enabledvoid        gimp_color_display_set_enabled  (GimpColorDisplay *display,
                                              gboolean enabled);
 
@@ -135,7 +138,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-get-enabled"/>gimp_color_display_get_enabled ()
+<anchor id="gimp-color-display-get-enabled" role="function"/>gimp_color_display_get_enabled ()
 gimp_color_display_get_enabledgboolean    gimp_color_display_get_enabled  (GimpColorDisplay *display);
 
 
@@ -149,7 +152,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-convert"/>gimp_color_display_convert ()
+<anchor id="gimp-color-display-convert" role="function"/>gimp_color_display_convert ()
 gimp_color_display_convertvoid        gimp_color_display_convert      (GimpColorDisplay *display,
                                              guchar *buf,
                                              gint width,
@@ -181,7 +184,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-load-state"/>gimp_color_display_load_state ()
+<anchor id="gimp-color-display-load-state" role="function"/>gimp_color_display_load_state ()
 gimp_color_display_load_statevoid        gimp_color_display_load_state   (GimpColorDisplay *display,
                                              GimpParasite *state);
 
@@ -197,7 +200,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-save-state"/>gimp_color_display_save_state ()
+<anchor id="gimp-color-display-save-state" role="function"/>gimp_color_display_save_state ()
 gimp_color_display_save_stateGimpParasite* gimp_color_display_save_state (GimpColorDisplay *display);
 
 
@@ -211,7 +214,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-configure"/>gimp_color_display_configure ()
+<anchor id="gimp-color-display-configure" role="function"/>gimp_color_display_configure ()
 gimp_color_display_configureGtkWidget*  gimp_color_display_configure    (GimpColorDisplay *display);
 
 
@@ -225,7 +228,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-configure-reset"/>gimp_color_display_configure_reset ()
+<anchor id="gimp-color-display-configure-reset" role="function"/>gimp_color_display_configure_reset ()
 gimp_color_display_configure_resetvoid        gimp_color_display_configure_reset
                                             (GimpColorDisplay *display);
 
@@ -238,7 +241,7 @@ display color correction modules.
 
 
 
-<anchor id="gimp-color-display-changed"/>gimp_color_display_changed ()
+<anchor id="gimp-color-display-changed" role="function"/>gimp_color_display_changed ()
 gimp_color_display_changedvoid        gimp_color_display_changed      (GimpColorDisplay *display);
 
 
@@ -251,20 +254,20 @@ display color correction modules.
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpColorDisplay--enabled"/>The "<literal>enabled</literal>" property
-  "enabled"              gboolean              : Read / Write / Construct
+GimpColorDisplay:enabled  "enabled"              gboolean              : Read / Write / Construct
 Default value: TRUE
 
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorDisplay-changed"/>The "changed" signal
-void        user_function                  (GimpColorDisplay *gimpcolordisplay,
-                                            gpointer user_data);
+GimpColorDisplay::changedvoid        user_function                  (GimpColorDisplay *gimpcolordisplay,
+                                            gpointer          user_data)             : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolordisplaystack.xml b/devel-docs/libgimpwidgets/xml/gimpcolordisplaystack.xml
index 294aadec9f..deae766ec1 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolordisplaystack.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolordisplaystack.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorDisplayStack
+GimpColorDisplayStack
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorDisplayStack
+GimpColorDisplayStack
+
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -47,8 +50,8 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
@@ -62,44 +65,44 @@
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "added"     void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 "changed"   void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            gpointer user_data);
+                                            gpointer               user_data)                  : Run first
 "removed"   void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gpointer               user_data)                  : Run first
 "reordered" void        user_function      (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorDisplayStack-struct"/>GimpColorDisplayStack
+<anchor id="GimpColorDisplayStack-struct" role="struct"/>GimpColorDisplayStack
 GimpColorDisplayStacktypedef struct _GimpColorDisplayStack GimpColorDisplayStack;
 
 
 
 
-<anchor id="gimp-color-display-stack-new"/>gimp_color_display_stack_new ()
+<anchor id="gimp-color-display-stack-new" role="function"/>gimp_color_display_stack_new ()
 gimp_color_display_stack_newGimpColorDisplayStack* gimp_color_display_stack_new
                                             (void);
 
@@ -111,7 +114,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-clone"/>gimp_color_display_stack_clone ()
+<anchor id="gimp-color-display-stack-clone" role="function"/>gimp_color_display_stack_clone ()
 gimp_color_display_stack_cloneGimpColorDisplayStack* gimp_color_display_stack_clone
                                             (GimpColorDisplayStack *stack);
 
@@ -126,7 +129,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-changed"/>gimp_color_display_stack_changed ()
+<anchor id="gimp-color-display-stack-changed" role="function"/>gimp_color_display_stack_changed ()
 gimp_color_display_stack_changedvoid        gimp_color_display_stack_changed
                                             (GimpColorDisplayStack *stack);
 
@@ -139,7 +142,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-add"/>gimp_color_display_stack_add ()
+<anchor id="gimp-color-display-stack-add" role="function"/>gimp_color_display_stack_add ()
 gimp_color_display_stack_addvoid        gimp_color_display_stack_add    (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);
 
@@ -155,7 +158,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-remove"/>gimp_color_display_stack_remove ()
+<anchor id="gimp-color-display-stack-remove" role="function"/>gimp_color_display_stack_remove ()
 gimp_color_display_stack_removevoid        gimp_color_display_stack_remove (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);
 
@@ -171,7 +174,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-reorder-up"/>gimp_color_display_stack_reorder_up ()
+<anchor id="gimp-color-display-stack-reorder-up" role="function"/>gimp_color_display_stack_reorder_up ()
 gimp_color_display_stack_reorder_upvoid        gimp_color_display_stack_reorder_up
                                             (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);
@@ -188,7 +191,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-reorder-down"/>gimp_color_display_stack_reorder_down ()
+<anchor id="gimp-color-display-stack-reorder-down" role="function"/>gimp_color_display_stack_reorder_down ()
 gimp_color_display_stack_reorder_downvoid        gimp_color_display_stack_reorder_down
                                             (GimpColorDisplayStack *stack,
                                              GimpColorDisplay *display);
@@ -205,7 +208,7 @@
 
 
 
-<anchor id="gimp-color-display-stack-convert"/>gimp_color_display_stack_convert ()
+<anchor id="gimp-color-display-stack-convert" role="function"/>gimp_color_display_stack_convert ()
 gimp_color_display_stack_convertvoid        gimp_color_display_stack_convert
                                             (GimpColorDisplayStack *stack,
                                              guchar *buf,
@@ -240,13 +243,13 @@
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorDisplayStack-added"/>The "added" signal
-void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+GimpColorDisplayStack::addedvoid        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 
 
 
@@ -263,8 +266,8 @@
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpColorDisplayStack-changed"/>The "changed" signal
-void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            gpointer user_data);
+GimpColorDisplayStack::changedvoid        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            gpointer               user_data)                  : Run first
 
 
 
@@ -275,9 +278,9 @@
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpColorDisplayStack-removed"/>The "removed" signal
-void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gpointer user_data);
+GimpColorDisplayStack::removedvoid        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gpointer               user_data)                  : Run first
 
 
 
@@ -291,10 +294,10 @@
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpColorDisplayStack-reordered"/>The "reordered" signal
-void        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
-                                            GimpColorDisplay *arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+GimpColorDisplayStack::reorderedvoid        user_function                  (GimpColorDisplayStack *gimpcolordisplaystack,
+                                            GimpColorDisplay      *arg1,
+                                            gint                   arg2,
+                                            gpointer               user_data)                  : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorhexentry.xml b/devel-docs/libgimpwidgets/xml/gimpcolorhexentry.xml
index 9c644ed317..929f09ec21 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorhexentry.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorhexentry.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorHexEntry
+GimpColorHexEntry
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorHexEntryWidget for entering a color's hex triplet.
+GimpColorHexEntry
+Widget for entering a color's hex triplet.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -29,23 +32,24 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkEntry
-                     +----GimpColorHexEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkEntry
+                           +----GimpColorHexEntry
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorHexEntry implements
  AtkImplementorIface,  GtkEditable and  GtkCellEditable.
@@ -54,34 +58,34 @@ GimpColorHexEntry implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "color-changed"
             void        user_function      (GimpColorHexEntry *gimpcolorhexentry,
-                                            gpointer user_data);
+                                            gpointer           user_data)              : Run first
 
 
 
 
-
-Description
+
+Description
 
 Widget for entering a color's hex triplet.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorHexEntry-struct"/>GimpColorHexEntry
+<anchor id="GimpColorHexEntry-struct" role="struct"/>GimpColorHexEntry
 GimpColorHexEntrytypedef struct _GimpColorHexEntry GimpColorHexEntry;
 
 
 
 
-<anchor id="gimp-color-hex-entry-new"/>gimp_color_hex_entry_new ()
+<anchor id="gimp-color-hex-entry-new" role="function" condition="since:GIMP 2.2"/>gimp_color_hex_entry_new ()
 gimp_color_hex_entry_newGtkWidget*  gimp_color_hex_entry_new        (void);
 
 
@@ -94,7 +98,7 @@ Widget for entering a color's hex triplet.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-color-hex-entry-set-color"/>gimp_color_hex_entry_set_color ()
+<anchor id="gimp-color-hex-entry-set-color" role="function" condition="since:GIMP 2.2"/>gimp_color_hex_entry_set_color ()
 gimp_color_hex_entry_set_colorvoid        gimp_color_hex_entry_set_color  (GimpColorHexEntry *entry,
                                              const GimpRGB *color);
 
@@ -113,7 +117,7 @@ signal is emitted.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-color-hex-entry-get-color"/>gimp_color_hex_entry_get_color ()
+<anchor id="gimp-color-hex-entry-get-color" role="function" condition="since:GIMP 2.2"/>gimp_color_hex_entry_get_color ()
 gimp_color_hex_entry_get_colorvoid        gimp_color_hex_entry_get_color  (GimpColorHexEntry *entry,
                                              GimpRGB *color);
 
@@ -132,11 +136,11 @@ Retrieves the color value displayed by a 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorHexEntry-color-changed"/>The "color-changed" signal
-void        user_function                  (GimpColorHexEntry *gimpcolorhexentry,
-                                            gpointer user_data);
+GimpColorHexEntry::color-changedvoid        user_function                  (GimpColorHexEntry *gimpcolorhexentry,
+                                            gpointer           user_data)              : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolornotebook.xml b/devel-docs/libgimpwidgets/xml/gimpcolornotebook.xml
index de7a1a4535..4d11fa73a5 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolornotebook.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolornotebook.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorNotebook
+GimpColorNotebook
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorNotebookA GimpColorSelector implementation.
+GimpColorNotebook
+A GimpColorSelector implementation.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -28,26 +31,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorNotebook
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorNotebook
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorNotebook implements
  AtkImplementorIface.
@@ -55,8 +59,8 @@ GimpColorNotebook implements
 
 
 
-
-Style Properties
+
+Style Properties
 
 
   "tab-border"           gint                  : Read
@@ -66,24 +70,24 @@ GimpColorNotebook implements
 
 
 
-
-Description
+
+Description
 
 The GimpColorNotebook widget is an implementation of a GimpColorSelector.
 It serves as a container for GimpColorSelectors.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorNotebook-struct"/>GimpColorNotebook
+<anchor id="GimpColorNotebook-struct" role="struct"/>GimpColorNotebook
 GimpColorNotebooktypedef struct _GimpColorNotebook GimpColorNotebook;
 
 
 
 
-<anchor id="gimp-color-notebook-set-has-page"/>gimp_color_notebook_set_has_page ()
+<anchor id="gimp-color-notebook-set-has-page" role="function"/>gimp_color_notebook_set_has_page ()
 gimp_color_notebook_set_has_pageGtkWidget*  gimp_color_notebook_set_has_page
                                             (GimpColorNotebook *notebook,
                                              GType page_type,
@@ -109,15 +113,15 @@ The page_type passed must be a 
+Style Property Details
 <anchor id="GimpColorNotebook--tab-border"/>The "<literal>tab-border</literal>" style property
-  "tab-border"           gint                  : Read
+GimpColorNotebook:tab-border  "tab-border"           gint                  : Read
 Width of the border around the tab contents.Allowed values: >= 0
 Default value: 0
 
 <anchor id="GimpColorNotebook--tab-icon-size"/>The "<literal>tab-icon-size</literal>" style property
-  "tab-icon-size"        GtkIconSize           : Read
+GimpColorNotebook:tab-icon-size  "tab-icon-size"        GtkIconSize           : Read
 Size for icons displayed in the tab.Default value: GTK_ICON_SIZE_BUTTON
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorscale.xml b/devel-docs/libgimpwidgets/xml/gimpcolorscale.xml
index acb7124027..2acaa3aab9 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorscale.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorscale.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorScale
+GimpColorScale
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorScaleFancy colored sliders.
+GimpColorScale
+Fancy colored sliders.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -31,24 +34,25 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkRange
-                     +----GtkScale
-                           +----GimpColorScale
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkRange
+                           +----GtkScale
+                                 +----GimpColorScale
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorScale implements
  AtkImplementorIface.
@@ -59,23 +63,23 @@ GimpColorScale implements
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorScale-struct"/>GimpColorScale
+<anchor id="GimpColorScale-struct" role="struct"/>GimpColorScale
 GimpColorScaletypedef struct _GimpColorScale GimpColorScale;
 
 
 
 
-<anchor id="gimp-color-scale-new"/>gimp_color_scale_new ()
+<anchor id="gimp-color-scale-new" role="function"/>gimp_color_scale_new ()
 gimp_color_scale_newGtkWidget*  gimp_color_scale_new            (GtkOrientation orientation,
                                              GimpColorSelectorChannel channel);
 
@@ -93,7 +97,7 @@ Creates a new GimpColorScale
 
 
 
-<anchor id="gimp-color-scale-set-channel"/>gimp_color_scale_set_channel ()
+<anchor id="gimp-color-scale-set-channel" role="function"/>gimp_color_scale_set_channel ()
 gimp_color_scale_set_channelvoid        gimp_color_scale_set_channel    (GimpColorScale *scale,
                                              GimpColorSelectorChannel channel);
 
@@ -109,7 +113,7 @@ Changes the color channel displayed by the scale.
 
 
 
-<anchor id="gimp-color-scale-set-color"/>gimp_color_scale_set_color ()
+<anchor id="gimp-color-scale-set-color" role="function"/>gimp_color_scale_set_color ()
 gimp_color_scale_set_colorvoid        gimp_color_scale_set_color      (GimpColorScale *scale,
                                              const GimpRGB *rgb,
                                              const GimpHSV *hsv);
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorscales.xml b/devel-docs/libgimpwidgets/xml/gimpcolorscales.xml
index 0f389ac415..d760f5f024 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorscales.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorscales.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorScales
+GimpColorScales
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorScalesA GimpColorSelector implementation.
+GimpColorScales
+A GimpColorSelector implementation.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -24,26 +27,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorScales
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorScales
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorScales implements
  AtkImplementorIface.
@@ -54,8 +58,8 @@ GimpColorScales implements
 
 
 
-
-Description
+
+Description
 
 The GimpColorScales widget is an implementation of a GimpColorSelector.
 It shows a group of GimpColorScale widgets that allow to adjust the
@@ -63,10 +67,10 @@ HSV and RGB color channels.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorScales-struct"/>GimpColorScales
+<anchor id="GimpColorScales-struct" role="struct"/>GimpColorScales
 GimpColorScalestypedef struct _GimpColorScales GimpColorScales;
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorselect.xml b/devel-docs/libgimpwidgets/xml/gimpcolorselect.xml
index 6889c9f796..a27c97016c 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorselect.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorselect.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorSelect
+GimpColorSelect
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorSelectA GimpColorSelector implementation.
+GimpColorSelect
+A GimpColorSelector implementation.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -24,26 +27,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorSelect
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorSelect
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorSelect implements
  AtkImplementorIface.
@@ -54,8 +58,8 @@ GimpColorSelect implements
 
 
 
-
-Description
+
+Description
 
 The GimpColorSelect widget is an implementation of a GimpColorSelector.
 It shows a square area that allows to interactively change two color channels
@@ -65,10 +69,10 @@ will then change the other two channels accordingly.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorSelect-struct"/>GimpColorSelect
+<anchor id="GimpColorSelect-struct" role="struct"/>GimpColorSelect
 GimpColorSelecttypedef struct _GimpColorSelect GimpColorSelect;
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorselection.xml b/devel-docs/libgimpwidgets/xml/gimpcolorselection.xml
index 53295d344f..540c974561 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorselection.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorselection.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorSelection
+GimpColorSelection
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorSelectionWidget for doing a color selection.
+GimpColorSelection
+Widget for doing a color selection.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -43,25 +46,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelection
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelection
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorSelection implements
  AtkImplementorIface.
@@ -70,34 +74,34 @@ GimpColorSelection implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "color-changed"
             void        user_function      (GimpColorSelection *gimpcolorselection,
-                                            gpointer user_data);
+                                            gpointer            user_data)               : Run first
 
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorSelection-struct"/>GimpColorSelection
+<anchor id="GimpColorSelection-struct" role="struct"/>GimpColorSelection
 GimpColorSelectiontypedef struct _GimpColorSelection GimpColorSelection;
 
 
 
 
-<anchor id="gimp-color-selection-new"/>gimp_color_selection_new ()
+<anchor id="gimp-color-selection-new" role="function"/>gimp_color_selection_new ()
 gimp_color_selection_newGtkWidget*  gimp_color_selection_new        (void);
 
 Creates a new GimpColorSelection widget.
@@ -108,7 +112,7 @@ Creates a new GimpColorSelection
 
 
 
-<anchor id="gimp-color-selection-set-show-alpha"/>gimp_color_selection_set_show_alpha ()
+<anchor id="gimp-color-selection-set-show-alpha" role="function"/>gimp_color_selection_set_show_alpha ()
 gimp_color_selection_set_show_alphavoid        gimp_color_selection_set_show_alpha
                                             (GimpColorSelection *selection,
                                              gboolean show_alpha);
@@ -125,7 +129,7 @@ Sets the show_alpha property of the selection<
 
 
 
-<anchor id="gimp-color-selection-get-show-alpha"/>gimp_color_selection_get_show_alpha ()
+<anchor id="gimp-color-selection-get-show-alpha" role="function"/>gimp_color_selection_get_show_alpha ()
 gimp_color_selection_get_show_alphagboolean    gimp_color_selection_get_show_alpha
                                             (GimpColorSelection *selection);
 
@@ -140,7 +144,7 @@ Returns the selection's show_alpha
 
 
 
-<anchor id="gimp-color-selection-set-color"/>gimp_color_selection_set_color ()
+<anchor id="gimp-color-selection-set-color" role="function"/>gimp_color_selection_set_color ()
 gimp_color_selection_set_colorvoid        gimp_color_selection_set_color  (GimpColorSelection *selection,
                                              const GimpRGB *color);
 
@@ -156,7 +160,7 @@ Sets the GimpColorSelection
 
 
-<anchor id="gimp-color-selection-get-color"/>gimp_color_selection_get_color ()
+<anchor id="gimp-color-selection-get-color" role="function"/>gimp_color_selection_get_color ()
 gimp_color_selection_get_colorvoid        gimp_color_selection_get_color  (GimpColorSelection *selection,
                                              GimpRGB *color);
 
@@ -172,7 +176,7 @@ This function returns the GimpColorSele
 
 
 
-<anchor id="gimp-color-selection-set-old-color"/>gimp_color_selection_set_old_color ()
+<anchor id="gimp-color-selection-set-old-color" role="function"/>gimp_color_selection_set_old_color ()
 gimp_color_selection_set_old_colorvoid        gimp_color_selection_set_old_color
                                             (GimpColorSelection *selection,
                                              const GimpRGB *color);
@@ -189,7 +193,7 @@ Sets the GimpColorSelection
 
 
-<anchor id="gimp-color-selection-get-old-color"/>gimp_color_selection_get_old_color ()
+<anchor id="gimp-color-selection-get-old-color" role="function"/>gimp_color_selection_get_old_color ()
 gimp_color_selection_get_old_colorvoid        gimp_color_selection_get_old_color
                                             (GimpColorSelection *selection,
                                              GimpRGB *color);
@@ -206,7 +210,7 @@ This function returns the GimpColorSele
 
 
 
-<anchor id="gimp-color-selection-reset"/>gimp_color_selection_reset ()
+<anchor id="gimp-color-selection-reset" role="function"/>gimp_color_selection_reset ()
 gimp_color_selection_resetvoid        gimp_color_selection_reset      (GimpColorSelection *selection);
 
 Sets the GimpColorSelection's current color to its old color.
@@ -218,7 +222,7 @@ Sets the GimpColorSelection
 
 
-<anchor id="gimp-color-selection-color-changed"/>gimp_color_selection_color_changed ()
+<anchor id="gimp-color-selection-color-changed" role="function"/>gimp_color_selection_color_changed ()
 gimp_color_selection_color_changedvoid        gimp_color_selection_color_changed
                                             (GimpColorSelection *selection);
 
@@ -233,11 +237,11 @@ Emits the "color_changed" signal.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorSelection-color-changed"/>The "color-changed" signal
-void        user_function                  (GimpColorSelection *gimpcolorselection,
-                                            gpointer user_data);
+GimpColorSelection::color-changedvoid        user_function                  (GimpColorSelection *gimpcolorselection,
+                                            gpointer            user_data)               : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcolorselector.xml b/devel-docs/libgimpwidgets/xml/gimpcolorselector.xml
index b1e2f7bec2..7b84a036cb 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcolorselector.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcolorselector.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpColorSelector
+GimpColorSelector
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpColorSelectorPluggable GIMP color selector modules.
+GimpColorSelector
+Pluggable GIMP color selector modules.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -49,28 +52,29 @@ enum        GimpColorSelectorChannel
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpColorSelector
-                                       +----GimpColorNotebook
-                                       +----GimpColorScales
-                                       +----GimpColorSelect
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpColorSelector
+                                             +----GimpColorNotebook
+                                             +----GimpColorScales
+                                             +----GimpColorSelect
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpColorSelector implements
  AtkImplementorIface.
@@ -79,55 +83,55 @@ GimpColorSelector implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "channel-changed"
             void        user_function      (GimpColorSelector *gimpcolorselector,
-                                            gint arg1,
-                                            gpointer user_data);
+                                            gint               arg1,
+                                            gpointer           user_data)              : Run first
 "color-changed"
             void        user_function      (GimpColorSelector *gimpcolorselector,
-                                            gpointer arg1,
-                                            gpointer arg2,
-                                            gpointer user_data);
+                                            gpointer           arg1,
+                                            gpointer           arg2,
+                                            gpointer           user_data)              : Run first
 
 
 
 
-
-Description
+
+Description
 
 Functions and definitions for creating pluggable GIMP color
 selector modules.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpColorSelector-struct"/>GimpColorSelector
+<anchor id="GimpColorSelector-struct" role="struct"/>GimpColorSelector
 GimpColorSelectortypedef struct _GimpColorSelector GimpColorSelector;
 
 
 
 
-<anchor id="GIMP-COLOR-SELECTOR-SIZE:CAPS"/>GIMP_COLOR_SELECTOR_SIZE
+<anchor id="GIMP-COLOR-SELECTOR-SIZE:CAPS" role="macro"/>GIMP_COLOR_SELECTOR_SIZE
 GIMP_COLOR_SELECTOR_SIZE#define GIMP_COLOR_SELECTOR_SIZE      150
 
 
 The suggested size for a color area in a GimpColorSelector implementation.
 
 
-<anchor id="GIMP-COLOR-SELECTOR-BAR-SIZE:CAPS"/>GIMP_COLOR_SELECTOR_BAR_SIZE
+<anchor id="GIMP-COLOR-SELECTOR-BAR-SIZE:CAPS" role="macro"/>GIMP_COLOR_SELECTOR_BAR_SIZE
 GIMP_COLOR_SELECTOR_BAR_SIZE#define GIMP_COLOR_SELECTOR_BAR_SIZE  15
 
 
 The suggested width for a color bar in a GimpColorSelector implementation.
 
 
-<anchor id="GimpColorSelectorChannel"/>enum GimpColorSelectorChannel
+<anchor id="GimpColorSelectorChannel" role="enum"/>enum GimpColorSelectorChannel
 GimpColorSelectorChanneltypedef enum
 {
   GIMP_COLOR_SELECTOR_HUE,
@@ -143,44 +147,44 @@ The suggested width for a color bar in a 
 
-GIMP_COLOR_SELECTOR_HUE
+GIMP_COLOR_SELECTOR_HUE
 the hue channel
 
 
 
-GIMP_COLOR_SELECTOR_SATURATION
+GIMP_COLOR_SELECTOR_SATURATION
 the saturation channel
 
 
 
-GIMP_COLOR_SELECTOR_VALUE
+GIMP_COLOR_SELECTOR_VALUE
 the value channel
 
 
 
-GIMP_COLOR_SELECTOR_RED
+GIMP_COLOR_SELECTOR_RED
 the red channel
 
 
 
-GIMP_COLOR_SELECTOR_GREEN
+GIMP_COLOR_SELECTOR_GREEN
 the green channel
 
 
 
-GIMP_COLOR_SELECTOR_BLUE
+GIMP_COLOR_SELECTOR_BLUE
 the blue channel
 
 
 
-GIMP_COLOR_SELECTOR_ALPHA
+GIMP_COLOR_SELECTOR_ALPHA
 the alpha channel
 
 
 
 
 
-<anchor id="gimp-color-selector-new"/>gimp_color_selector_new ()
+<anchor id="gimp-color-selector-new" role="function"/>gimp_color_selector_new ()
 gimp_color_selector_newGtkWidget*  gimp_color_selector_new         (GType selector_type,
                                              const GimpRGB *rgb,
                                              const GimpHSV *hsv,
@@ -206,7 +210,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-set-toggles-visible"/>gimp_color_selector_set_toggles_visible ()
+<anchor id="gimp-color-selector-set-toggles-visible" role="function"/>gimp_color_selector_set_toggles_visible ()
 gimp_color_selector_set_toggles_visiblevoid        gimp_color_selector_set_toggles_visible
                                             (GimpColorSelector *selector,
                                              gboolean visible);
@@ -223,7 +227,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-set-toggles-sensitive"/>gimp_color_selector_set_toggles_sensitive ()
+<anchor id="gimp-color-selector-set-toggles-sensitive" role="function"/>gimp_color_selector_set_toggles_sensitive ()
 gimp_color_selector_set_toggles_sensitivevoid        gimp_color_selector_set_toggles_sensitive
                                             (GimpColorSelector *selector,
                                              gboolean sensitive);
@@ -240,7 +244,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-set-show-alpha"/>gimp_color_selector_set_show_alpha ()
+<anchor id="gimp-color-selector-set-show-alpha" role="function"/>gimp_color_selector_set_show_alpha ()
 gimp_color_selector_set_show_alphavoid        gimp_color_selector_set_show_alpha
                                             (GimpColorSelector *selector,
                                              gboolean show_alpha);
@@ -257,7 +261,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-set-color"/>gimp_color_selector_set_color ()
+<anchor id="gimp-color-selector-set-color" role="function"/>gimp_color_selector_set_color ()
 gimp_color_selector_set_colorvoid        gimp_color_selector_set_color   (GimpColorSelector *selector,
                                              const GimpRGB *rgb,
                                              const GimpHSV *hsv);
@@ -277,7 +281,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-set-channel"/>gimp_color_selector_set_channel ()
+<anchor id="gimp-color-selector-set-channel" role="function"/>gimp_color_selector_set_channel ()
 gimp_color_selector_set_channelvoid        gimp_color_selector_set_channel (GimpColorSelector *selector,
                                              GimpColorSelectorChannel channel);
 
@@ -293,7 +297,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-color-changed"/>gimp_color_selector_color_changed ()
+<anchor id="gimp-color-selector-color-changed" role="function"/>gimp_color_selector_color_changed ()
 gimp_color_selector_color_changedvoid        gimp_color_selector_color_changed
                                             (GimpColorSelector *selector);
 
@@ -306,7 +310,7 @@ The suggested width for a color bar in a 
 
 
-<anchor id="gimp-color-selector-channel-changed"/>gimp_color_selector_channel_changed ()
+<anchor id="gimp-color-selector-channel-changed" role="function"/>gimp_color_selector_channel_changed ()
 gimp_color_selector_channel_changedvoid        gimp_color_selector_channel_changed
                                             (GimpColorSelector *selector);
 
@@ -321,12 +325,12 @@ The suggested width for a color bar in a 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpColorSelector-channel-changed"/>The "channel-changed" signal
-void        user_function                  (GimpColorSelector *gimpcolorselector,
-                                            gint arg1,
-                                            gpointer user_data);
+GimpColorSelector::channel-changedvoid        user_function                  (GimpColorSelector *gimpcolorselector,
+                                            gint               arg1,
+                                            gpointer           user_data)              : Run first
 
 
 
@@ -340,10 +344,10 @@ The suggested width for a color bar in a user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpColorSelector-color-changed"/>The "color-changed" signal
-void        user_function                  (GimpColorSelector *gimpcolorselector,
-                                            gpointer arg1,
-                                            gpointer arg2,
-                                            gpointer user_data);
+GimpColorSelector::color-changedvoid        user_function                  (GimpColorSelector *gimpcolorselector,
+                                            gpointer           arg1,
+                                            gpointer           arg2,
+                                            gpointer           user_data)              : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpcontroller.xml b/devel-docs/libgimpwidgets/xml/gimpcontroller.xml
index e7691b34ba..dcd7cfb64f 100644
--- a/devel-docs/libgimpwidgets/xml/gimpcontroller.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpcontroller.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpController
+GimpController
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpControllerPluggable GIMP input controller modules.
+GimpController
+Pluggable GIMP input controller modules.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -38,8 +41,8 @@ const gchar* 
+Object Hierarchy
 
 
   GObject
@@ -52,8 +55,8 @@ const gchar* 
+Properties
 
 
   "name"                 gchararray            : Read / Write / Construct
@@ -61,28 +64,28 @@ const gchar* 
+Signals
 
 
 "event"     gboolean    user_function      (GimpController *gimpcontroller,
-                                            gpointer arg1,
-                                            gpointer user_data);
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run last
 
 
 
 
-
-Description
+
+Description
 
 An abstract interface for implementing arbitrary input controllers.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpControllerEventType"/>enum GimpControllerEventType
+<anchor id="GimpControllerEventType" role="enum"/>enum GimpControllerEventType
 GimpControllerEventTypetypedef enum
 {
   GIMP_CONTROLLER_EVENT_TRIGGER,
@@ -93,7 +96,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="GimpControllerEventAny"/>GimpControllerEventAny
+<anchor id="GimpControllerEventAny" role="struct"/>GimpControllerEventAny
 GimpControllerEventAnytypedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
@@ -104,7 +107,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="GimpControllerEventTrigger"/>GimpControllerEventTrigger
+<anchor id="GimpControllerEventTrigger" role="struct"/>GimpControllerEventTrigger
 GimpControllerEventTriggertypedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
@@ -115,7 +118,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="GimpControllerEventValue"/>GimpControllerEventValue
+<anchor id="GimpControllerEventValue" role="struct"/>GimpControllerEventValue
 GimpControllerEventValuetypedef struct {
   GimpControllerEventType  type;
   GimpController          *source;
@@ -127,7 +130,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="GimpControllerEvent"/>union GimpControllerEvent
+<anchor id="GimpControllerEvent" role="union"/>union GimpControllerEvent
 GimpControllerEventunion GimpControllerEvent
 {
   GimpControllerEventType    type;
@@ -140,13 +143,13 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="GimpController-struct"/>GimpController
+<anchor id="GimpController-struct" role="struct"/>GimpController
 GimpControllertypedef struct _GimpController GimpController;
 
 
 
 
-<anchor id="gimp-controller-new"/>gimp_controller_new ()
+<anchor id="gimp-controller-new" role="function"/>gimp_controller_new ()
 gimp_controller_newGimpController* gimp_controller_new         (GType controller_type);
 
 
@@ -160,7 +163,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="gimp-controller-get-n-events"/>gimp_controller_get_n_events ()
+<anchor id="gimp-controller-get-n-events" role="function"/>gimp_controller_get_n_events ()
 gimp_controller_get_n_eventsgint        gimp_controller_get_n_events    (GimpController *controller);
 
 
@@ -174,7 +177,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="gimp-controller-get-event-name"/>gimp_controller_get_event_name ()
+<anchor id="gimp-controller-get-event-name" role="function"/>gimp_controller_get_event_name ()
 gimp_controller_get_event_nameconst gchar* gimp_controller_get_event_name (GimpController *controller,
                                              gint event_id);
 
@@ -192,7 +195,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="gimp-controller-get-event-blurb"/>gimp_controller_get_event_blurb ()
+<anchor id="gimp-controller-get-event-blurb" role="function"/>gimp_controller_get_event_blurb ()
 gimp_controller_get_event_blurbconst gchar* gimp_controller_get_event_blurb
                                             (GimpController *controller,
                                              gint event_id);
@@ -211,7 +214,7 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-<anchor id="gimp-controller-event"/>gimp_controller_event ()
+<anchor id="gimp-controller-event" role="function"/>gimp_controller_event ()
 gimp_controller_eventgboolean    gimp_controller_event           (GimpController *controller,
                                              const GimpControllerEvent *event);
 
@@ -230,25 +233,25 @@ An abstract interface for implementing arbitrary input controllers.
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpController--name"/>The "<literal>name</literal>" property
-  "name"                 gchararray            : Read / Write / Construct
+GimpController:name  "name"                 gchararray            : Read / Write / Construct
 Default value: "Unnamed Controller"
 
 <anchor id="GimpController--state"/>The "<literal>state</literal>" property
-  "state"                gchararray            : Read / Write / Construct
+GimpController:state  "state"                gchararray            : Read / Write / Construct
 Default value: "Unknown"
 
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpController-event"/>The "event" signal
-gboolean    user_function                  (GimpController *gimpcontroller,
-                                            gpointer arg1,
-                                            gpointer user_data);
+GimpController::eventgboolean    user_function                  (GimpController *gimpcontroller,
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run last
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpdialog.xml b/devel-docs/libgimpwidgets/xml/gimpdialog.xml
index 6314722c40..9a65e04cd3 100644
--- a/devel-docs/libgimpwidgets/xml/gimpdialog.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpdialog.xml
@@ -4,17 +4,20 @@
 
 
 
-GimpDialog
+GimpDialog
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpDialogConstructors for GtkDialog's and action_areas as well as other
+GimpDialog
+Constructors for GtkDialog's and action_areas as well as other
 dialog-related stuff.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -43,26 +46,27 @@ dialog-related stuff.
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkWindow
-                                 +----GtkDialog
-                                       +----GimpDialog
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkWindow
+                                       +----GtkDialog
+                                             +----GimpDialog
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpDialog implements
  AtkImplementorIface.
@@ -70,8 +74,8 @@ GimpDialog implements
 
 
 
-
-Properties
+
+Properties
 
 
   "help-func"            gpointer              : Read / Write / Construct Only
@@ -81,23 +85,23 @@ GimpDialog implements
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpDialog-struct"/>GimpDialog
+<anchor id="GimpDialog-struct" role="struct"/>GimpDialog
 GimpDialogtypedef struct _GimpDialog GimpDialog;
 
 
 
 
-<anchor id="gimp-dialog-new"/>gimp_dialog_new ()
+<anchor id="gimp-dialog-new" role="function"/>gimp_dialog_new ()
 gimp_dialog_newGtkWidget*  gimp_dialog_new                 (const gchar *title,
                                              const gchar *role,
                                              GtkWidget *parent,
@@ -139,14 +143,14 @@ action_area buttons see gt
       The help_id which will be passed to help_func.
 
 ... :
-          A NULL-terminated va_list destribing the
+          A NULL-terminated va_list destribing the
                action_area buttons.
 
 Returns : A GimpDialog.
 
 
 
-<anchor id="gimp-dialog-new-valist"/>gimp_dialog_new_valist ()
+<anchor id="gimp-dialog-new-valist" role="function"/>gimp_dialog_new_valist ()
 gimp_dialog_new_valistGtkWidget*  gimp_dialog_new_valist          (const gchar *title,
                                              const gchar *role,
                                              GtkWidget *parent,
@@ -173,7 +177,7 @@ action_area buttons see gt
                gtk_window_set_role().
 
 parent :
-       The parent widget of this dialog or NULL.
+       The parent widget of this dialog or NULL.
 
 flags :
         The flags (see the GtkDialog documentation).
@@ -191,7 +195,7 @@ action_area buttons see gt
 
 
 
-<anchor id="gimp-dialog-add-buttons-valist"/>gimp_dialog_add_buttons_valist ()
+<anchor id="gimp-dialog-add-buttons-valist" role="function"/>gimp_dialog_add_buttons_valist ()
 gimp_dialog_add_buttons_valistvoid        gimp_dialog_add_buttons_valist  (GimpDialog *dialog,
                                              va_list args);
 
@@ -208,7 +212,7 @@ except it takes a va_list instead of '...'
 
 
 
-<anchor id="gimp-dialog-run"/>gimp_dialog_run ()
+<anchor id="gimp-dialog-run" role="function"/>gimp_dialog_run ()
 gimp_dialog_rungint        gimp_dialog_run                 (GimpDialog *dialog);
 
 This function does exactly the same as gtk_dialog_run() except it
@@ -223,7 +227,7 @@ does not make the dialog modal while the GMainLo
 
 
 
-<anchor id="gimp-dialogs-show-help-button"/>gimp_dialogs_show_help_button ()
+<anchor id="gimp-dialogs-show-help-button" role="function" condition="since:GIMP 2.2"/>gimp_dialogs_show_help_button ()
 gimp_dialogs_show_help_buttonvoid        gimp_dialogs_show_help_button   (gboolean show);
 
 This function is for internal use only.
@@ -237,13 +241,13 @@ This function is for internal use only.
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpDialog--help-func"/>The "<literal>help-func</literal>" property
-  "help-func"            gpointer              : Read / Write / Construct Only
+GimpDialog:help-func  "help-func"            gpointer              : Read / Write / Construct Only
 
 <anchor id="GimpDialog--help-id"/>The "<literal>help-id</literal>" property
-  "help-id"              gchararray            : Read / Write / Construct Only
+GimpDialog:help-id  "help-id"              gchararray            : Read / Write / Construct Only
 Default value: NULL
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpfileentry.xml b/devel-docs/libgimpwidgets/xml/gimpfileentry.xml
index f239ab965d..5669e5bb1e 100644
--- a/devel-docs/libgimpwidgets/xml/gimpfileentry.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpfileentry.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpFileEntry
+GimpFileEntry
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpFileEntryWidget for entering a filename.
+GimpFileEntry
+Widget for entering a filename.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -31,25 +34,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkHBox
-                                 +----GimpFileEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkHBox
+                                       +----GimpFileEntry
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpFileEntry implements
  AtkImplementorIface.
@@ -58,19 +62,19 @@ GimpFileEntry implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "filename-changed"
             void        user_function      (GimpFileEntry *arg0,
-                                            gpointer user_data);
+                                            gpointer       user_data)      : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget is used to enter filenames or directories.
 
@@ -93,16 +97,16 @@ will be emitted.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpFileEntry-struct"/>GimpFileEntry
+<anchor id="GimpFileEntry-struct" role="struct"/>GimpFileEntry
 GimpFileEntrytypedef struct _GimpFileEntry GimpFileEntry;
 
 
 
 
-<anchor id="gimp-file-entry-new"/>gimp_file_entry_new ()
+<anchor id="gimp-file-entry-new" role="function"/>gimp_file_entry_new ()
 gimp_file_entry_newGtkWidget*  gimp_file_entry_new             (const gchar *title,
                                              const gchar *filename,
                                              gboolean dir_only,
@@ -119,17 +123,17 @@ Creates a new GimpFileEntry wi
     The initial filename.
 
 dir_only :
-    TRUE if the file entry should accept directories only.
+    TRUE if the file entry should accept directories only.
 
 check_valid :
- TRUE if the widget should check if the entered file
+ TRUE if the widget should check if the entered file
               really exists.
 
 Returns : A pointer to the new GimpFileEntry widget.
 
 
 
-<anchor id="gimp-file-entry-get-filename"/>gimp_file_entry_get_filename ()
+<anchor id="gimp-file-entry-get-filename" role="function"/>gimp_file_entry_get_filename ()
 gimp_file_entry_get_filenamegchar*      gimp_file_entry_get_filename    (GimpFileEntry *entry);
 
 Note that you have to g_free() the returned string.
@@ -143,11 +147,11 @@ Note that you have to g_free()
 
 
-<anchor id="gimp-file-entry-set-filename"/>gimp_file_entry_set_filename ()
+<anchor id="gimp-file-entry-set-filename" role="function"/>gimp_file_entry_set_filename ()
 gimp_file_entry_set_filenamevoid        gimp_file_entry_set_filename    (GimpFileEntry *entry,
                                              const gchar *filename);
 
-If you specified check_valid as TRUE in gimp_file_entry_new()
+If you specified check_valid as TRUE in gimp_file_entry_new()
 the GimpFileEntry will immediately check the validity of the file
 name.
 
@@ -163,11 +167,11 @@ name.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpFileEntry-filename-changed"/>The "filename-changed" signal
-void        user_function                  (GimpFileEntry *arg0,
-                                            gpointer user_data);
+GimpFileEntry::filename-changedvoid        user_function                  (GimpFileEntry *arg0,
+                                            gpointer       user_data)      : Run first
 
 This signal is emitted whenever the user changes the filename.
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpframe.xml b/devel-docs/libgimpwidgets/xml/gimpframe.xml
index ea0958887d..78c639b870 100644
--- a/devel-docs/libgimpwidgets/xml/gimpframe.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpframe.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpFrame
+GimpFrame
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpFrameA widget providing a HIG-compliant subclass of GtkFrame.
+GimpFrame
+A widget providing a HIG-compliant subclass of GtkFrame.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -25,25 +28,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkFrame
-                                 +----GimpFrame
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkFrame
+                                       +----GimpFrame
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpFrame implements
  AtkImplementorIface.
@@ -51,8 +55,8 @@ GimpFrame implements
 
 
 
-
-Style Properties
+
+Style Properties
 
 
   "label-bold"           gboolean              : Read
@@ -62,23 +66,23 @@ GimpFrame implements
 
 
 
-
-Description
+
+Description
 
 A widget providing a HIG-compliant subclass of GtkFrame.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpFrame-struct"/>GimpFrame
+<anchor id="GimpFrame-struct" role="struct"/>GimpFrame
 GimpFrametypedef struct _GimpFrame GimpFrame;
 
 
 
 
-<anchor id="gimp-frame-new"/>gimp_frame_new ()
+<anchor id="gimp-frame-new" role="function" condition="since:GIMP 2.2"/>gimp_frame_new ()
 gimp_frame_newGtkWidget*  gimp_frame_new                  (const gchar *label);
 
 Creates a GimpFrame widget. A GimpFrame is a HIG-compliant
@@ -90,7 +94,7 @@ the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).
 
 
 label :
- text to set as the frame's title label (or NULL for no title)
+ text to set as the frame's title label (or NULL for no title)
 
 Returns : a new GimpFrame widget
 
@@ -99,14 +103,14 @@ the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).
 
 
 
-
-Style Properties
+
+Style Property Details
 <anchor id="GimpFrame--label-bold"/>The "<literal>label-bold</literal>" style property
-  "label-bold"           gboolean              : Read
+GimpFrame:label-bold  "label-bold"           gboolean              : Read
 Default value: TRUE
 
 <anchor id="GimpFrame--label-spacing"/>The "<literal>label-spacing</literal>" style property
-  "label-spacing"        gint                  : Read
+GimpFrame:label-spacing  "label-spacing"        gint                  : Read
 Allowed values: >= 0
 Default value: 6
 
diff --git a/devel-docs/libgimpwidgets/xml/gimphelpui.xml b/devel-docs/libgimpwidgets/xml/gimphelpui.xml
index 87802086b6..42f906101a 100644
--- a/devel-docs/libgimpwidgets/xml/gimphelpui.xml
+++ b/devel-docs/libgimpwidgets/xml/gimphelpui.xml
@@ -4,17 +4,20 @@
 
 
 
-GimpHelpUI
+GimpHelpUI
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpHelpUIFunctions for setting GtkTooltips and help identifier used by GIMP help
+GimpHelpUI
+Functions for setting GtkTooltips and help identifier used by GIMP help
 system.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -47,17 +50,17 @@ system.
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpHelpFunc"/>GimpHelpFunc ()
+<anchor id="GimpHelpFunc" role="function"/>GimpHelpFunc ()
 GimpHelpFuncvoid        (*GimpHelpFunc)                 (const gchar *help_id,
                                              gpointer help_data);
 
@@ -92,14 +95,14 @@ the help.
 
 
 
-<anchor id="GIMP-HELP-ID:CAPS"/>GIMP_HELP_ID
+<anchor id="GIMP-HELP-ID:CAPS" role="macro"/>GIMP_HELP_ID
 GIMP_HELP_ID#define GIMP_HELP_ID (gimp_help_id_quark ())
 
 
 Since: GIMP 2.2
 
 
-<anchor id="gimp-help-enable-tooltips"/>gimp_help_enable_tooltips ()
+<anchor id="gimp-help-enable-tooltips" role="function"/>gimp_help_enable_tooltips ()
 gimp_help_enable_tooltipsvoid        gimp_help_enable_tooltips       (void);
 
 This function calls gtk_tooltips_enable().
@@ -107,7 +110,7 @@ This function calls gtk_tooltips_e
 
 
 
-<anchor id="gimp-help-disable-tooltips"/>gimp_help_disable_tooltips ()
+<anchor id="gimp-help-disable-tooltips" role="function"/>gimp_help_disable_tooltips ()
 gimp_help_disable_tooltipsvoid        gimp_help_disable_tooltips      (void);
 
 This function calls gtk_tooltips_disable().
@@ -115,7 +118,7 @@ This function calls gtk_tooltips_
 
 
 
-<anchor id="gimp-standard-help-func"/>gimp_standard_help_func ()
+<anchor id="gimp-standard-help-func" role="function"/>gimp_standard_help_func ()
 gimp_standard_help_funcvoid        gimp_standard_help_func         (const gchar *help_id,
                                              gpointer help_data);
 
@@ -132,7 +135,7 @@ This is the standard GIMP help function which does nothing but calling
 
 
 
-<anchor id="gimp-help-connect"/>gimp_help_connect ()
+<anchor id="gimp-help-connect" role="function"/>gimp_help_connect ()
 gimp_help_connectvoid        gimp_help_connect               (GtkWidget *widget,
                                              GimpHelpFunc help_func,
                                              const gchar *help_id,
@@ -159,7 +162,7 @@ constructors. You only have to call it for windows/dialogs you created
 
 
 
-<anchor id="gimp-help-set-help-data"/>gimp_help_set_help_data ()
+<anchor id="gimp-help-set-help-data" role="function"/>gimp_help_set_help_data ()
 gimp_help_set_help_datavoid        gimp_help_set_help_data         (GtkWidget *widget,
                                              const gchar *tooltip,
                                              const gchar *help_id);
@@ -179,14 +182,14 @@ a visible tooltip.
   The GtkWidget you want to set a tooltip and/or help_id for.
 
 tooltip :
- The text for this widget's tooltip (or NULL).
+ The text for this widget's tooltip (or NULL).
 
 help_id :
  The help_id for the GtkTipsQuery tooltips inspector.
 
 
 
-<anchor id="gimp-context-help"/>gimp_context_help ()
+<anchor id="gimp-context-help" role="function"/>gimp_context_help ()
 gimp_context_helpvoid        gimp_context_help               (GtkWidget *widget);
 
 This function invokes the context help inspector.
diff --git a/devel-docs/libgimpwidgets/xml/gimpintcombobox.xml b/devel-docs/libgimpwidgets/xml/gimpintcombobox.xml
index 06c3176695..f66e53f226 100644
--- a/devel-docs/libgimpwidgets/xml/gimpintcombobox.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpintcombobox.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpIntComboBox
+GimpIntComboBox
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpIntComboBoxA widget providing a popup menu of integer values (e.g. enums).
+GimpIntComboBox
+A widget providing a popup menu of integer values (e.g. enums).
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -44,25 +47,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkComboBox
-                                 +----GimpIntComboBox
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkComboBox
+                                       +----GimpIntComboBox
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpIntComboBox implements
  AtkImplementorIface,  GtkCellEditable and  GtkCellLayout.
@@ -73,29 +77,29 @@ GimpIntComboBox implements
 
 
 
-
-Description
+
+Description
 
 A widget providing a popup menu of integer values (e.g. enums).
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpIntComboBox-struct"/>GimpIntComboBox
+<anchor id="GimpIntComboBox-struct" role="struct"/>GimpIntComboBox
 GimpIntComboBoxtypedef struct _GimpIntComboBox GimpIntComboBox;
 
 
 
 
-<anchor id="gimp-int-combo-box-new"/>gimp_int_combo_box_new ()
+<anchor id="gimp-int-combo-box-new" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_new ()
 gimp_int_combo_box_newGtkWidget*  gimp_int_combo_box_new          (const gchar *first_label,
                                              gint first_value,
                                              ...);
 
 Creates a GtkComboBox that has integer values associated with each
-item. The items to fill the combo box with are specified as a NULL
+item. The items to fill the combo box with are specified as a NULL
 terminated list of label/value pairs.
 
 
@@ -107,7 +111,7 @@ terminated list of label/value pairs.
  the value of the first item
 
 ... :
- a NULL terminated list of more label, value pairs
+ a NULL terminated list of more label, value pairs
 
 Returns : a new GimpIntComboBox.
 
@@ -115,7 +119,7 @@ terminated list of label/value pairs.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-combo-box-new-valist"/>gimp_int_combo_box_new_valist ()
+<anchor id="gimp-int-combo-box-new-valist" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_new_valist ()
 gimp_int_combo_box_new_valistGtkWidget*  gimp_int_combo_box_new_valist   (const gchar *first_label,
                                              gint first_value,
                                              va_list values);
@@ -140,7 +144,7 @@ label/value pairs. Probably only useful for language bindings.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-combo-box-new-array"/>gimp_int_combo_box_new_array ()
+<anchor id="gimp-int-combo-box-new-array" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_new_array ()
 gimp_int_combo_box_new_arrayGtkWidget*  gimp_int_combo_box_new_array    (gint n_values,
                                              const gchar *labels[]);
 
@@ -161,7 +165,7 @@ The array indices are used as values.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-combo-box-prepend"/>gimp_int_combo_box_prepend ()
+<anchor id="gimp-int-combo-box-prepend" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_prepend ()
 gimp_int_combo_box_prependvoid        gimp_int_combo_box_prepend      (GimpIntComboBox *combo_box,
                                              ...);
 
@@ -183,7 +187,7 @@ The column number must be taken from the enum gimp_int_combo_box_append ()
+<anchor id="gimp-int-combo-box-append" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_append ()
 gimp_int_combo_box_appendvoid        gimp_int_combo_box_append       (GimpIntComboBox *combo_box,
                                              ...);
 
@@ -205,7 +209,7 @@ The column number must be taken from the enum gimp_int_combo_box_set_active ()
+<anchor id="gimp-int-combo-box-set-active" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_set_active ()
 gimp_int_combo_box_set_activegboolean    gimp_int_combo_box_set_active   (GimpIntComboBox *combo_box,
                                              gint value);
 
@@ -220,14 +224,14 @@ selected item in the combo_box.
 value :
      an integer value
 
-Returns : TRUE on success or FALSE if there was no item for
+Returns : TRUE on success or FALSE if there was no item for
               this value.
 
 
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-combo-box-get-active"/>gimp_int_combo_box_get_active ()
+<anchor id="gimp-int-combo-box-get-active" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_get_active ()
 gimp_int_combo_box_get_activegboolean    gimp_int_combo_box_get_active   (GimpIntComboBox *combo_box,
                                              gint *value);
 
@@ -241,14 +245,14 @@ Retrieves the value of the selected (active) item in the combo_box
value :
      return location for the integer value
 
-Returns : TRUE if value has been set or FALSE if no item was
+Returns : TRUE if value has been set or FALSE if no item was
               active.
 
 
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-combo-box-connect"/>gimp_int_combo_box_connect ()
+<anchor id="gimp-int-combo-box-connect" role="function" condition="since:GIMP 2.2"/>gimp_int_combo_box_connect ()
 gimp_int_combo_box_connectgulong      gimp_int_combo_box_connect      (GimpIntComboBox *combo_box,
                                              gint value,
                                              GCallback callback,
diff --git a/devel-docs/libgimpwidgets/xml/gimpintstore.xml b/devel-docs/libgimpwidgets/xml/gimpintstore.xml
index 3d3d5fba69..7354d7bc2f 100644
--- a/devel-docs/libgimpwidgets/xml/gimpintstore.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpintstore.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpIntStore
+GimpIntStore
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpIntStoreA model for integer based name-value pairs (e.g. enums)
+GimpIntStore
+A model for integer based name-value pairs (e.g. enums)
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -29,8 +32,8 @@ enum        GimpIntStoreColumns;
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
@@ -42,8 +45,8 @@ enum        GimpIntStoreColumns;
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpIntStore implements
  GtkTreeModel,  GtkTreeDragSource,  GtkTreeDragDest and  GtkTreeSortable.
@@ -54,23 +57,23 @@ GimpIntStore implements
 
 
 
-
-Description
+
+Description
 
 A model for integer based name-value pairs (e.g. enums)
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpIntStore-struct"/>GimpIntStore
+<anchor id="GimpIntStore-struct" role="struct"/>GimpIntStore
 GimpIntStoretypedef struct _GimpIntStore GimpIntStore;
 
 
 
 
-<anchor id="GimpIntStoreColumns"/>enum GimpIntStoreColumns
+<anchor id="GimpIntStoreColumns" role="enum"/>enum GimpIntStoreColumns
 GimpIntStoreColumnstypedef enum
 {
   GIMP_INT_STORE_VALUE,
@@ -85,7 +88,7 @@ A model for integer based name-value pairs (e.g. enums)
 
 
 
-<anchor id="gimp-int-store-new"/>gimp_int_store_new ()
+<anchor id="gimp-int-store-new" role="function" condition="since:GIMP 2.2"/>gimp_int_store_new ()
 gimp_int_store_newGtkListStore* gimp_int_store_new            (void);
 
 Creates a GtkListStore with a number of useful columns.
@@ -100,7 +103,7 @@ are identified using an integer value.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-int-store-lookup-by-value"/>gimp_int_store_lookup_by_value ()
+<anchor id="gimp-int-store-lookup-by-value" role="function" condition="since:GIMP 2.2"/>gimp_int_store_lookup_by_value ()
 gimp_int_store_lookup_by_valuegboolean    gimp_int_store_lookup_by_value  (GtkTreeModel *model,
                                              gint value,
                                              GtkTreeIter *iter);
@@ -118,8 +121,8 @@ Iterate over the model looking for valueiter :
   return location for the iter of the given value
 
-Returns : TRUE if the value has been located and iter is
-              valid, FALSE otherwise.
+Returns : TRUE if the value has been located and iter is
+              valid, FALSE otherwise.
 
 
 Since  GIMP 2.2
diff --git a/devel-docs/libgimpwidgets/xml/gimpmemsizeentry.xml b/devel-docs/libgimpwidgets/xml/gimpmemsizeentry.xml
index acbc61b4e3..eca2f4a6e1 100644
--- a/devel-docs/libgimpwidgets/xml/gimpmemsizeentry.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpmemsizeentry.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpMemsizeEntry
+GimpMemsizeEntry
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpMemsizeEntryA composite widget that allows to enter a memory size.
+GimpMemsizeEntry
+A composite widget that allows to enter a memory size.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -30,25 +33,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkHBox
-                                 +----GimpMemsizeEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkHBox
+                                       +----GimpMemsizeEntry
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpMemsizeEntry implements
  AtkImplementorIface.
@@ -57,19 +61,19 @@ GimpMemsizeEntry implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "value-changed"
             void        user_function      (GimpMemsizeEntry *gimpmemsizeentry,
-                                            gpointer user_data);
+                                            gpointer          user_data)             : Run first
 
 
 
 
-
-Description
+
+Description
 
 Similar to a GimpSizeEntry but instead of lengths, this widget is used to let
 the user enter memory sizes. An option menu allows to switch between
@@ -77,16 +81,16 @@ Kilobytes, Megabytes and Gigabytes. Used in the GIMP preferences dialog.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpMemsizeEntry-struct"/>GimpMemsizeEntry
+<anchor id="GimpMemsizeEntry-struct" role="struct"/>GimpMemsizeEntry
 GimpMemsizeEntrytypedef struct _GimpMemsizeEntry GimpMemsizeEntry;
 
 The GimpSizeEntry struct is considered private.
 
 
-<anchor id="gimp-memsize-entry-new"/>gimp_memsize_entry_new ()
+<anchor id="gimp-memsize-entry-new" role="function"/>gimp_memsize_entry_new ()
 gimp_memsize_entry_newGtkWidget*  gimp_memsize_entry_new          (guint64 value,
                                              guint64 lower,
                                              guint64 upper);
@@ -109,7 +113,7 @@ and a GtkOptionMenu all setup
 
 
 
-<anchor id="gimp-memsize-entry-set-value"/>gimp_memsize_entry_set_value ()
+<anchor id="gimp-memsize-entry-set-value" role="function"/>gimp_memsize_entry_set_value ()
 gimp_memsize_entry_set_valuevoid        gimp_memsize_entry_set_value    (GimpMemsizeEntry *entry,
                                              guint64 value);
 
@@ -126,7 +130,7 @@ the value to full Kilobytes.
 
 
 
-<anchor id="gimp-memsize-entry-get-value"/>gimp_memsize_entry_get_value ()
+<anchor id="gimp-memsize-entry-get-value" role="function"/>gimp_memsize_entry_get_value ()
 gimp_memsize_entry_get_valueguint64     gimp_memsize_entry_get_value    (GimpMemsizeEntry *entry);
 
 Retrieves the current value from a GimpMemsizeEntry.
@@ -142,11 +146,11 @@ Retrieves the current value from a GimpMe
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpMemsizeEntry-value-changed"/>The "value-changed" signal
-void        user_function                  (GimpMemsizeEntry *gimpmemsizeentry,
-                                            gpointer user_data);
+GimpMemsizeEntry::value-changedvoid        user_function                  (GimpMemsizeEntry *gimpmemsizeentry,
+                                            gpointer          user_data)             : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpoffsetarea.xml b/devel-docs/libgimpwidgets/xml/gimpoffsetarea.xml
index 78a5dfd39c..4a169a651e 100644
--- a/devel-docs/libgimpwidgets/xml/gimpoffsetarea.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpoffsetarea.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpOffsetArea
+GimpOffsetArea
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpOffsetAreaWidget to control image offsets.
+GimpOffsetArea
+Widget to control image offsets.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -34,23 +37,24 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpOffsetArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpOffsetArea
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpOffsetArea implements
  AtkImplementorIface.
@@ -59,36 +63,36 @@ GimpOffsetArea implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "offsets-changed"
             void        user_function      (GimpOffsetArea *gimpoffsetarea,
-                                            gint arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+                                            gint            arg1,
+                                            gint            arg2,
+                                            gpointer        user_data)           : Run first
 
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpOffsetArea-struct"/>GimpOffsetArea
+<anchor id="GimpOffsetArea-struct" role="struct"/>GimpOffsetArea
 GimpOffsetAreatypedef struct _GimpOffsetArea GimpOffsetArea;
 
 
 
 
-<anchor id="gimp-offset-area-new"/>gimp_offset_area_new ()
+<anchor id="gimp-offset-area-new" role="function"/>gimp_offset_area_new ()
 gimp_offset_area_newGtkWidget*  gimp_offset_area_new            (gint orig_width,
                                              gint orig_height);
 
@@ -108,13 +112,13 @@ specify the new offsets.
 
 
 
-<anchor id="gimp-offset-area-set-size"/>gimp_offset_area_set_size ()
+<anchor id="gimp-offset-area-set-size" role="function"/>gimp_offset_area_set_size ()
 gimp_offset_area_set_sizevoid        gimp_offset_area_set_size       (GimpOffsetArea *offset_area,
                                              gint width,
                                              gint height);
 
 Sets the size of the image/drawable displayed by the GimpOffsetArea.
-If the offsets change as a result of this change, the offsets_changed
+If the offsets change as a result of this change, the offsets_changed
 signal is emitted.
 
 
@@ -130,13 +134,13 @@ signal is emitted.
 
 
 
-<anchor id="gimp-offset-area-set-offsets"/>gimp_offset_area_set_offsets ()
+<anchor id="gimp-offset-area-set-offsets" role="function"/>gimp_offset_area_set_offsets ()
 gimp_offset_area_set_offsetsvoid        gimp_offset_area_set_offsets    (GimpOffsetArea *offset_area,
                                              gint offset_x,
                                              gint offset_y);
 
 Sets the offsets of the image/drawable displayed by the GimpOffsetArea.
-It does not emit the offsets_changed signal.
+It does not emit the offsets_changed signal.
 
 
 
@@ -151,7 +155,7 @@ It does not emit the offsets_changed signal.
 
 
 
-<anchor id="gimp-offset-area-set-pixbuf"/>gimp_offset_area_set_pixbuf ()
+<anchor id="gimp-offset-area-set-pixbuf" role="function" condition="since:GIMP 2.2"/>gimp_offset_area_set_pixbuf ()
 gimp_offset_area_set_pixbufvoid        gimp_offset_area_set_pixbuf     (GimpOffsetArea *offset_area,
                                              GdkPixbuf *pixbuf);
 
@@ -171,13 +175,13 @@ is being offset.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpOffsetArea-offsets-changed"/>The "offsets-changed" signal
-void        user_function                  (GimpOffsetArea *gimpoffsetarea,
-                                            gint arg1,
-                                            gint arg2,
-                                            gpointer user_data);
+GimpOffsetArea::offsets-changedvoid        user_function                  (GimpOffsetArea *gimpoffsetarea,
+                                            gint            arg1,
+                                            gint            arg2,
+                                            gpointer        user_data)           : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpoldwidgets.xml b/devel-docs/libgimpwidgets/xml/gimpoldwidgets.xml
index e20b21e4d7..ab81b00f99 100644
--- a/devel-docs/libgimpwidgets/xml/gimpoldwidgets.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpoldwidgets.xml
@@ -4,16 +4,19 @@
 
 
 
-gimpoldwidgets
+gimpoldwidgets
 3
 LIBGIMPWIDGETS Library
 
 
 
-gimpoldwidgetsOld API that is still available but declared as deprecated.
+gimpoldwidgets
+Old API that is still available but declared as deprecated.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -62,17 +65,17 @@
 
 
 
-
-Description
+
+Description
 
 These functions are not defined if you define GIMP_DISABLE_DEPRECATED.
 
 
 
-
-Details
+
+Details
 
-<anchor id="gimp-int-option-menu-new"/>gimp_int_option_menu_new ()
+<anchor id="gimp-int-option-menu-new" role="function" condition="deprecated:"/>gimp_int_option_menu_new ()
 gimp_int_option_menu_newGtkWidget*  gimp_int_option_menu_new        (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
@@ -89,7 +92,7 @@ enum to a menu).
 
 
 menu_only :
-          TRUE if the function should return a GtkMenu only.
+          TRUE if the function should return a GtkMenu only.
 
 menu_item_callback :
  The callback each menu item's "activate" signal will
@@ -103,13 +106,13 @@ enum to a menu).
             The item_data of the initially selected menu item.
 
 ... :
-                A NULL-terminated va_list describing the menu items.
+                A NULL-terminated va_list describing the menu items.
 
 Returns : A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
-<anchor id="gimp-int-option-menu-set-history"/>gimp_int_option_menu_set_history ()
+<anchor id="gimp-int-option-menu-set-history" role="function" condition="deprecated:"/>gimp_int_option_menu_set_history ()
 gimp_int_option_menu_set_historyvoid        gimp_int_option_menu_set_history
                                             (GtkOptionMenu *option_menu,
                                              gint item_data);
@@ -131,7 +134,7 @@ same thing as gimp_option
 
 
 
-<anchor id="GimpIntOptionMenuSensitivityCallback"/>GimpIntOptionMenuSensitivityCallback ()
+<anchor id="GimpIntOptionMenuSensitivityCallback" role="function" condition="deprecated:"/>GimpIntOptionMenuSensitivityCallback ()
 GimpIntOptionMenuSensitivityCallbackgboolean    (*GimpIntOptionMenuSensitivityCallback)
                                             (gint item_data,
                                              gpointer callback_data);
@@ -151,7 +154,7 @@ same thing as gimp_option
 
 
 
-<anchor id="gimp-int-option-menu-set-sensitive"/>gimp_int_option_menu_set_sensitive ()
+<anchor id="gimp-int-option-menu-set-sensitive" role="function" condition="deprecated:"/>gimp_int_option_menu_set_sensitive ()
 gimp_int_option_menu_set_sensitivevoid        gimp_int_option_menu_set_sensitive
                                             (GtkOptionMenu *option_menu,
                                              GimpIntOptionMenuSensitivityCallback callback,
@@ -179,7 +182,7 @@ same thing as gimp_opti
 
 
 
-<anchor id="gimp-option-menu-new"/>gimp_option_menu_new ()
+<anchor id="gimp-option-menu-new" role="function" condition="deprecated:"/>gimp_option_menu_new ()
 gimp_option_menu_newGtkWidget*  gimp_option_menu_new            (gboolean menu_only,
                                              ...);
 gimp_option_menu_new is deprecated and should not be used in newly-written code.
@@ -189,16 +192,16 @@ Convenience function to create a GtkOptionMe
 
 
 menu_only :
- TRUE if the function should return a GtkMenu only.
+ TRUE if the function should return a GtkMenu only.
 
 ... :
-       A NULL-terminated va_list describing the menu items.
+       A NULL-terminated va_list describing the menu items.
 
 Returns : A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
-<anchor id="gimp-option-menu-new2"/>gimp_option_menu_new2 ()
+<anchor id="gimp-option-menu-new2" role="function" condition="deprecated:"/>gimp_option_menu_new2 ()
 gimp_option_menu_new2GtkWidget*  gimp_option_menu_new2           (gboolean menu_only,
                                              GCallback menu_item_callback,
                                              gpointer menu_item_callback_data,
@@ -211,7 +214,7 @@ Convenience function to create a GtkOptionMe
 
 
 menu_only :
-          TRUE if the function should return a GtkMenu only.
+          TRUE if the function should return a GtkMenu only.
 
 menu_item_callback :
  The callback each menu item's "activate" signal will
@@ -225,13 +228,13 @@ Convenience function to create a GtkOptionMe
             The item_data of the initially selected menu item.
 
 ... :
-                A NULL-terminated va_list describing the menu items.
+                A NULL-terminated va_list describing the menu items.
 
 Returns : A GtkOptionMenu or a GtkMenu (depending on menu_only).
 
 
 
-<anchor id="gimp-option-menu-set-history"/>gimp_option_menu_set_history ()
+<anchor id="gimp-option-menu-set-history" role="function" condition="deprecated:"/>gimp_option_menu_set_history ()
 gimp_option_menu_set_historyvoid        gimp_option_menu_set_history    (GtkOptionMenu *option_menu,
                                              gpointer item_data);
 gimp_option_menu_set_history is deprecated and should not be used in newly-written code.
@@ -252,7 +255,7 @@ a GtkOptionMenu that was creat
 
 
 
-<anchor id="GimpOptionMenuSensitivityCallback"/>GimpOptionMenuSensitivityCallback ()
+<anchor id="GimpOptionMenuSensitivityCallback" role="function" condition="deprecated:"/>GimpOptionMenuSensitivityCallback ()
 GimpOptionMenuSensitivityCallbackgboolean    (*GimpOptionMenuSensitivityCallback)
                                             (gpointer item_data,
                                              gpointer callback_data);
@@ -272,7 +275,7 @@ a GtkOptionMenu that was creat
 
 
 
-<anchor id="gimp-option-menu-set-sensitive"/>gimp_option_menu_set_sensitive ()
+<anchor id="gimp-option-menu-set-sensitive" role="function" condition="deprecated:"/>gimp_option_menu_set_sensitive ()
 gimp_option_menu_set_sensitivevoid        gimp_option_menu_set_sensitive  (GtkOptionMenu *option_menu,
                                              GimpOptionMenuSensitivityCallback callback,
                                              gpointer callback_data);
@@ -297,7 +300,7 @@ according to the return value of this function.
 
 
 
-<anchor id="gimp-menu-item-update"/>gimp_menu_item_update ()
+<anchor id="gimp-menu-item-update" role="function" condition="deprecated:"/>gimp_menu_item_update ()
 gimp_menu_item_updatevoid        gimp_menu_item_update           (GtkWidget *widget,
                                              gpointer data);
 gimp_menu_item_update is deprecated and should not be used in newly-written code.
diff --git a/devel-docs/libgimpwidgets/xml/gimppatheditor.xml b/devel-docs/libgimpwidgets/xml/gimppatheditor.xml
index 3ea5199c9c..74fd899a1b 100644
--- a/devel-docs/libgimpwidgets/xml/gimppatheditor.xml
+++ b/devel-docs/libgimpwidgets/xml/gimppatheditor.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpPathEditor
+GimpPathEditor
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpPathEditorWidget for editing a file search path.
+GimpPathEditor
+Widget for editing a file search path.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -41,25 +44,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpPathEditor
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpPathEditor
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpPathEditor implements
  AtkImplementorIface.
@@ -68,22 +72,22 @@ GimpPathEditor implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "path-changed"
             void        user_function      (GimpPathEditor *arg0,
-                                            gpointer user_data);
+                                            gpointer        user_data)      : Run first
 "writable-changed"
             void        user_function      (GimpPathEditor *arg0,
-                                            gpointer user_data);
+                                            gpointer        user_data)      : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget is used to edit file search paths.
 
@@ -102,16 +106,16 @@ the search path, the "path_changed" signal will be emitted.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpPathEditor-struct"/>GimpPathEditor
+<anchor id="GimpPathEditor-struct" role="struct"/>GimpPathEditor
 GimpPathEditortypedef struct _GimpPathEditor GimpPathEditor;
 
 
 
 
-<anchor id="gimp-path-editor-new"/>gimp_path_editor_new ()
+<anchor id="gimp-path-editor-new" role="function"/>gimp_path_editor_new ()
 gimp_path_editor_newGtkWidget*  gimp_path_editor_new            (const gchar *filesel_title,
                                              const gchar *path);
 
@@ -134,7 +138,7 @@ The elements of the initial search path must be separated with the
 
 
 
-<anchor id="gimp-path-editor-get-path"/>gimp_path_editor_get_path ()
+<anchor id="gimp-path-editor-get-path" role="function"/>gimp_path_editor_get_path ()
 gimp_path_editor_get_pathgchar*      gimp_path_editor_get_path       (GimpPathEditor *editor);
 
 The elements of the returned search path string are separated with the
@@ -152,7 +156,7 @@ Note that you have to g_free()
 
 
-<anchor id="gimp-path-editor-set-path"/>gimp_path_editor_set_path ()
+<anchor id="gimp-path-editor-set-path" role="function"/>gimp_path_editor_set_path ()
 gimp_path_editor_set_pathvoid        gimp_path_editor_set_path       (GimpPathEditor *editor,
                                              const gchar *path);
 
@@ -169,7 +173,7 @@ The elements of the initial search path must be separated with the
 
 
 
-<anchor id="gimp-path-editor-get-writable-path"/>gimp_path_editor_get_writable_path ()
+<anchor id="gimp-path-editor-get-writable-path" role="function"/>gimp_path_editor_get_writable_path ()
 gimp_path_editor_get_writable_pathgchar*      gimp_path_editor_get_writable_path
                                             (GimpPathEditor *editor);
 
@@ -184,7 +188,7 @@ The elements of the initial search path must be separated with the
 
 
 
-<anchor id="gimp-path-editor-set-writable-path"/>gimp_path_editor_set_writable_path ()
+<anchor id="gimp-path-editor-set-writable-path" role="function"/>gimp_path_editor_set_writable_path ()
 gimp_path_editor_set_writable_pathvoid        gimp_path_editor_set_writable_path
                                             (GimpPathEditor *editor,
                                              const gchar *path);
@@ -201,7 +205,7 @@ The elements of the initial search path must be separated with the
 
 
 
-<anchor id="gimp-path-editor-get-dir-writable"/>gimp_path_editor_get_dir_writable ()
+<anchor id="gimp-path-editor-get-dir-writable" role="function"/>gimp_path_editor_get_dir_writable ()
 gimp_path_editor_get_dir_writablegboolean    gimp_path_editor_get_dir_writable
                                             (GimpPathEditor *editor,
                                              const gchar *directory);
@@ -220,7 +224,7 @@ The elements of the initial search path must be separated with the
 
 
 
-<anchor id="gimp-path-editor-set-dir-writable"/>gimp_path_editor_set_dir_writable ()
+<anchor id="gimp-path-editor-set-dir-writable" role="function"/>gimp_path_editor_set_dir_writable ()
 gimp_path_editor_set_dir_writablevoid        gimp_path_editor_set_dir_writable
                                             (GimpPathEditor *editor,
                                              const gchar *directory,
@@ -243,11 +247,11 @@ The elements of the initial search path must be separated with the
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpPathEditor-path-changed"/>The "path-changed" signal
-void        user_function                  (GimpPathEditor *arg0,
-                                            gpointer user_data);
+GimpPathEditor::path-changedvoid        user_function                  (GimpPathEditor *arg0,
+                                            gpointer        user_data)      : Run first
 
 This signal is emitted whenever the user adds, deletes, modifies
 or reorders an element of the search path.
@@ -257,8 +261,8 @@ or reorders an element of the search path.
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpPathEditor-writable-changed"/>The "writable-changed" signal
-void        user_function                  (GimpPathEditor *arg0,
-                                            gpointer user_data);
+GimpPathEditor::writable-changedvoid        user_function                  (GimpPathEditor *arg0,
+                                            gpointer        user_data)      : Run first
 
 This signal is emitted whenever the "writable" column of a directory
 is changed, either by the user clicking on it or by calling
diff --git a/devel-docs/libgimpwidgets/xml/gimppickbutton.xml b/devel-docs/libgimpwidgets/xml/gimppickbutton.xml
index c7a309d906..ef5799cdba 100644
--- a/devel-docs/libgimpwidgets/xml/gimppickbutton.xml
+++ b/devel-docs/libgimpwidgets/xml/gimppickbutton.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpPickButton
+GimpPickButton
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpPickButtonWidget to pick a color from screen.
+GimpPickButton
+Widget to pick a color from screen.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -25,25 +28,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GimpPickButton
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GimpPickButton
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpPickButton implements
  AtkImplementorIface.
@@ -52,20 +56,20 @@ GimpPickButton implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "color-picked"
             void        user_function      (GimpPickButton *gimppickbutton,
-                                            gpointer arg1,
-                                            gpointer user_data);
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run first
 
 
 
 
-
-Description
+
+Description
 
 GimpPickButton is a specialized button. When clicked, it changes the
 cursor to a color-picker pipette and allows the user to pick a color
@@ -73,16 +77,16 @@ from any point on the screen.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpPickButton-struct"/>GimpPickButton
+<anchor id="GimpPickButton-struct" role="struct"/>GimpPickButton
 GimpPickButtontypedef struct _GimpPickButton GimpPickButton;
 
 
 
 
-<anchor id="gimp-pick-button-new"/>gimp_pick_button_new ()
+<anchor id="gimp-pick-button-new" role="function"/>gimp_pick_button_new ()
 gimp_pick_button_newGtkWidget*  gimp_pick_button_new            (void);
 
 Creates a new GimpPickButton widget.
@@ -95,12 +99,12 @@ Creates a new GimpPickButton
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpPickButton-color-picked"/>The "color-picked" signal
-void        user_function                  (GimpPickButton *gimppickbutton,
-                                            gpointer arg1,
-                                            gpointer user_data);
+GimpPickButton::color-pickedvoid        user_function                  (GimpPickButton *gimppickbutton,
+                                            gpointer        arg1,
+                                            gpointer        user_data)           : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimppixmap.xml b/devel-docs/libgimpwidgets/xml/gimppixmap.xml
index b38f4d1d87..e1c0283d32 100644
--- a/devel-docs/libgimpwidgets/xml/gimppixmap.xml
+++ b/devel-docs/libgimpwidgets/xml/gimppixmap.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpPixmap
+GimpPixmap
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpPixmapWidget which creates a GtkPixmap from XPM data.
+GimpPixmap
+Widget which creates a GtkPixmap from XPM data.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -27,24 +30,25 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkMisc
-                     +----GtkImage
-                           +----GimpPixmap
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkMisc
+                           +----GtkImage
+                                 +----GimpPixmap
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpPixmap implements
  AtkImplementorIface.
@@ -55,8 +59,8 @@ GimpPixmap implements
 
 
 
-
-Description
+
+Description
 
 Widget which creates a GtkPixmap from XPM data.
 
@@ -71,17 +75,17 @@ and cannot be cached in memory without doing bad hacks.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpPixmap-struct"/>GimpPixmap
+<anchor id="GimpPixmap-struct" role="struct"/>GimpPixmap
 GimpPixmaptypedef struct _GimpPixmap GimpPixmap;
 GimpPixmap is deprecated and should not be used in newly-written code.
 
 
 
 
-<anchor id="gimp-pixmap-new"/>gimp_pixmap_new ()
+<anchor id="gimp-pixmap-new" role="function" condition="deprecated:"/>gimp_pixmap_new ()
 gimp_pixmap_newGtkWidget*  gimp_pixmap_new                 (gchar **xpm_data);
 gimp_pixmap_new is deprecated and should not be used in newly-written code.
 
@@ -96,7 +100,7 @@ Creates a new GimpPixmap widget.<
 
 
 
-<anchor id="gimp-pixmap-set"/>gimp_pixmap_set ()
+<anchor id="gimp-pixmap-set" role="function" condition="deprecated:"/>gimp_pixmap_set ()
 gimp_pixmap_setvoid        gimp_pixmap_set                 (GimpPixmap *pixmap,
                                              gchar **xpm_data);
 gimp_pixmap_set is deprecated and should not be used in newly-written code.
diff --git a/devel-docs/libgimpwidgets/xml/gimppreview.xml b/devel-docs/libgimpwidgets/xml/gimppreview.xml
index 77ad9d7794..3964f7c012 100644
--- a/devel-docs/libgimpwidgets/xml/gimppreview.xml
+++ b/devel-docs/libgimpwidgets/xml/gimppreview.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpPreview
+GimpPreview
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpPreviewA widget providing a GimpPreviewArea plus framework to update the preview.
+GimpPreview
+A widget providing a GimpPreviewArea plus framework to update the preview.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -45,25 +48,26 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBox
-                           +----GtkVBox
-                                 +----GimpPreview
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBox
+                                 +----GtkVBox
+                                       +----GimpPreview
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpPreview implements
  AtkImplementorIface.
@@ -71,49 +75,49 @@ GimpPreview implements
 
 
 
-
-Properties
+
+Properties
 
 
   "update"               gboolean              : Read / Write / Construct
 
 
-
-Style Properties
+
+Style Properties
 
 
   "size"                 gint                  : Read
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "invalidated"
             void        user_function      (GimpPreview *gimppreview,
-                                            gpointer user_data);
+                                            gpointer     user_data)        : Run first
 
 
 
 
-
-Description
+
+Description
 
 A widget providing a GimpPreviewArea plus framework to update the preview.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpPreview-struct"/>GimpPreview
+<anchor id="GimpPreview-struct" role="struct"/>GimpPreview
 GimpPreviewtypedef struct _GimpPreview GimpPreview;
 
 
 
 
-<anchor id="gimp-preview-get-update"/>gimp_preview_get_update ()
+<anchor id="gimp-preview-get-update" role="function" condition="since:GIMP 2.2"/>gimp_preview_get_update ()
 gimp_preview_get_updategboolean    gimp_preview_get_update         (GimpPreview *preview);
 
 
@@ -129,7 +133,7 @@ A widget providing a GimpPreviewAreaSince  GIMP 2.2
 
 
-<anchor id="gimp-preview-set-update"/>gimp_preview_set_update ()
+<anchor id="gimp-preview-set-update" role="function" condition="since:GIMP 2.2"/>gimp_preview_set_update ()
 gimp_preview_set_updatevoid        gimp_preview_set_update         (GimpPreview *preview,
                                              gboolean update);
 
@@ -141,13 +145,13 @@ Sets the state of the "Preview" check button.
  a GimpPreview widget
 
 update :
- TRUE if the preview should invalidate itself when being
+ TRUE if the preview should invalidate itself when being
          scrolled or when gimp_preview_invalidate() is being called
 
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-set-bounds"/>gimp_preview_set_bounds ()
+<anchor id="gimp-preview-set-bounds" role="function" condition="since:GIMP 2.2"/>gimp_preview_set_bounds ()
 gimp_preview_set_boundsvoid        gimp_preview_set_bounds         (GimpPreview *preview,
                                              gint xmin,
                                              gint ymin,
@@ -178,7 +182,7 @@ maximum size of the GimpPreviewArea
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-get-size"/>gimp_preview_get_size ()
+<anchor id="gimp-preview-get-size" role="function" condition="since:GIMP 2.2"/>gimp_preview_get_size ()
 gimp_preview_get_sizevoid        gimp_preview_get_size           (GimpPreview *preview,
                                              gint *width,
                                              gint *height);
@@ -199,7 +203,7 @@ maximum size of the GimpPreviewArea
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-get-position"/>gimp_preview_get_position ()
+<anchor id="gimp-preview-get-position" role="function" condition="since:GIMP 2.2"/>gimp_preview_get_position ()
 gimp_preview_get_positionvoid        gimp_preview_get_position       (GimpPreview *preview,
                                              gint *x,
                                              gint *y);
@@ -220,7 +224,7 @@ maximum size of the GimpPreviewArea
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-draw"/>gimp_preview_draw ()
+<anchor id="gimp-preview-draw" role="function" condition="since:GIMP 2.2"/>gimp_preview_draw ()
 gimp_preview_drawvoid        gimp_preview_draw               (GimpPreview *preview);
 
 Calls the GimpPreview::draw method. GimpPreview itself doesn't
@@ -239,7 +243,7 @@ original, unmodified drawable to the preview.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-draw-buffer"/>gimp_preview_draw_buffer ()
+<anchor id="gimp-preview-draw-buffer" role="function" condition="since:GIMP 2.2"/>gimp_preview_draw_buffer ()
 gimp_preview_draw_buffervoid        gimp_preview_draw_buffer        (GimpPreview *preview,
                                              const guchar *buffer,
                                              gint rowstride);
@@ -262,7 +266,7 @@ derived class implementing this method.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-invalidate"/>gimp_preview_invalidate ()
+<anchor id="gimp-preview-invalidate" role="function" condition="since:GIMP 2.2"/>gimp_preview_invalidate ()
 gimp_preview_invalidatevoid        gimp_preview_invalidate         (GimpPreview *preview);
 
 This function starts or renews a short low-priority timeout. When
@@ -285,13 +289,13 @@ itself.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-set-default-cursor"/>gimp_preview_set_default_cursor ()
+<anchor id="gimp-preview-set-default-cursor" role="function" condition="since:GIMP 2.2"/>gimp_preview_set_default_cursor ()
 gimp_preview_set_default_cursorvoid        gimp_preview_set_default_cursor (GimpPreview *preview,
                                              GdkCursor *cursor);
 
 Sets the default mouse cursor for the preview.  Note that this will
-be overriden by a GDK_FLEUR if the preview has scrollbars, or by a
-GDK_WATCH when the preview is invalidated.
+be overriden by a GDK_FLEUR if the preview has scrollbars, or by a
+GDK_WATCH when the preview is invalidated.
 
 
 
@@ -299,35 +303,35 @@ be overriden by a GDK_FLEUR if the preview has scrollbars, or
  a GimpPreview widget
 
 cursor :
-  a GdkCursor or NULL
+  a GdkCursor or NULL
 
 Since  GIMP 2.2
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpPreview--update"/>The "<literal>update</literal>" property
-  "update"               gboolean              : Read / Write / Construct
+GimpPreview:update  "update"               gboolean              : Read / Write / Construct
 Default value: TRUE
 
 
 
-
-Style Properties
+
+Style Property Details
 <anchor id="GimpPreview--size"/>The "<literal>size</literal>" style property
-  "size"                 gint                  : Read
+GimpPreview:size  "size"                 gint                  : Read
 Allowed values: [1,1024]
 Default value: 150
 
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpPreview-invalidated"/>The "invalidated" signal
-void        user_function                  (GimpPreview *gimppreview,
-                                            gpointer user_data);
+GimpPreview::invalidatedvoid        user_function                  (GimpPreview *gimppreview,
+                                            gpointer     user_data)        : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimppreviewarea.xml b/devel-docs/libgimpwidgets/xml/gimppreviewarea.xml
index 930b98f54e..5f04a4459b 100644
--- a/devel-docs/libgimpwidgets/xml/gimppreviewarea.xml
+++ b/devel-docs/libgimpwidgets/xml/gimppreviewarea.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpPreviewArea
+GimpPreviewArea
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpPreviewAreaA general purpose preview widget which caches its pixel data.
+GimpPreviewArea
+A general purpose preview widget which caches its pixel data.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -75,23 +78,24 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkDrawingArea
-                     +----GimpPreviewArea
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkDrawingArea
+                           +----GimpPreviewArea
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpPreviewArea implements
  AtkImplementorIface.
@@ -99,8 +103,8 @@ GimpPreviewArea implements
 
 
 
-
-Properties
+
+Properties
 
 
   "check-size"           GimpCheckSize         : Read / Write
@@ -110,23 +114,23 @@ GimpPreviewArea implements
 
 
 
-
-Description
+
+Description
 
 A general purpose preview widget which caches its pixel data.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpPreviewArea-struct"/>GimpPreviewArea
+<anchor id="GimpPreviewArea-struct" role="struct"/>GimpPreviewArea
 GimpPreviewAreatypedef struct _GimpPreviewArea GimpPreviewArea;
 
 
 
 
-<anchor id="gimp-preview-area-new"/>gimp_preview_area_new ()
+<anchor id="gimp-preview-area-new" role="function"/>gimp_preview_area_new ()
 gimp_preview_area_newGtkWidget*  gimp_preview_area_new           (void);
 
 
@@ -139,7 +143,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-draw"/>gimp_preview_area_draw ()
+<anchor id="gimp-preview-area-draw" role="function"/>gimp_preview_area_draw ()
 gimp_preview_area_drawvoid        gimp_preview_area_draw          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
@@ -182,7 +186,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-fill"/>gimp_preview_area_fill ()
+<anchor id="gimp-preview-area-fill" role="function"/>gimp_preview_area_fill ()
 gimp_preview_area_fillvoid        gimp_preview_area_fill          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
@@ -226,7 +230,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-blend"/>gimp_preview_area_blend ()
+<anchor id="gimp-preview-area-blend" role="function"/>gimp_preview_area_blend ()
 gimp_preview_area_blendvoid        gimp_preview_area_blend         (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
@@ -284,7 +288,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-mask"/>gimp_preview_area_mask ()
+<anchor id="gimp-preview-area-mask" role="function"/>gimp_preview_area_mask ()
 gimp_preview_area_maskvoid        gimp_preview_area_mask          (GimpPreviewArea *area,
                                              gint x,
                                              gint y,
@@ -347,7 +351,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-set-offsets"/>gimp_preview_area_set_offsets ()
+<anchor id="gimp-preview-area-set-offsets" role="function" condition="since:GIMP 2.2"/>gimp_preview_area_set_offsets ()
 gimp_preview_area_set_offsetsvoid        gimp_preview_area_set_offsets   (GimpPreviewArea *area,
                                              gint x,
                                              gint y);
@@ -369,14 +373,14 @@ when drawing the checkerboard and to determine the dither offsets.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-area-set-colormap"/>gimp_preview_area_set_colormap ()
+<anchor id="gimp-preview-area-set-colormap" role="function"/>gimp_preview_area_set_colormap ()
 gimp_preview_area_set_colormapvoid        gimp_preview_area_set_colormap  (GimpPreviewArea *area,
                                              const guchar *colormap,
                                              gint num_colors);
 
 Sets the colormap for the GimpPreviewArea widget. You need to
 call this function before you use gimp_preview_area_draw() with
-an image type of GIMP_INDEXED_IMAGE or GIMP_INDEXEDA_IMAGE.
+an image type of GIMP_INDEXED_IMAGE or GIMP_INDEXEDA_IMAGE.
 
 
 Since GIMP 2.2
@@ -394,7 +398,7 @@ Since GIMP 2.2
 
 
 
-<anchor id="gimp-preview-area-set-max-size"/>gimp_preview_area_set_max_size ()
+<anchor id="gimp-preview-area-set-max-size" role="function" condition="since:GIMP 2.2"/>gimp_preview_area_set_max_size ()
 gimp_preview_area_set_max_sizevoid        gimp_preview_area_set_max_size  (GimpPreviewArea *area,
                                              gint width,
                                              gint height);
@@ -418,7 +422,7 @@ preview will draw itself centered into the allocated area.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-preview-area-menu-popup"/>gimp_preview_area_menu_popup ()
+<anchor id="gimp-preview-area-menu-popup" role="function" condition="since:GIMP 2.2"/>gimp_preview_area_menu_popup ()
 gimp_preview_area_menu_popupvoid        gimp_preview_area_menu_popup    (GimpPreviewArea *area,
                                              GdkEventButton *event);
 
@@ -431,20 +435,20 @@ the checkerboard pattern that the area uses to visualize
   a GimpPreviewArea
 
 event :
- the button event that causes the menu to popup or NULL
+ the button event that causes the menu to popup or NULL
 
 Since  GIMP 2.2
 
 
 
-
-Properties
+
+Property Details
 <anchor id="GimpPreviewArea--check-size"/>The "<literal>check-size</literal>" property
-  "check-size"           GimpCheckSize         : Read / Write
+GimpPreviewArea:check-size  "check-size"           GimpCheckSize         : Read / Write
 Default value: GIMP_CHECK_SIZE_MEDIUM_CHECKS
 
 <anchor id="GimpPreviewArea--check-type"/>The "<literal>check-type</literal>" property
-  "check-type"           GimpCheckType         : Read / Write
+GimpPreviewArea:check-type  "check-type"           GimpCheckType         : Read / Write
 Default value: GIMP_CHECK_TYPE_GRAY_CHECKS
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpquerybox.xml b/devel-docs/libgimpwidgets/xml/gimpquerybox.xml
index c7e8d9034e..0035785810 100644
--- a/devel-docs/libgimpwidgets/xml/gimpquerybox.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpquerybox.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpQueryBox
+GimpQueryBox
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpQueryBoxSome simple dialogs to enter a single int, double, string or boolean value.
+GimpQueryBox
+Some simple dialogs to enter a single int, double, string or boolean value.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -110,8 +113,8 @@
 
 
 
-
-Description
+
+Description
 
 These functions provide simple dialogs for entering a single string,
 integer, double, boolean or pixel size value.
@@ -128,10 +131,10 @@ callback function is called and returns the entered value.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpQueryStringCallback"/>GimpQueryStringCallback ()
+<anchor id="GimpQueryStringCallback" role="function"/>GimpQueryStringCallback ()
 GimpQueryStringCallbackvoid        (*GimpQueryStringCallback)      (GtkWidget *query_box,
                                              const gchar *string,
                                              gpointer data);
@@ -151,7 +154,7 @@ Note that you have to g_free()
 
 
-<anchor id="GimpQueryIntCallback"/>GimpQueryIntCallback ()
+<anchor id="GimpQueryIntCallback" role="function"/>GimpQueryIntCallback ()
 GimpQueryIntCallbackvoid        (*GimpQueryIntCallback)         (GtkWidget *query_box,
                                              gint value,
                                              gpointer data);
@@ -171,7 +174,7 @@ Note that you have to g_free()
 
 
-<anchor id="GimpQueryDoubleCallback"/>GimpQueryDoubleCallback ()
+<anchor id="GimpQueryDoubleCallback" role="function"/>GimpQueryDoubleCallback ()
 GimpQueryDoubleCallbackvoid        (*GimpQueryDoubleCallback)      (GtkWidget *query_box,
                                              gdouble value,
                                              gpointer data);
@@ -191,7 +194,7 @@ Note that you have to g_free()
 
 
-<anchor id="GimpQuerySizeCallback"/>GimpQuerySizeCallback ()
+<anchor id="GimpQuerySizeCallback" role="function"/>GimpQuerySizeCallback ()
 GimpQuerySizeCallbackvoid        (*GimpQuerySizeCallback)        (GtkWidget *query_box,
                                              gdouble size,
                                              GimpUnit unit,
@@ -215,7 +218,7 @@ Note that you have to g_free()
 
 
-<anchor id="GimpQueryBooleanCallback"/>GimpQueryBooleanCallback ()
+<anchor id="GimpQueryBooleanCallback" role="function"/>GimpQueryBooleanCallback ()
 GimpQueryBooleanCallbackvoid        (*GimpQueryBooleanCallback)     (GtkWidget *query_box,
                                              gboolean value,
                                              gpointer data);
@@ -235,7 +238,7 @@ Note that you have to g_free()
 
 
-<anchor id="gimp-query-string-box"/>gimp_query_string_box ()
+<anchor id="gimp-query-string-box" role="function"/>gimp_query_string_box ()
 gimp_query_string_boxGtkWidget*  gimp_query_string_box           (const gchar *title,
                                              GtkWidget *parent,
                                              GimpHelpFunc help_func,
@@ -285,7 +288,7 @@ Creates a new GtkDialog that queri
 
 
 
-<anchor id="gimp-query-int-box"/>gimp_query_int_box ()
+<anchor id="gimp-query-int-box" role="function"/>gimp_query_int_box ()
 gimp_query_int_boxGtkWidget*  gimp_query_int_box              (const gchar *title,
                                              GtkWidget *parent,
                                              GimpHelpFunc help_func,
@@ -343,7 +346,7 @@ Creates a new GtkDialog that queri
 
 
 
-<anchor id="gimp-query-double-box"/>gimp_query_double_box ()
+<anchor id="gimp-query-double-box" role="function"/>gimp_query_double_box ()
 gimp_query_double_boxGtkWidget*  gimp_query_double_box           (const gchar *title,
                                              GtkWidget *parent,
                                              GimpHelpFunc help_func,
@@ -405,7 +408,7 @@ Creates a new GtkDialog that queri
 
 
 
-<anchor id="gimp-query-size-box"/>gimp_query_size_box ()
+<anchor id="gimp-query-size-box" role="function"/>gimp_query_size_box ()
 gimp_query_size_boxGtkWidget*  gimp_query_size_box             (const gchar *title,
                                              GtkWidget *parent,
                                              GimpHelpFunc help_func,
@@ -464,7 +467,7 @@ Creates a new GtkDialog that queri
               calculations.
 
 dot_for_dot :
- TRUE if the GimpUnitMenu's initial unit should be "pixels".
+ TRUE if the GimpUnitMenu's initial unit should be "pixels".
 
 object :
       The object this query box is associated with.
@@ -483,7 +486,7 @@ Creates a new GtkDialog that queri
 
 
 
-<anchor id="gimp-query-boolean-box"/>gimp_query_boolean_box ()
+<anchor id="gimp-query-boolean-box" role="function"/>gimp_query_boolean_box ()
 gimp_query_boolean_boxGtkWidget*  gimp_query_boolean_box          (const gchar *title,
                                              GtkWidget *parent,
                                              GimpHelpFunc help_func,
@@ -544,7 +547,7 @@ Creates a new GtkDialog that asks
 
 
 
-<anchor id="GIMP-QUERY-BOX-VBOX:CAPS"/>GIMP_QUERY_BOX_VBOX()
+<anchor id="GIMP-QUERY-BOX-VBOX:CAPS" role="macro"/>GIMP_QUERY_BOX_VBOX()
 GIMP_QUERY_BOX_VBOX#define     GIMP_QUERY_BOX_VBOX(qbox)
 
 A macro to access the GtkVBox in a GimpQueryBox. Useful if you want to add
diff --git a/devel-docs/libgimpwidgets/xml/gimpscrolledpreview.xml b/devel-docs/libgimpwidgets/xml/gimpscrolledpreview.xml
index 70161242c0..a195bfbcc4 100644
--- a/devel-docs/libgimpwidgets/xml/gimpscrolledpreview.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpscrolledpreview.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpScrolledPreview
+GimpScrolledPreview
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpScrolledPreviewA widget providing a GimpPreview enhanced by scrolling capabilities.
+GimpScrolledPreview
+A widget providing a GimpPreview enhanced by scrolling capabilities.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -32,17 +35,17 @@
 
 
 
-
-Description
+
+Description
 
 A widget providing a GimpPreview enhanced by scrolling capabilities.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpScrolledPreview"/>GimpScrolledPreview
+<anchor id="GimpScrolledPreview" role="struct"/>GimpScrolledPreview
 GimpScrolledPreviewtypedef struct {
   GimpPreview   parent_instance;
 } GimpScrolledPreview;
diff --git a/devel-docs/libgimpwidgets/xml/gimpsizeentry.xml b/devel-docs/libgimpwidgets/xml/gimpsizeentry.xml
index 1e48ccc6b4..00de7c2464 100644
--- a/devel-docs/libgimpwidgets/xml/gimpsizeentry.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpsizeentry.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpSizeEntry
+GimpSizeEntry
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpSizeEntryWidget for entering pixel values and resolutions.
+GimpSizeEntry
+Widget for entering pixel values and resolutions.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -83,24 +86,25 @@ enum        GimpSizeEntryUpdatePolicy<
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTable
-                           +----GimpSizeEntry
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkTable
+                                 +----GimpSizeEntry
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpSizeEntry implements
  AtkImplementorIface.
@@ -109,25 +113,25 @@ GimpSizeEntry implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "refval-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 "unit-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 "value-changed"
             void        user_function      (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+                                            gpointer       user_data)          : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget is used to enter pixel distances/sizes and resolutions.
 
@@ -155,22 +159,22 @@ real-world-unit.
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpSizeEntry-struct"/>GimpSizeEntry
+<anchor id="GimpSizeEntry-struct" role="struct"/>GimpSizeEntry
 GimpSizeEntrytypedef struct _GimpSizeEntry GimpSizeEntry;
 
 
 
 
-<anchor id="GimpSizeEntryField"/>GimpSizeEntryField
+<anchor id="GimpSizeEntryField" role="struct"/>GimpSizeEntryField
 GimpSizeEntryFieldtypedef struct _GimpSizeEntryField GimpSizeEntryField;
 
 
 
 
-<anchor id="GimpSizeEntryUpdatePolicy"/>enum GimpSizeEntryUpdatePolicy
+<anchor id="GimpSizeEntryUpdatePolicy" role="enum"/>enum GimpSizeEntryUpdatePolicy
 GimpSizeEntryUpdatePolicytypedef enum
 {
   GIMP_SIZE_ENTRY_UPDATE_NONE       = 0,
@@ -182,7 +186,7 @@ real-world-unit.
 
 
 
-<anchor id="gimp-size-entry-new"/>gimp_size_entry_new ()
+<anchor id="gimp-size-entry-new" role="function"/>gimp_size_entry_new ()
 gimp_size_entry_newGtkWidget*  gimp_size_entry_new             (gint number_of_fields,
                                              GimpUnit unit,
                                              const gchar *unit_format,
@@ -242,16 +246,16 @@ of the GimpUnitMenu to allow th
                     gimp_unit_menu_new().
 
 menu_show_pixels :
-  TRUE if the unit menu shold contain an item for
+  TRUE if the unit menu shold contain an item for
                     GIMP_UNIT_PIXEL (ignored if the update_policy is not
                     GIMP_SIZE_ENTRY_UPDATE_NONE).
 
 menu_show_percent :
- TRUE if the unit menu shold contain an item for
+ TRUE if the unit menu shold contain an item for
                     GIMP_UNIT_PERCENT.
 
 show_refval :
-       TRUE if you want an extra "reference value"
+       TRUE if you want an extra "reference value"
                     spinbutton per input field.
 
 spinbutton_width :
@@ -265,7 +269,7 @@ of the GimpUnitMenu to allow th
 
 
 
-<anchor id="gimp-size-entry-add-field"/>gimp_size_entry_add_field ()
+<anchor id="gimp-size-entry-add-field" role="function"/>gimp_size_entry_add_field ()
 gimp_size_entry_add_fieldvoid        gimp_size_entry_add_field       (GimpSizeEntry *gse,
                                              GtkSpinButton *value_spinbutton,
                                              GtkSpinButton *refval_spinbutton);
@@ -274,8 +278,8 @@ Adds an input field to the GimpSizeEntry
 
 The new input field will have the index 0. If you specified show_refval
-as TRUE in gimp_size_entry_new() you have to pass an additional
-GtkSpinButton to hold the reference value. If show_refval was FALSE,
+as TRUE in gimp_size_entry_new() you have to pass an additional
+GtkSpinButton to hold the reference value. If show_refval was FALSE,
 refval_spinbutton will be ignored.
 
 
@@ -291,7 +295,7 @@ as TRUE in gimp
 
 
 
-<anchor id="gimp-size-entry-attach-label"/>gimp_size_entry_attach_label ()
+<anchor id="gimp-size-entry-attach-label" role="function"/>gimp_size_entry_attach_label ()
 gimp_size_entry_attach_labelGtkWidget*  gimp_size_entry_attach_label    (GimpSizeEntry *gse,
                                              const gchar *text,
                                              gint row,
@@ -321,7 +325,7 @@ Attaches a GtkLabel to the 
 
 
-<anchor id="gimp-size-entry-set-resolution"/>gimp_size_entry_set_resolution ()
+<anchor id="gimp-size-entry-set-resolution" role="function"/>gimp_size_entry_set_resolution ()
 gimp_size_entry_set_resolutionvoid        gimp_size_entry_set_resolution  (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble resolution,
@@ -349,12 +353,12 @@ This function does nothing if the  The new resolution (in dpi) for the chosen field.
 
 keep_size :
-  TRUE if the field's size in pixels should stay the same.
-             FALSE if the field's size in units should stay the same.
+  TRUE if the field's size in pixels should stay the same.
+             FALSE if the field's size in units should stay the same.
 
 
 
-<anchor id="gimp-size-entry-set-size"/>gimp_size_entry_set_size ()
+<anchor id="gimp-size-entry-set-size" role="function"/>gimp_size_entry_set_size ()
 gimp_size_entry_set_sizevoid        gimp_size_entry_set_size        (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble lower,
@@ -364,7 +368,7 @@ Sets the pixel values for field # field of the 
 
-These values will be used if you specified menu_show_percent as TRUE
+These values will be used if you specified menu_show_percent as TRUE
 in gimp_size_entry_new() and the user has selected GIMP_UNIT_PERCENT in
 the GimpSizeEntry's GimpUnitMenu.
 
@@ -388,7 +392,7 @@ This function does nothing if the 
 
 
-<anchor id="gimp-size-entry-set-value-boundaries"/>gimp_size_entry_set_value_boundaries ()
+<anchor id="gimp-size-entry-set-value-boundaries" role="function"/>gimp_size_entry_set_value_boundaries ()
 gimp_size_entry_set_value_boundariesvoid        gimp_size_entry_set_value_boundaries
                                             (GimpSizeEntry *gse,
                                              gint field,
@@ -425,7 +429,7 @@ NOTE: In most cases you won't be interested in these values because the
 
 
 
-<anchor id="gimp-size-entry-get-value"/>gimp_size_entry_get_value ()
+<anchor id="gimp-size-entry-get-value" role="function"/>gimp_size_entry_get_value ()
 gimp_size_entry_get_valuegdouble     gimp_size_entry_get_value       (GimpSizeEntry *gse,
                                              gint field);
 
@@ -453,7 +457,7 @@ NOTE: In most cases you won't be interested in this value because the
 
 
 
-<anchor id="gimp-size-entry-set-value"/>gimp_size_entry_set_value ()
+<anchor id="gimp-size-entry-set-value" role="function"/>gimp_size_entry_set_value ()
 gimp_size_entry_set_valuevoid        gimp_size_entry_set_value       (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble value);
@@ -483,7 +487,7 @@ NOTE: In most cases you won't be interested in this value because the
 
 
 
-<anchor id="gimp-size-entry-set-refval-boundaries"/>gimp_size_entry_set_refval_boundaries ()
+<anchor id="gimp-size-entry-set-refval-boundaries" role="function"/>gimp_size_entry_set_refval_boundaries ()
 gimp_size_entry_set_refval_boundariesvoid        gimp_size_entry_set_refval_boundaries
                                             (GimpSizeEntry *gse,
                                              gint field,
@@ -514,7 +518,7 @@ The current reference value of the field will be clamped
 
 
 
-<anchor id="gimp-size-entry-set-refval-digits"/>gimp_size_entry_set_refval_digits ()
+<anchor id="gimp-size-entry-set-refval-digits" role="function"/>gimp_size_entry_set_refval_digits ()
 gimp_size_entry_set_refval_digitsvoid        gimp_size_entry_set_refval_digits
                                             (GimpSizeEntry *gse,
                                              gint field,
@@ -542,7 +546,7 @@ of digits will equal to 0 for <
 
 
 
-<anchor id="gimp-size-entry-get-refval"/>gimp_size_entry_get_refval ()
+<anchor id="gimp-size-entry-get-refval" role="function"/>gimp_size_entry_get_refval ()
 gimp_size_entry_get_refvalgdouble     gimp_size_entry_get_refval      (GimpSizeEntry *gse,
                                              gint field);
 
@@ -565,7 +569,7 @@ in dpi, depending on which GimpS
 
 
 
-<anchor id="gimp-size-entry-set-refval"/>gimp_size_entry_set_refval ()
+<anchor id="gimp-size-entry-set-refval" role="function"/>gimp_size_entry_set_refval ()
 gimp_size_entry_set_refvalvoid        gimp_size_entry_set_refval      (GimpSizeEntry *gse,
                                              gint field,
                                              gdouble refval);
@@ -590,7 +594,7 @@ depending on which GimpSizeEntry
 
 
 
-<anchor id="gimp-size-entry-get-unit"/>gimp_size_entry_get_unit ()
+<anchor id="gimp-size-entry-get-unit" role="function"/>gimp_size_entry_get_unit ()
 gimp_size_entry_get_unitGimpUnit    gimp_size_entry_get_unit        (GimpSizeEntry *gse);
 
 Returns the GimpUnit the user has selected in the GimpSizeEntry's
@@ -605,7 +609,7 @@ Returns the GimpUnit the user has s
 
 
 
-<anchor id="gimp-size-entry-set-unit"/>gimp_size_entry_set_unit ()
+<anchor id="gimp-size-entry-set-unit" role="function"/>gimp_size_entry_set_unit ()
 gimp_size_entry_set_unitvoid        gimp_size_entry_set_unit        (GimpSizeEntry *gse,
                                              GimpUnit unit);
 
@@ -624,7 +628,7 @@ according to which GimpSizeEntry
 
 
 
-<anchor id="gimp-size-entry-set-pixel-digits"/>gimp_size_entry_set_pixel_digits ()
+<anchor id="gimp-size-entry-set-pixel-digits" role="function"/>gimp_size_entry_set_pixel_digits ()
 gimp_size_entry_set_pixel_digitsvoid        gimp_size_entry_set_pixel_digits
                                             (GimpSizeEntry *gse,
                                              gint digits);
@@ -642,7 +646,7 @@ you set up a GimpSizeEntry so
 
 
 
-<anchor id="gimp-size-entry-grab-focus"/>gimp_size_entry_grab_focus ()
+<anchor id="gimp-size-entry-grab-focus" role="function"/>gimp_size_entry_grab_focus ()
 gimp_size_entry_grab_focusvoid        gimp_size_entry_grab_focus      (GimpSizeEntry *gse);
 
 This function is rather ugly and just a workaround for the fact that
@@ -655,7 +659,7 @@ it's impossible to implement gtk
 
 
 
-<anchor id="gimp-size-entry-get-help-widget"/>gimp_size_entry_get_help_widget ()
+<anchor id="gimp-size-entry-get-help-widget" role="function"/>gimp_size_entry_get_help_widget ()
 gimp_size_entry_get_help_widgetGtkWidget*  gimp_size_entry_get_help_widget (GimpSizeEntry *gse,
                                              gint field);
 
@@ -677,11 +681,11 @@ can use this function to get a pointer to the spinbuttons.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpSizeEntry-refval-changed"/>The "refval-changed" signal
-void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+GimpSizeEntry::refval-changedvoid        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first
 
 
 
@@ -692,8 +696,8 @@ can use this function to get a pointer to the spinbuttons.
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpSizeEntry-unit-changed"/>The "unit-changed" signal
-void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+GimpSizeEntry::unit-changedvoid        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first
 
 
 
@@ -704,8 +708,8 @@ can use this function to get a pointer to the spinbuttons.
 user_data :
 user data set when the signal handler was connected.
 <anchor id="GimpSizeEntry-value-changed"/>The "value-changed" signal
-void        user_function                  (GimpSizeEntry *gimpsizeentry,
-                                            gpointer user_data);
+GimpSizeEntry::value-changedvoid        user_function                  (GimpSizeEntry *gimpsizeentry,
+                                            gpointer       user_data)          : Run first
 
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpstock.xml b/devel-docs/libgimpwidgets/xml/gimpstock.xml
index 96d1742759..4ac82a11c4 100644
--- a/devel-docs/libgimpwidgets/xml/gimpstock.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpstock.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpStock
+GimpStock
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpStockPrebuilt common menu/toolbar items and corresponding icons
+GimpStock
+Prebuilt common menu/toolbar items and corresponding icons
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -210,8 +213,8 @@
 
 
 
-
-Description
+
+Description
 
 GIMP registers a set of menu/toolbar items and corresponding icons in
 addition to the standard GTK+ stock items. These can be used just like
@@ -224,10 +227,10 @@ locales.
 
 
 
-
-Details
+
+Details
 
-<anchor id="gimp-stock-init"/>gimp_stock_init ()
+<anchor id="gimp-stock-init" role="function"/>gimp_stock_init ()
 gimp_stock_initvoid        gimp_stock_init                 (void);
 
 Initializes the GIMP stock icon factory.
@@ -239,14 +242,14 @@ this for you.
 
 
 
-<anchor id="GIMP-STOCK-ANCHOR:CAPS"/>GIMP_STOCK_ANCHOR
+<anchor id="GIMP-STOCK-ANCHOR:CAPS" role="macro"/>GIMP_STOCK_ANCHOR
 GIMP_STOCK_ANCHOR#define GIMP_STOCK_ANCHOR                   "gimp-anchor"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CENTER:CAPS"/>GIMP_STOCK_CENTER
+<anchor id="GIMP-STOCK-CENTER:CAPS" role="macro"/>GIMP_STOCK_CENTER
 GIMP_STOCK_CENTER#define GIMP_STOCK_CENTER                   "gimp-center"
 
 
@@ -254,35 +257,35 @@ this for you.
 
 
 
-<anchor id="GIMP-STOCK-DUPLICATE:CAPS"/>GIMP_STOCK_DUPLICATE
+<anchor id="GIMP-STOCK-DUPLICATE:CAPS" role="macro"/>GIMP_STOCK_DUPLICATE
 GIMP_STOCK_DUPLICATE#define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
 
 
 
 
 
-<anchor id="GIMP-STOCK-EDIT:CAPS"/>GIMP_STOCK_EDIT
+<anchor id="GIMP-STOCK-EDIT:CAPS" role="macro"/>GIMP_STOCK_EDIT
 GIMP_STOCK_EDIT#define GIMP_STOCK_EDIT                     "gimp-edit"
 
 
 
 
 
-<anchor id="GIMP-STOCK-RESET:CAPS"/>GIMP_STOCK_RESET
+<anchor id="GIMP-STOCK-RESET:CAPS" role="macro"/>GIMP_STOCK_RESET
 GIMP_STOCK_RESET#define GIMP_STOCK_RESET                    "gimp-reset"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CLOSE:CAPS"/>GIMP_STOCK_CLOSE
+<anchor id="GIMP-STOCK-CLOSE:CAPS" role="macro"/>GIMP_STOCK_CLOSE
 GIMP_STOCK_CLOSE#define GIMP_STOCK_CLOSE                    "gimp-close"
 
 
 
 
 
-<anchor id="GIMP-STOCK-MENU-LEFT:CAPS"/>GIMP_STOCK_MENU_LEFT
+<anchor id="GIMP-STOCK-MENU-LEFT:CAPS" role="macro"/>GIMP_STOCK_MENU_LEFT
 GIMP_STOCK_MENU_LEFT#define GIMP_STOCK_MENU_LEFT                "gimp-menu-left"
 
 
@@ -291,7 +294,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-MENU-RIGHT:CAPS"/>GIMP_STOCK_MENU_RIGHT
+<anchor id="GIMP-STOCK-MENU-RIGHT:CAPS" role="macro"/>GIMP_STOCK_MENU_RIGHT
 GIMP_STOCK_MENU_RIGHT#define GIMP_STOCK_MENU_RIGHT               "gimp-menu-right"
 
 
@@ -300,7 +303,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-MOVE-TO-SCREEN:CAPS"/>GIMP_STOCK_MOVE_TO_SCREEN
+<anchor id="GIMP-STOCK-MOVE-TO-SCREEN:CAPS" role="macro"/>GIMP_STOCK_MOVE_TO_SCREEN
 GIMP_STOCK_MOVE_TO_SCREEN#define GIMP_STOCK_MOVE_TO_SCREEN           "gimp_move-to-screen"
 
 
@@ -308,77 +311,77 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-INVERT:CAPS"/>GIMP_STOCK_INVERT
+<anchor id="GIMP-STOCK-INVERT:CAPS" role="macro"/>GIMP_STOCK_INVERT
 GIMP_STOCK_INVERT#define GIMP_STOCK_INVERT                   "gimp-invert"
 
 
 
 
 
-<anchor id="GIMP-STOCK-LAYER-TO-IMAGESIZE:CAPS"/>GIMP_STOCK_LAYER_TO_IMAGESIZE
+<anchor id="GIMP-STOCK-LAYER-TO-IMAGESIZE:CAPS" role="macro"/>GIMP_STOCK_LAYER_TO_IMAGESIZE
 GIMP_STOCK_LAYER_TO_IMAGESIZE#define GIMP_STOCK_LAYER_TO_IMAGESIZE       "gimp-layer-to-imagesize"
 
 
 
 
 
-<anchor id="GIMP-STOCK-MERGE-DOWN:CAPS"/>GIMP_STOCK_MERGE_DOWN
+<anchor id="GIMP-STOCK-MERGE-DOWN:CAPS" role="macro"/>GIMP_STOCK_MERGE_DOWN
 GIMP_STOCK_MERGE_DOWN#define GIMP_STOCK_MERGE_DOWN               "gimp-merge-down"
 
 
 
 
 
-<anchor id="GIMP-STOCK-NAVIGATION:CAPS"/>GIMP_STOCK_NAVIGATION
+<anchor id="GIMP-STOCK-NAVIGATION:CAPS" role="macro"/>GIMP_STOCK_NAVIGATION
 GIMP_STOCK_NAVIGATION#define GIMP_STOCK_NAVIGATION               "gimp-navigation"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PASTE-AS-NEW:CAPS"/>GIMP_STOCK_PASTE_AS_NEW
+<anchor id="GIMP-STOCK-PASTE-AS-NEW:CAPS" role="macro"/>GIMP_STOCK_PASTE_AS_NEW
 GIMP_STOCK_PASTE_AS_NEW#define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PASTE-INTO:CAPS"/>GIMP_STOCK_PASTE_INTO
+<anchor id="GIMP-STOCK-PASTE-INTO:CAPS" role="macro"/>GIMP_STOCK_PASTE_INTO
 GIMP_STOCK_PASTE_INTO#define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PATH-STROKE:CAPS"/>GIMP_STOCK_PATH_STROKE
+<anchor id="GIMP-STOCK-PATH-STROKE:CAPS" role="macro"/>GIMP_STOCK_PATH_STROKE
 GIMP_STOCK_PATH_STROKE#define GIMP_STOCK_PATH_STROKE              "gimp-path-stroke"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PLUGIN:CAPS"/>GIMP_STOCK_PLUGIN
+<anchor id="GIMP-STOCK-PLUGIN:CAPS" role="macro"/>GIMP_STOCK_PLUGIN
 GIMP_STOCK_PLUGIN#define GIMP_STOCK_PLUGIN                   "gimp-plugin"
 
 
 
 
 
-<anchor id="GIMP-STOCK-QMASK-OFF:CAPS"/>GIMP_STOCK_QMASK_OFF
+<anchor id="GIMP-STOCK-QMASK-OFF:CAPS" role="macro"/>GIMP_STOCK_QMASK_OFF
 GIMP_STOCK_QMASK_OFF#define GIMP_STOCK_QMASK_OFF                "gimp-qmask-off"
 
 
 
 
 
-<anchor id="GIMP-STOCK-QMASK-ON:CAPS"/>GIMP_STOCK_QMASK_ON
+<anchor id="GIMP-STOCK-QMASK-ON:CAPS" role="macro"/>GIMP_STOCK_QMASK_ON
 GIMP_STOCK_QMASK_ON#define GIMP_STOCK_QMASK_ON                 "gimp-qmask-on"
 
 
 
 
 
-<anchor id="GIMP-STOCK-HISTOGRAM:CAPS"/>GIMP_STOCK_HISTOGRAM
+<anchor id="GIMP-STOCK-HISTOGRAM:CAPS" role="macro"/>GIMP_STOCK_HISTOGRAM
 GIMP_STOCK_HISTOGRAM#define GIMP_STOCK_HISTOGRAM                "gimp-histogram"
 
 
@@ -386,77 +389,77 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-HISTOGRAM-LINEAR:CAPS"/>GIMP_STOCK_HISTOGRAM_LINEAR
+<anchor id="GIMP-STOCK-HISTOGRAM-LINEAR:CAPS" role="macro"/>GIMP_STOCK_HISTOGRAM_LINEAR
 GIMP_STOCK_HISTOGRAM_LINEAR#define GIMP_STOCK_HISTOGRAM_LINEAR         "gimp-histogram-linear"
 
 
 
 
 
-<anchor id="GIMP-STOCK-HISTOGRAM-LOGARITHMIC:CAPS"/>GIMP_STOCK_HISTOGRAM_LOGARITHMIC
+<anchor id="GIMP-STOCK-HISTOGRAM-LOGARITHMIC:CAPS" role="macro"/>GIMP_STOCK_HISTOGRAM_LOGARITHMIC
 GIMP_STOCK_HISTOGRAM_LOGARITHMIC#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC    "gimp-histogram-logarithmic"
 
 
 
 
 
-<anchor id="GIMP-STOCK-RESHOW-FILTER:CAPS"/>GIMP_STOCK_RESHOW_FILTER
+<anchor id="GIMP-STOCK-RESHOW-FILTER:CAPS" role="macro"/>GIMP_STOCK_RESHOW_FILTER
 GIMP_STOCK_RESHOW_FILTER#define GIMP_STOCK_RESHOW_FILTER            "gimp-reshow-filter"
 
 
 
 
 
-<anchor id="GIMP-STOCK-RESIZE:CAPS"/>GIMP_STOCK_RESIZE
+<anchor id="GIMP-STOCK-RESIZE:CAPS" role="macro"/>GIMP_STOCK_RESIZE
 GIMP_STOCK_RESIZE#define GIMP_STOCK_RESIZE                   "gimp-resize"
 
 
 
 
 
-<anchor id="GIMP-STOCK-FLIP-HORIZONTAL:CAPS"/>GIMP_STOCK_FLIP_HORIZONTAL
+<anchor id="GIMP-STOCK-FLIP-HORIZONTAL:CAPS" role="macro"/>GIMP_STOCK_FLIP_HORIZONTAL
 GIMP_STOCK_FLIP_HORIZONTAL#define GIMP_STOCK_FLIP_HORIZONTAL          "gimp-flip-horizontal"
 
 
 
 
 
-<anchor id="GIMP-STOCK-FLIP-VERTICAL:CAPS"/>GIMP_STOCK_FLIP_VERTICAL
+<anchor id="GIMP-STOCK-FLIP-VERTICAL:CAPS" role="macro"/>GIMP_STOCK_FLIP_VERTICAL
 GIMP_STOCK_FLIP_VERTICAL#define GIMP_STOCK_FLIP_VERTICAL            "gimp-flip-vertical"
 
 
 
 
 
-<anchor id="GIMP-STOCK-ROTATE-180:CAPS"/>GIMP_STOCK_ROTATE_180
+<anchor id="GIMP-STOCK-ROTATE-180:CAPS" role="macro"/>GIMP_STOCK_ROTATE_180
 GIMP_STOCK_ROTATE_180#define GIMP_STOCK_ROTATE_180               "gimp-rotate-180"
 
 
 
 
 
-<anchor id="GIMP-STOCK-ROTATE-270:CAPS"/>GIMP_STOCK_ROTATE_270
+<anchor id="GIMP-STOCK-ROTATE-270:CAPS" role="macro"/>GIMP_STOCK_ROTATE_270
 GIMP_STOCK_ROTATE_270#define GIMP_STOCK_ROTATE_270               "gimp-rotate-270"
 
 
 
 
 
-<anchor id="GIMP-STOCK-ROTATE-90:CAPS"/>GIMP_STOCK_ROTATE_90
+<anchor id="GIMP-STOCK-ROTATE-90:CAPS" role="macro"/>GIMP_STOCK_ROTATE_90
 GIMP_STOCK_ROTATE_90#define GIMP_STOCK_ROTATE_90                "gimp-rotate-90"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SCALE:CAPS"/>GIMP_STOCK_SCALE
+<anchor id="GIMP-STOCK-SCALE:CAPS" role="macro"/>GIMP_STOCK_SCALE
 GIMP_STOCK_SCALE#define GIMP_STOCK_SCALE                    "gimp-scale"
 
 
 
 
 
-<anchor id="GIMP-STOCK-LINKED:CAPS"/>GIMP_STOCK_LINKED
+<anchor id="GIMP-STOCK-LINKED:CAPS" role="macro"/>GIMP_STOCK_LINKED
 GIMP_STOCK_LINKED#define GIMP_STOCK_LINKED                   "gimp-linked"
 
 
@@ -464,7 +467,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-VISIBLE:CAPS"/>GIMP_STOCK_VISIBLE
+<anchor id="GIMP-STOCK-VISIBLE:CAPS" role="macro"/>GIMP_STOCK_VISIBLE
 GIMP_STOCK_VISIBLE#define GIMP_STOCK_VISIBLE                  "gimp-visible"
 
 
@@ -472,35 +475,35 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-LIST:CAPS"/>GIMP_STOCK_LIST
+<anchor id="GIMP-STOCK-LIST:CAPS" role="macro"/>GIMP_STOCK_LIST
 GIMP_STOCK_LIST#define GIMP_STOCK_LIST                     "gimp-list"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRID:CAPS"/>GIMP_STOCK_GRID
+<anchor id="GIMP-STOCK-GRID:CAPS" role="macro"/>GIMP_STOCK_GRID
 GIMP_STOCK_GRID#define GIMP_STOCK_GRID                     "gimp-grid"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PORTRAIT:CAPS"/>GIMP_STOCK_PORTRAIT
+<anchor id="GIMP-STOCK-PORTRAIT:CAPS" role="macro"/>GIMP_STOCK_PORTRAIT
 GIMP_STOCK_PORTRAIT#define GIMP_STOCK_PORTRAIT                 "gimp-portrait"
 
 
 
 
 
-<anchor id="GIMP-STOCK-LANDSCAPE:CAPS"/>GIMP_STOCK_LANDSCAPE
+<anchor id="GIMP-STOCK-LANDSCAPE:CAPS" role="macro"/>GIMP_STOCK_LANDSCAPE
 GIMP_STOCK_LANDSCAPE#define GIMP_STOCK_LANDSCAPE                "gimp-landscape"
 
 
 
 
 
-<anchor id="GIMP-STOCK-VIDEO:CAPS"/>GIMP_STOCK_VIDEO
+<anchor id="GIMP-STOCK-VIDEO:CAPS" role="macro"/>GIMP_STOCK_VIDEO
 GIMP_STOCK_VIDEO#define GIMP_STOCK_VIDEO                    "gimp-video"
 
 
@@ -508,7 +511,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-WEB:CAPS"/>GIMP_STOCK_WEB
+<anchor id="GIMP-STOCK-WEB:CAPS" role="macro"/>GIMP_STOCK_WEB
 GIMP_STOCK_WEB#define GIMP_STOCK_WEB                      "gimp-web"
 
 
@@ -516,7 +519,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-IMAGE:CAPS"/>GIMP_STOCK_IMAGE
+<anchor id="GIMP-STOCK-IMAGE:CAPS" role="macro"/>GIMP_STOCK_IMAGE
 GIMP_STOCK_IMAGE#define GIMP_STOCK_IMAGE                    "gimp-image"
 
 
@@ -526,7 +529,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-LAYER:CAPS"/>GIMP_STOCK_LAYER
+<anchor id="GIMP-STOCK-LAYER:CAPS" role="macro"/>GIMP_STOCK_LAYER
 GIMP_STOCK_LAYER#define GIMP_STOCK_LAYER                    "gimp-layer"
 
 
@@ -536,7 +539,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-LAYER-MASK:CAPS"/>GIMP_STOCK_LAYER_MASK
+<anchor id="GIMP-STOCK-LAYER-MASK:CAPS" role="macro"/>GIMP_STOCK_LAYER_MASK
 GIMP_STOCK_LAYER_MASK#define GIMP_STOCK_LAYER_MASK               "gimp-layer-mask"
 
 
@@ -546,7 +549,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL:CAPS"/>GIMP_STOCK_CHANNEL
+<anchor id="GIMP-STOCK-CHANNEL:CAPS" role="macro"/>GIMP_STOCK_CHANNEL
 GIMP_STOCK_CHANNEL#define GIMP_STOCK_CHANNEL                  "gimp-channel"
 
 
@@ -556,7 +559,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-RED:CAPS"/>GIMP_STOCK_CHANNEL_RED
+<anchor id="GIMP-STOCK-CHANNEL-RED:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_RED
 GIMP_STOCK_CHANNEL_RED#define GIMP_STOCK_CHANNEL_RED              "gimp-channel-red"
 
 
@@ -566,7 +569,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-GREEN:CAPS"/>GIMP_STOCK_CHANNEL_GREEN
+<anchor id="GIMP-STOCK-CHANNEL-GREEN:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_GREEN
 GIMP_STOCK_CHANNEL_GREEN#define GIMP_STOCK_CHANNEL_GREEN            "gimp-channel-green"
 
 
@@ -576,7 +579,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-BLUE:CAPS"/>GIMP_STOCK_CHANNEL_BLUE
+<anchor id="GIMP-STOCK-CHANNEL-BLUE:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_BLUE
 GIMP_STOCK_CHANNEL_BLUE#define GIMP_STOCK_CHANNEL_BLUE             "gimp-channel-blue"
 
 
@@ -586,7 +589,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-GRAY:CAPS"/>GIMP_STOCK_CHANNEL_GRAY
+<anchor id="GIMP-STOCK-CHANNEL-GRAY:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_GRAY
 GIMP_STOCK_CHANNEL_GRAY#define GIMP_STOCK_CHANNEL_GRAY             "gimp-channel-gray"
 
 
@@ -596,7 +599,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-INDEXED:CAPS"/>GIMP_STOCK_CHANNEL_INDEXED
+<anchor id="GIMP-STOCK-CHANNEL-INDEXED:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_INDEXED
 GIMP_STOCK_CHANNEL_INDEXED#define GIMP_STOCK_CHANNEL_INDEXED          "gimp-channel-indexed"
 
 
@@ -606,7 +609,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNEL-ALPHA:CAPS"/>GIMP_STOCK_CHANNEL_ALPHA
+<anchor id="GIMP-STOCK-CHANNEL-ALPHA:CAPS" role="macro"/>GIMP_STOCK_CHANNEL_ALPHA
 GIMP_STOCK_CHANNEL_ALPHA#define GIMP_STOCK_CHANNEL_ALPHA            "gimp-channel-alpha"
 
 
@@ -616,7 +619,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-PATH:CAPS"/>GIMP_STOCK_PATH
+<anchor id="GIMP-STOCK-PATH:CAPS" role="macro"/>GIMP_STOCK_PATH
 GIMP_STOCK_PATH#define GIMP_STOCK_PATH                     "gimp-path"
 
 
@@ -624,7 +627,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TEXT-LAYER:CAPS"/>GIMP_STOCK_TEXT_LAYER
+<anchor id="GIMP-STOCK-TEXT-LAYER:CAPS" role="macro"/>GIMP_STOCK_TEXT_LAYER
 GIMP_STOCK_TEXT_LAYER#define GIMP_STOCK_TEXT_LAYER               "gimp-text-layer"
 
 
@@ -634,7 +637,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-FLOATING-SELECTION:CAPS"/>GIMP_STOCK_FLOATING_SELECTION
+<anchor id="GIMP-STOCK-FLOATING-SELECTION:CAPS" role="macro"/>GIMP_STOCK_FLOATING_SELECTION
 GIMP_STOCK_FLOATING_SELECTION#define GIMP_STOCK_FLOATING_SELECTION       "gimp-floating-selection"
 
 
@@ -644,7 +647,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TEMPLATE:CAPS"/>GIMP_STOCK_TEMPLATE
+<anchor id="GIMP-STOCK-TEMPLATE:CAPS" role="macro"/>GIMP_STOCK_TEMPLATE
 GIMP_STOCK_TEMPLATE#define GIMP_STOCK_TEMPLATE                 "gimp-template"
 
 
@@ -652,7 +655,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-IMAGES:CAPS"/>GIMP_STOCK_IMAGES
+<anchor id="GIMP-STOCK-IMAGES:CAPS" role="macro"/>GIMP_STOCK_IMAGES
 GIMP_STOCK_IMAGES#define GIMP_STOCK_IMAGES                   "gimp-images"
 
 
@@ -660,7 +663,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-LAYERS:CAPS"/>GIMP_STOCK_LAYERS
+<anchor id="GIMP-STOCK-LAYERS:CAPS" role="macro"/>GIMP_STOCK_LAYERS
 GIMP_STOCK_LAYERS#define GIMP_STOCK_LAYERS                   "gimp-layers"
 
 
@@ -668,7 +671,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CHANNELS:CAPS"/>GIMP_STOCK_CHANNELS
+<anchor id="GIMP-STOCK-CHANNELS:CAPS" role="macro"/>GIMP_STOCK_CHANNELS
 GIMP_STOCK_CHANNELS#define GIMP_STOCK_CHANNELS                 "gimp-channels"
 
 
@@ -676,7 +679,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-PATHS:CAPS"/>GIMP_STOCK_PATHS
+<anchor id="GIMP-STOCK-PATHS:CAPS" role="macro"/>GIMP_STOCK_PATHS
 GIMP_STOCK_PATHS#define GIMP_STOCK_PATHS                    "gimp-paths"
 
 
@@ -684,7 +687,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-INDEXED-PALETTE:CAPS"/>GIMP_STOCK_INDEXED_PALETTE
+<anchor id="GIMP-STOCK-INDEXED-PALETTE:CAPS" role="macro"/>GIMP_STOCK_INDEXED_PALETTE
 GIMP_STOCK_INDEXED_PALETTE#define GIMP_STOCK_INDEXED_PALETTE          "gimp-indexed-palette"
 
 
@@ -692,329 +695,329 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-SHAPE-CIRCLE:CAPS"/>GIMP_STOCK_SHAPE_CIRCLE
+<anchor id="GIMP-STOCK-SHAPE-CIRCLE:CAPS" role="macro"/>GIMP_STOCK_SHAPE_CIRCLE
 GIMP_STOCK_SHAPE_CIRCLE#define GIMP_STOCK_SHAPE_CIRCLE             "gimp-shape-circle"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SHAPE-SQUARE:CAPS"/>GIMP_STOCK_SHAPE_SQUARE
+<anchor id="GIMP-STOCK-SHAPE-SQUARE:CAPS" role="macro"/>GIMP_STOCK_SHAPE_SQUARE
 GIMP_STOCK_SHAPE_SQUARE#define GIMP_STOCK_SHAPE_SQUARE             "gimp-shape-square"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SHAPE-DIAMOND:CAPS"/>GIMP_STOCK_SHAPE_DIAMOND
+<anchor id="GIMP-STOCK-SHAPE-DIAMOND:CAPS" role="macro"/>GIMP_STOCK_SHAPE_DIAMOND
 GIMP_STOCK_SHAPE_DIAMOND#define GIMP_STOCK_SHAPE_DIAMOND            "gimp-shape-diamond"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CAP-BUTT:CAPS"/>GIMP_STOCK_CAP_BUTT
+<anchor id="GIMP-STOCK-CAP-BUTT:CAPS" role="macro"/>GIMP_STOCK_CAP_BUTT
 GIMP_STOCK_CAP_BUTT#define GIMP_STOCK_CAP_BUTT                 "gimp-cap-butt"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CAP-ROUND:CAPS"/>GIMP_STOCK_CAP_ROUND
+<anchor id="GIMP-STOCK-CAP-ROUND:CAPS" role="macro"/>GIMP_STOCK_CAP_ROUND
 GIMP_STOCK_CAP_ROUND#define GIMP_STOCK_CAP_ROUND                "gimp-cap-round"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CAP-SQUARE:CAPS"/>GIMP_STOCK_CAP_SQUARE
+<anchor id="GIMP-STOCK-CAP-SQUARE:CAPS" role="macro"/>GIMP_STOCK_CAP_SQUARE
 GIMP_STOCK_CAP_SQUARE#define GIMP_STOCK_CAP_SQUARE               "gimp-cap-square"
 
 
 
 
 
-<anchor id="GIMP-STOCK-JOIN-MITER:CAPS"/>GIMP_STOCK_JOIN_MITER
+<anchor id="GIMP-STOCK-JOIN-MITER:CAPS" role="macro"/>GIMP_STOCK_JOIN_MITER
 GIMP_STOCK_JOIN_MITER#define GIMP_STOCK_JOIN_MITER               "gimp-join-miter"
 
 
 
 
 
-<anchor id="GIMP-STOCK-JOIN-ROUND:CAPS"/>GIMP_STOCK_JOIN_ROUND
+<anchor id="GIMP-STOCK-JOIN-ROUND:CAPS" role="macro"/>GIMP_STOCK_JOIN_ROUND
 GIMP_STOCK_JOIN_ROUND#define GIMP_STOCK_JOIN_ROUND               "gimp-join-round"
 
 
 
 
 
-<anchor id="GIMP-STOCK-JOIN-BEVEL:CAPS"/>GIMP_STOCK_JOIN_BEVEL
+<anchor id="GIMP-STOCK-JOIN-BEVEL:CAPS" role="macro"/>GIMP_STOCK_JOIN_BEVEL
 GIMP_STOCK_JOIN_BEVEL#define GIMP_STOCK_JOIN_BEVEL               "gimp-join-bevel"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION:CAPS"/>GIMP_STOCK_SELECTION
+<anchor id="GIMP-STOCK-SELECTION:CAPS" role="macro"/>GIMP_STOCK_SELECTION
 GIMP_STOCK_SELECTION#define GIMP_STOCK_SELECTION                "gimp-selection"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-ALL:CAPS"/>GIMP_STOCK_SELECTION_ALL
+<anchor id="GIMP-STOCK-SELECTION-ALL:CAPS" role="macro"/>GIMP_STOCK_SELECTION_ALL
 GIMP_STOCK_SELECTION_ALL#define GIMP_STOCK_SELECTION_ALL            "gimp-selection-all"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-NONE:CAPS"/>GIMP_STOCK_SELECTION_NONE
+<anchor id="GIMP-STOCK-SELECTION-NONE:CAPS" role="macro"/>GIMP_STOCK_SELECTION_NONE
 GIMP_STOCK_SELECTION_NONE#define GIMP_STOCK_SELECTION_NONE           "gimp-selection-none"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-GROW:CAPS"/>GIMP_STOCK_SELECTION_GROW
+<anchor id="GIMP-STOCK-SELECTION-GROW:CAPS" role="macro"/>GIMP_STOCK_SELECTION_GROW
 GIMP_STOCK_SELECTION_GROW#define GIMP_STOCK_SELECTION_GROW           "gimp-selection-grow"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-SHRINK:CAPS"/>GIMP_STOCK_SELECTION_SHRINK
+<anchor id="GIMP-STOCK-SELECTION-SHRINK:CAPS" role="macro"/>GIMP_STOCK_SELECTION_SHRINK
 GIMP_STOCK_SELECTION_SHRINK#define GIMP_STOCK_SELECTION_SHRINK         "gimp-selection-shrink"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-BORDER:CAPS"/>GIMP_STOCK_SELECTION_BORDER
+<anchor id="GIMP-STOCK-SELECTION-BORDER:CAPS" role="macro"/>GIMP_STOCK_SELECTION_BORDER
 GIMP_STOCK_SELECTION_BORDER#define GIMP_STOCK_SELECTION_BORDER         "gimp-selection-border"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-ADD:CAPS"/>GIMP_STOCK_SELECTION_ADD
+<anchor id="GIMP-STOCK-SELECTION-ADD:CAPS" role="macro"/>GIMP_STOCK_SELECTION_ADD
 GIMP_STOCK_SELECTION_ADD#define GIMP_STOCK_SELECTION_ADD            "gimp-selection-add"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-SUBTRACT:CAPS"/>GIMP_STOCK_SELECTION_SUBTRACT
+<anchor id="GIMP-STOCK-SELECTION-SUBTRACT:CAPS" role="macro"/>GIMP_STOCK_SELECTION_SUBTRACT
 GIMP_STOCK_SELECTION_SUBTRACT#define GIMP_STOCK_SELECTION_SUBTRACT       "gimp-selection-subtract"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-REPLACE:CAPS"/>GIMP_STOCK_SELECTION_REPLACE
+<anchor id="GIMP-STOCK-SELECTION-REPLACE:CAPS" role="macro"/>GIMP_STOCK_SELECTION_REPLACE
 GIMP_STOCK_SELECTION_REPLACE#define GIMP_STOCK_SELECTION_REPLACE        "gimp-selection-replace"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-INTERSECT:CAPS"/>GIMP_STOCK_SELECTION_INTERSECT
+<anchor id="GIMP-STOCK-SELECTION-INTERSECT:CAPS" role="macro"/>GIMP_STOCK_SELECTION_INTERSECT
 GIMP_STOCK_SELECTION_INTERSECT#define GIMP_STOCK_SELECTION_INTERSECT      "gimp-selection-intersect"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-STROKE:CAPS"/>GIMP_STOCK_SELECTION_STROKE
+<anchor id="GIMP-STOCK-SELECTION-STROKE:CAPS" role="macro"/>GIMP_STOCK_SELECTION_STROKE
 GIMP_STOCK_SELECTION_STROKE#define GIMP_STOCK_SELECTION_STROKE         "gimp-selection-stroke"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-TO-CHANNEL:CAPS"/>GIMP_STOCK_SELECTION_TO_CHANNEL
+<anchor id="GIMP-STOCK-SELECTION-TO-CHANNEL:CAPS" role="macro"/>GIMP_STOCK_SELECTION_TO_CHANNEL
 GIMP_STOCK_SELECTION_TO_CHANNEL#define GIMP_STOCK_SELECTION_TO_CHANNEL     "gimp-selection-to-channel"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SELECTION-TO-PATH:CAPS"/>GIMP_STOCK_SELECTION_TO_PATH
+<anchor id="GIMP-STOCK-SELECTION-TO-PATH:CAPS" role="macro"/>GIMP_STOCK_SELECTION_TO_PATH
 GIMP_STOCK_SELECTION_TO_PATH#define GIMP_STOCK_SELECTION_TO_PATH        "gimp-selection-to-path"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-LINEAR:CAPS"/>GIMP_STOCK_GRADIENT_LINEAR
+<anchor id="GIMP-STOCK-GRADIENT-LINEAR:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_LINEAR
 GIMP_STOCK_GRADIENT_LINEAR#define GIMP_STOCK_GRADIENT_LINEAR               "gimp-gradient-linear"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-BILINEAR:CAPS"/>GIMP_STOCK_GRADIENT_BILINEAR
+<anchor id="GIMP-STOCK-GRADIENT-BILINEAR:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_BILINEAR
 GIMP_STOCK_GRADIENT_BILINEAR#define GIMP_STOCK_GRADIENT_BILINEAR             "gimp-gradient-bilinear"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-RADIAL:CAPS"/>GIMP_STOCK_GRADIENT_RADIAL
+<anchor id="GIMP-STOCK-GRADIENT-RADIAL:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_RADIAL
 GIMP_STOCK_GRADIENT_RADIAL#define GIMP_STOCK_GRADIENT_RADIAL               "gimp-gradient-radial"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SQUARE:CAPS"/>GIMP_STOCK_GRADIENT_SQUARE
+<anchor id="GIMP-STOCK-GRADIENT-SQUARE:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SQUARE
 GIMP_STOCK_GRADIENT_SQUARE#define GIMP_STOCK_GRADIENT_SQUARE               "gimp-gradient-square"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-CONICAL-SYMMETRIC:CAPS"/>GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC
+<anchor id="GIMP-STOCK-GRADIENT-CONICAL-SYMMETRIC:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC
 GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC#define GIMP_STOCK_GRADIENT_CONICAL_SYMMETRIC    "gimp-gradient-conical-symmetric"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-CONICAL-ASYMMETRIC:CAPS"/>GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC
+<anchor id="GIMP-STOCK-GRADIENT-CONICAL-ASYMMETRIC:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC
 GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC#define GIMP_STOCK_GRADIENT_CONICAL_ASYMMETRIC   "gimp-gradient-conical-asymmetric"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-SPHERICAL:CAPS"/>GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL
+<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-SPHERICAL:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL
 GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL#define GIMP_STOCK_GRADIENT_SHAPEBURST_SPHERICAL "gimp-gradient-shapeburst-spherical"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-ANGULAR:CAPS"/>GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR
+<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-ANGULAR:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR
 GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR#define GIMP_STOCK_GRADIENT_SHAPEBURST_ANGULAR   "gimp-gradient-shapeburst-angular"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-DIMPLED:CAPS"/>GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED
+<anchor id="GIMP-STOCK-GRADIENT-SHAPEBURST-DIMPLED:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED
 GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED#define GIMP_STOCK_GRADIENT_SHAPEBURST_DIMPLED   "gimp-gradient-shapeburst-dimpled"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SPIRAL-CLOCKWISE:CAPS"/>GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE
+<anchor id="GIMP-STOCK-GRADIENT-SPIRAL-CLOCKWISE:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE
 GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE#define GIMP_STOCK_GRADIENT_SPIRAL_CLOCKWISE     "gimp-gradient-spiral-clockwise"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT-SPIRAL-ANTICLOCKWISE:CAPS"/>GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE
+<anchor id="GIMP-STOCK-GRADIENT-SPIRAL-ANTICLOCKWISE:CAPS" role="macro"/>GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE
 GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-NORTH-WEST:CAPS"/>GIMP_STOCK_GRAVITY_NORTH_WEST
+<anchor id="GIMP-STOCK-GRAVITY-NORTH-WEST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_NORTH_WEST
 GIMP_STOCK_GRAVITY_NORTH_WEST#define GIMP_STOCK_GRAVITY_NORTH_WEST       "gimp-gravity-north-west"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-NORTH:CAPS"/>GIMP_STOCK_GRAVITY_NORTH
+<anchor id="GIMP-STOCK-GRAVITY-NORTH:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_NORTH
 GIMP_STOCK_GRAVITY_NORTH#define GIMP_STOCK_GRAVITY_NORTH            "gimp-gravity-north"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-NORTH-EAST:CAPS"/>GIMP_STOCK_GRAVITY_NORTH_EAST
+<anchor id="GIMP-STOCK-GRAVITY-NORTH-EAST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_NORTH_EAST
 GIMP_STOCK_GRAVITY_NORTH_EAST#define GIMP_STOCK_GRAVITY_NORTH_EAST       "gimp-gravity-north-east"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-WEST:CAPS"/>GIMP_STOCK_GRAVITY_WEST
+<anchor id="GIMP-STOCK-GRAVITY-WEST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_WEST
 GIMP_STOCK_GRAVITY_WEST#define GIMP_STOCK_GRAVITY_WEST             "gimp-gravity-west"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-EAST:CAPS"/>GIMP_STOCK_GRAVITY_EAST
+<anchor id="GIMP-STOCK-GRAVITY-EAST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_EAST
 GIMP_STOCK_GRAVITY_EAST#define GIMP_STOCK_GRAVITY_EAST             "gimp-gravity-east"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-SOUTH-WEST:CAPS"/>GIMP_STOCK_GRAVITY_SOUTH_WEST
+<anchor id="GIMP-STOCK-GRAVITY-SOUTH-WEST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_SOUTH_WEST
 GIMP_STOCK_GRAVITY_SOUTH_WEST#define GIMP_STOCK_GRAVITY_SOUTH_WEST       "gimp-gravity-south-west"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-SOUTH:CAPS"/>GIMP_STOCK_GRAVITY_SOUTH
+<anchor id="GIMP-STOCK-GRAVITY-SOUTH:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_SOUTH
 GIMP_STOCK_GRAVITY_SOUTH#define GIMP_STOCK_GRAVITY_SOUTH            "gimp-gravity-south"
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRAVITY-SOUTH-EAST:CAPS"/>GIMP_STOCK_GRAVITY_SOUTH_EAST
+<anchor id="GIMP-STOCK-GRAVITY-SOUTH-EAST:CAPS" role="macro"/>GIMP_STOCK_GRAVITY_SOUTH_EAST
 GIMP_STOCK_GRAVITY_SOUTH_EAST#define GIMP_STOCK_GRAVITY_SOUTH_EAST       "gimp-gravity-south-east"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CHAR-PICKER:CAPS"/>GIMP_STOCK_CHAR_PICKER
+<anchor id="GIMP-STOCK-CHAR-PICKER:CAPS" role="macro"/>GIMP_STOCK_CHAR_PICKER
 GIMP_STOCK_CHAR_PICKER#define GIMP_STOCK_CHAR_PICKER              "gimp-char-picker"
 
 
 
 
 
-<anchor id="GIMP-STOCK-LETTER-SPACING:CAPS"/>GIMP_STOCK_LETTER_SPACING
+<anchor id="GIMP-STOCK-LETTER-SPACING:CAPS" role="macro"/>GIMP_STOCK_LETTER_SPACING
 GIMP_STOCK_LETTER_SPACING#define GIMP_STOCK_LETTER_SPACING           "gimp-letter-spacing"
 
 
 
 
 
-<anchor id="GIMP-STOCK-LINE-SPACING:CAPS"/>GIMP_STOCK_LINE_SPACING
+<anchor id="GIMP-STOCK-LINE-SPACING:CAPS" role="macro"/>GIMP_STOCK_LINE_SPACING
 GIMP_STOCK_LINE_SPACING#define GIMP_STOCK_LINE_SPACING             "gimp-line-spacing"
 
 
 
 
 
-<anchor id="GIMP-STOCK-TEXT-DIR-LTR:CAPS"/>GIMP_STOCK_TEXT_DIR_LTR
+<anchor id="GIMP-STOCK-TEXT-DIR-LTR:CAPS" role="macro"/>GIMP_STOCK_TEXT_DIR_LTR
 GIMP_STOCK_TEXT_DIR_LTR#define GIMP_STOCK_TEXT_DIR_LTR             "gimp-text-dir-ltr"
 
 
 
 
 
-<anchor id="GIMP-STOCK-TEXT-DIR-RTL:CAPS"/>GIMP_STOCK_TEXT_DIR_RTL
+<anchor id="GIMP-STOCK-TEXT-DIR-RTL:CAPS" role="macro"/>GIMP_STOCK_TEXT_DIR_RTL
 GIMP_STOCK_TEXT_DIR_RTL#define GIMP_STOCK_TEXT_DIR_RTL             "gimp-text-dir-rtl"
 
 
 
 
 
-<anchor id="GIMP-STOCK-PRINT-RESOLUTION:CAPS"/>GIMP_STOCK_PRINT_RESOLUTION
+<anchor id="GIMP-STOCK-PRINT-RESOLUTION:CAPS" role="macro"/>GIMP_STOCK_PRINT_RESOLUTION
 GIMP_STOCK_PRINT_RESOLUTION#define GIMP_STOCK_PRINT_RESOLUTION         "gimp-print-resolution"
 
 
@@ -1022,7 +1025,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOLS:CAPS"/>GIMP_STOCK_TOOLS
+<anchor id="GIMP-STOCK-TOOLS:CAPS" role="macro"/>GIMP_STOCK_TOOLS
 GIMP_STOCK_TOOLS#define GIMP_STOCK_TOOLS                    "gimp-tools"
 
 
@@ -1030,7 +1033,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-OPTIONS:CAPS"/>GIMP_STOCK_TOOL_OPTIONS
+<anchor id="GIMP-STOCK-TOOL-OPTIONS:CAPS" role="macro"/>GIMP_STOCK_TOOL_OPTIONS
 GIMP_STOCK_TOOL_OPTIONS#define GIMP_STOCK_TOOL_OPTIONS             "gimp-tool-options"
 
 
@@ -1038,7 +1041,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-DEVICE-STATUS:CAPS"/>GIMP_STOCK_DEVICE_STATUS
+<anchor id="GIMP-STOCK-DEVICE-STATUS:CAPS" role="macro"/>GIMP_STOCK_DEVICE_STATUS
 GIMP_STOCK_DEVICE_STATUS#define GIMP_STOCK_DEVICE_STATUS            "gimp-device-status"
 
 
@@ -1046,7 +1049,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-DISPLAY-FILTER:CAPS"/>GIMP_STOCK_DISPLAY_FILTER
+<anchor id="GIMP-STOCK-DISPLAY-FILTER:CAPS" role="macro"/>GIMP_STOCK_DISPLAY_FILTER
 GIMP_STOCK_DISPLAY_FILTER#define GIMP_STOCK_DISPLAY_FILTER           "gimp-display-filter"
 
 
@@ -1054,105 +1057,105 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-CURVE-FREE:CAPS"/>GIMP_STOCK_CURVE_FREE
+<anchor id="GIMP-STOCK-CURVE-FREE:CAPS" role="macro"/>GIMP_STOCK_CURVE_FREE
 GIMP_STOCK_CURVE_FREE#define GIMP_STOCK_CURVE_FREE               "gimp-curve-free"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CURVE-SMOOTH:CAPS"/>GIMP_STOCK_CURVE_SMOOTH
+<anchor id="GIMP-STOCK-CURVE-SMOOTH:CAPS" role="macro"/>GIMP_STOCK_CURVE_SMOOTH
 GIMP_STOCK_CURVE_SMOOTH#define GIMP_STOCK_CURVE_SMOOTH             "gimp-curve-smooth"
 
 
 
 
 
-<anchor id="GIMP-STOCK-COLOR-PICKER-BLACK:CAPS"/>GIMP_STOCK_COLOR_PICKER_BLACK
+<anchor id="GIMP-STOCK-COLOR-PICKER-BLACK:CAPS" role="macro"/>GIMP_STOCK_COLOR_PICKER_BLACK
 GIMP_STOCK_COLOR_PICKER_BLACK#define GIMP_STOCK_COLOR_PICKER_BLACK       "gimp-color-picker-black"
 
 
 
 
 
-<anchor id="GIMP-STOCK-COLOR-PICKER-GRAY:CAPS"/>GIMP_STOCK_COLOR_PICKER_GRAY
+<anchor id="GIMP-STOCK-COLOR-PICKER-GRAY:CAPS" role="macro"/>GIMP_STOCK_COLOR_PICKER_GRAY
 GIMP_STOCK_COLOR_PICKER_GRAY#define GIMP_STOCK_COLOR_PICKER_GRAY        "gimp-color-picker-gray"
 
 
 
 
 
-<anchor id="GIMP-STOCK-COLOR-PICKER-WHITE:CAPS"/>GIMP_STOCK_COLOR_PICKER_WHITE
+<anchor id="GIMP-STOCK-COLOR-PICKER-WHITE:CAPS" role="macro"/>GIMP_STOCK_COLOR_PICKER_WHITE
 GIMP_STOCK_COLOR_PICKER_WHITE#define GIMP_STOCK_COLOR_PICKER_WHITE       "gimp-color-picker-white"
 
 
 
 
 
-<anchor id="GIMP-STOCK-COLOR-TRIANGLE:CAPS"/>GIMP_STOCK_COLOR_TRIANGLE
+<anchor id="GIMP-STOCK-COLOR-TRIANGLE:CAPS" role="macro"/>GIMP_STOCK_COLOR_TRIANGLE
 GIMP_STOCK_COLOR_TRIANGLE#define GIMP_STOCK_COLOR_TRIANGLE           "gimp-color-triangle"
 
 
 
 
 
-<anchor id="GIMP-STOCK-COLOR-PICK-FROM-SCREEN:CAPS"/>GIMP_STOCK_COLOR_PICK_FROM_SCREEN
+<anchor id="GIMP-STOCK-COLOR-PICK-FROM-SCREEN:CAPS" role="macro"/>GIMP_STOCK_COLOR_PICK_FROM_SCREEN
 GIMP_STOCK_COLOR_PICK_FROM_SCREEN#define GIMP_STOCK_COLOR_PICK_FROM_SCREEN   "gimp-color-pick-from-screen"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CONVERT-GRAYSCALE:CAPS"/>GIMP_STOCK_CONVERT_GRAYSCALE
+<anchor id="GIMP-STOCK-CONVERT-GRAYSCALE:CAPS" role="macro"/>GIMP_STOCK_CONVERT_GRAYSCALE
 GIMP_STOCK_CONVERT_GRAYSCALE#define GIMP_STOCK_CONVERT_GRAYSCALE        "gimp-convert-grayscale"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CONVERT-INDEXED:CAPS"/>GIMP_STOCK_CONVERT_INDEXED
+<anchor id="GIMP-STOCK-CONVERT-INDEXED:CAPS" role="macro"/>GIMP_STOCK_CONVERT_INDEXED
 GIMP_STOCK_CONVERT_INDEXED#define GIMP_STOCK_CONVERT_INDEXED          "gimp-convert-indexed"
 
 
 
 
 
-<anchor id="GIMP-STOCK-CONVERT-RGB:CAPS"/>GIMP_STOCK_CONVERT_RGB
+<anchor id="GIMP-STOCK-CONVERT-RGB:CAPS" role="macro"/>GIMP_STOCK_CONVERT_RGB
 GIMP_STOCK_CONVERT_RGB#define GIMP_STOCK_CONVERT_RGB              "gimp-convert-rgb"
 
 
 
 
 
-<anchor id="GIMP-STOCK-TRANSPARENCY:CAPS"/>GIMP_STOCK_TRANSPARENCY
+<anchor id="GIMP-STOCK-TRANSPARENCY:CAPS" role="macro"/>GIMP_STOCK_TRANSPARENCY
 GIMP_STOCK_TRANSPARENCY#define GIMP_STOCK_TRANSPARENCY             "gimp-transparency"
 
 
 
 
 
-<anchor id="GIMP-STOCK-DEFAULT-COLORS:CAPS"/>GIMP_STOCK_DEFAULT_COLORS
+<anchor id="GIMP-STOCK-DEFAULT-COLORS:CAPS" role="macro"/>GIMP_STOCK_DEFAULT_COLORS
 GIMP_STOCK_DEFAULT_COLORS#define GIMP_STOCK_DEFAULT_COLORS           "gimp-default-colors"
 
 
 
 
 
-<anchor id="GIMP-STOCK-SWAP-COLORS:CAPS"/>GIMP_STOCK_SWAP_COLORS
+<anchor id="GIMP-STOCK-SWAP-COLORS:CAPS" role="macro"/>GIMP_STOCK_SWAP_COLORS
 GIMP_STOCK_SWAP_COLORS#define GIMP_STOCK_SWAP_COLORS              "gimp-swap-colors"
 
 
 
 
 
-<anchor id="GIMP-STOCK-UNDO-HISTORY:CAPS"/>GIMP_STOCK_UNDO_HISTORY
+<anchor id="GIMP-STOCK-UNDO-HISTORY:CAPS" role="macro"/>GIMP_STOCK_UNDO_HISTORY
 GIMP_STOCK_UNDO_HISTORY#define GIMP_STOCK_UNDO_HISTORY             "gimp-undo-history"
 
 
 
 
 
-<anchor id="GIMP-STOCK-TOOL-AIRBRUSH:CAPS"/>GIMP_STOCK_TOOL_AIRBRUSH
+<anchor id="GIMP-STOCK-TOOL-AIRBRUSH:CAPS" role="macro"/>GIMP_STOCK_TOOL_AIRBRUSH
 GIMP_STOCK_TOOL_AIRBRUSH#define GIMP_STOCK_TOOL_AIRBRUSH            "gimp-tool-airbrush"
 
 
@@ -1160,7 +1163,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-BLEND:CAPS"/>GIMP_STOCK_TOOL_BLEND
+<anchor id="GIMP-STOCK-TOOL-BLEND:CAPS" role="macro"/>GIMP_STOCK_TOOL_BLEND
 GIMP_STOCK_TOOL_BLEND#define GIMP_STOCK_TOOL_BLEND               "gimp-tool-blend"
 
 
@@ -1168,7 +1171,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-BLUR:CAPS"/>GIMP_STOCK_TOOL_BLUR
+<anchor id="GIMP-STOCK-TOOL-BLUR:CAPS" role="macro"/>GIMP_STOCK_TOOL_BLUR
 GIMP_STOCK_TOOL_BLUR#define GIMP_STOCK_TOOL_BLUR                "gimp-tool-blur"
 
 
@@ -1176,7 +1179,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-BRIGHTNESS-CONTRAST:CAPS"/>GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST
+<anchor id="GIMP-STOCK-TOOL-BRIGHTNESS-CONTRAST:CAPS" role="macro"/>GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST
 GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST#define GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast"
 
 
@@ -1184,7 +1187,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-BUCKET-FILL:CAPS"/>GIMP_STOCK_TOOL_BUCKET_FILL
+<anchor id="GIMP-STOCK-TOOL-BUCKET-FILL:CAPS" role="macro"/>GIMP_STOCK_TOOL_BUCKET_FILL
 GIMP_STOCK_TOOL_BUCKET_FILL#define GIMP_STOCK_TOOL_BUCKET_FILL         "gimp-tool-bucket-fill"
 
 
@@ -1192,7 +1195,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-BY-COLOR-SELECT:CAPS"/>GIMP_STOCK_TOOL_BY_COLOR_SELECT
+<anchor id="GIMP-STOCK-TOOL-BY-COLOR-SELECT:CAPS" role="macro"/>GIMP_STOCK_TOOL_BY_COLOR_SELECT
 GIMP_STOCK_TOOL_BY_COLOR_SELECT#define GIMP_STOCK_TOOL_BY_COLOR_SELECT     "gimp-tool-by-color-select"
 
 
@@ -1200,7 +1203,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-CLONE:CAPS"/>GIMP_STOCK_TOOL_CLONE
+<anchor id="GIMP-STOCK-TOOL-CLONE:CAPS" role="macro"/>GIMP_STOCK_TOOL_CLONE
 GIMP_STOCK_TOOL_CLONE#define GIMP_STOCK_TOOL_CLONE               "gimp-tool-clone"
 
 
@@ -1208,7 +1211,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-COLOR-BALANCE:CAPS"/>GIMP_STOCK_TOOL_COLOR_BALANCE
+<anchor id="GIMP-STOCK-TOOL-COLOR-BALANCE:CAPS" role="macro"/>GIMP_STOCK_TOOL_COLOR_BALANCE
 GIMP_STOCK_TOOL_COLOR_BALANCE#define GIMP_STOCK_TOOL_COLOR_BALANCE       "gimp-tool-color-balance"
 
 
@@ -1216,7 +1219,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-COLOR-PICKER:CAPS"/>GIMP_STOCK_TOOL_COLOR_PICKER
+<anchor id="GIMP-STOCK-TOOL-COLOR-PICKER:CAPS" role="macro"/>GIMP_STOCK_TOOL_COLOR_PICKER
 GIMP_STOCK_TOOL_COLOR_PICKER#define GIMP_STOCK_TOOL_COLOR_PICKER        "gimp-tool-color-picker"
 
 
@@ -1224,7 +1227,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-COLORIZE:CAPS"/>GIMP_STOCK_TOOL_COLORIZE
+<anchor id="GIMP-STOCK-TOOL-COLORIZE:CAPS" role="macro"/>GIMP_STOCK_TOOL_COLORIZE
 GIMP_STOCK_TOOL_COLORIZE#define GIMP_STOCK_TOOL_COLORIZE            "gimp-tool-colorize"
 
 
@@ -1232,7 +1235,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-CROP:CAPS"/>GIMP_STOCK_TOOL_CROP
+<anchor id="GIMP-STOCK-TOOL-CROP:CAPS" role="macro"/>GIMP_STOCK_TOOL_CROP
 GIMP_STOCK_TOOL_CROP#define GIMP_STOCK_TOOL_CROP                "gimp-tool-crop"
 
 
@@ -1240,7 +1243,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-CURVES:CAPS"/>GIMP_STOCK_TOOL_CURVES
+<anchor id="GIMP-STOCK-TOOL-CURVES:CAPS" role="macro"/>GIMP_STOCK_TOOL_CURVES
 GIMP_STOCK_TOOL_CURVES#define GIMP_STOCK_TOOL_CURVES              "gimp-tool-curves"
 
 
@@ -1248,7 +1251,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-DODGE:CAPS"/>GIMP_STOCK_TOOL_DODGE
+<anchor id="GIMP-STOCK-TOOL-DODGE:CAPS" role="macro"/>GIMP_STOCK_TOOL_DODGE
 GIMP_STOCK_TOOL_DODGE#define GIMP_STOCK_TOOL_DODGE               "gimp-tool-dodge"
 
 
@@ -1256,7 +1259,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-ELLIPSE-SELECT:CAPS"/>GIMP_STOCK_TOOL_ELLIPSE_SELECT
+<anchor id="GIMP-STOCK-TOOL-ELLIPSE-SELECT:CAPS" role="macro"/>GIMP_STOCK_TOOL_ELLIPSE_SELECT
 GIMP_STOCK_TOOL_ELLIPSE_SELECT#define GIMP_STOCK_TOOL_ELLIPSE_SELECT      "gimp-tool-ellipse-select"
 
 
@@ -1264,7 +1267,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-ERASER:CAPS"/>GIMP_STOCK_TOOL_ERASER
+<anchor id="GIMP-STOCK-TOOL-ERASER:CAPS" role="macro"/>GIMP_STOCK_TOOL_ERASER
 GIMP_STOCK_TOOL_ERASER#define GIMP_STOCK_TOOL_ERASER              "gimp-tool-eraser"
 
 
@@ -1272,7 +1275,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-FLIP:CAPS"/>GIMP_STOCK_TOOL_FLIP
+<anchor id="GIMP-STOCK-TOOL-FLIP:CAPS" role="macro"/>GIMP_STOCK_TOOL_FLIP
 GIMP_STOCK_TOOL_FLIP#define GIMP_STOCK_TOOL_FLIP                "gimp-tool-flip"
 
 
@@ -1280,7 +1283,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-FREE-SELECT:CAPS"/>GIMP_STOCK_TOOL_FREE_SELECT
+<anchor id="GIMP-STOCK-TOOL-FREE-SELECT:CAPS" role="macro"/>GIMP_STOCK_TOOL_FREE_SELECT
 GIMP_STOCK_TOOL_FREE_SELECT#define GIMP_STOCK_TOOL_FREE_SELECT         "gimp-tool-free-select"
 
 
@@ -1288,7 +1291,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-FUZZY-SELECT:CAPS"/>GIMP_STOCK_TOOL_FUZZY_SELECT
+<anchor id="GIMP-STOCK-TOOL-FUZZY-SELECT:CAPS" role="macro"/>GIMP_STOCK_TOOL_FUZZY_SELECT
 GIMP_STOCK_TOOL_FUZZY_SELECT#define GIMP_STOCK_TOOL_FUZZY_SELECT        "gimp-tool-fuzzy-select"
 
 
@@ -1296,7 +1299,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-HUE-SATURATION:CAPS"/>GIMP_STOCK_TOOL_HUE_SATURATION
+<anchor id="GIMP-STOCK-TOOL-HUE-SATURATION:CAPS" role="macro"/>GIMP_STOCK_TOOL_HUE_SATURATION
 GIMP_STOCK_TOOL_HUE_SATURATION#define GIMP_STOCK_TOOL_HUE_SATURATION      "gimp-tool-hue-saturation"
 
 
@@ -1304,7 +1307,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-INK:CAPS"/>GIMP_STOCK_TOOL_INK
+<anchor id="GIMP-STOCK-TOOL-INK:CAPS" role="macro"/>GIMP_STOCK_TOOL_INK
 GIMP_STOCK_TOOL_INK#define GIMP_STOCK_TOOL_INK                 "gimp-tool-ink"
 
 
@@ -1312,7 +1315,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-ISCISSORS:CAPS"/>GIMP_STOCK_TOOL_ISCISSORS
+<anchor id="GIMP-STOCK-TOOL-ISCISSORS:CAPS" role="macro"/>GIMP_STOCK_TOOL_ISCISSORS
 GIMP_STOCK_TOOL_ISCISSORS#define GIMP_STOCK_TOOL_ISCISSORS           "gimp-tool-iscissors"
 
 
@@ -1320,7 +1323,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-LEVELS:CAPS"/>GIMP_STOCK_TOOL_LEVELS
+<anchor id="GIMP-STOCK-TOOL-LEVELS:CAPS" role="macro"/>GIMP_STOCK_TOOL_LEVELS
 GIMP_STOCK_TOOL_LEVELS#define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
 
 
@@ -1328,7 +1331,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-MEASURE:CAPS"/>GIMP_STOCK_TOOL_MEASURE
+<anchor id="GIMP-STOCK-TOOL-MEASURE:CAPS" role="macro"/>GIMP_STOCK_TOOL_MEASURE
 GIMP_STOCK_TOOL_MEASURE#define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
 
 
@@ -1336,7 +1339,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-MOVE:CAPS"/>GIMP_STOCK_TOOL_MOVE
+<anchor id="GIMP-STOCK-TOOL-MOVE:CAPS" role="macro"/>GIMP_STOCK_TOOL_MOVE
 GIMP_STOCK_TOOL_MOVE#define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
 
 
@@ -1344,7 +1347,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-PAINTBRUSH:CAPS"/>GIMP_STOCK_TOOL_PAINTBRUSH
+<anchor id="GIMP-STOCK-TOOL-PAINTBRUSH:CAPS" role="macro"/>GIMP_STOCK_TOOL_PAINTBRUSH
 GIMP_STOCK_TOOL_PAINTBRUSH#define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
 
 
@@ -1352,7 +1355,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-PATH:CAPS"/>GIMP_STOCK_TOOL_PATH
+<anchor id="GIMP-STOCK-TOOL-PATH:CAPS" role="macro"/>GIMP_STOCK_TOOL_PATH
 GIMP_STOCK_TOOL_PATH#define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
 
 
@@ -1360,7 +1363,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-PENCIL:CAPS"/>GIMP_STOCK_TOOL_PENCIL
+<anchor id="GIMP-STOCK-TOOL-PENCIL:CAPS" role="macro"/>GIMP_STOCK_TOOL_PENCIL
 GIMP_STOCK_TOOL_PENCIL#define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
 
 
@@ -1368,7 +1371,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-PERSPECTIVE:CAPS"/>GIMP_STOCK_TOOL_PERSPECTIVE
+<anchor id="GIMP-STOCK-TOOL-PERSPECTIVE:CAPS" role="macro"/>GIMP_STOCK_TOOL_PERSPECTIVE
 GIMP_STOCK_TOOL_PERSPECTIVE#define GIMP_STOCK_TOOL_PERSPECTIVE         "gimp-tool-perspective"
 
 
@@ -1376,7 +1379,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-POSTERIZE:CAPS"/>GIMP_STOCK_TOOL_POSTERIZE
+<anchor id="GIMP-STOCK-TOOL-POSTERIZE:CAPS" role="macro"/>GIMP_STOCK_TOOL_POSTERIZE
 GIMP_STOCK_TOOL_POSTERIZE#define GIMP_STOCK_TOOL_POSTERIZE           "gimp-tool-posterize"
 
 
@@ -1384,7 +1387,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-RECT-SELECT:CAPS"/>GIMP_STOCK_TOOL_RECT_SELECT
+<anchor id="GIMP-STOCK-TOOL-RECT-SELECT:CAPS" role="macro"/>GIMP_STOCK_TOOL_RECT_SELECT
 GIMP_STOCK_TOOL_RECT_SELECT#define GIMP_STOCK_TOOL_RECT_SELECT         "gimp-tool-rect-select"
 
 
@@ -1392,7 +1395,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-ROTATE:CAPS"/>GIMP_STOCK_TOOL_ROTATE
+<anchor id="GIMP-STOCK-TOOL-ROTATE:CAPS" role="macro"/>GIMP_STOCK_TOOL_ROTATE
 GIMP_STOCK_TOOL_ROTATE#define GIMP_STOCK_TOOL_ROTATE              "gimp-tool-rotate"
 
 
@@ -1400,7 +1403,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-SCALE:CAPS"/>GIMP_STOCK_TOOL_SCALE
+<anchor id="GIMP-STOCK-TOOL-SCALE:CAPS" role="macro"/>GIMP_STOCK_TOOL_SCALE
 GIMP_STOCK_TOOL_SCALE#define GIMP_STOCK_TOOL_SCALE               "gimp-tool-scale"
 
 
@@ -1408,7 +1411,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-SHEAR:CAPS"/>GIMP_STOCK_TOOL_SHEAR
+<anchor id="GIMP-STOCK-TOOL-SHEAR:CAPS" role="macro"/>GIMP_STOCK_TOOL_SHEAR
 GIMP_STOCK_TOOL_SHEAR#define GIMP_STOCK_TOOL_SHEAR               "gimp-tool-shear"
 
 
@@ -1416,7 +1419,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-SMUDGE:CAPS"/>GIMP_STOCK_TOOL_SMUDGE
+<anchor id="GIMP-STOCK-TOOL-SMUDGE:CAPS" role="macro"/>GIMP_STOCK_TOOL_SMUDGE
 GIMP_STOCK_TOOL_SMUDGE#define GIMP_STOCK_TOOL_SMUDGE              "gimp-tool-smudge"
 
 
@@ -1424,7 +1427,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-TEXT:CAPS"/>GIMP_STOCK_TOOL_TEXT
+<anchor id="GIMP-STOCK-TOOL-TEXT:CAPS" role="macro"/>GIMP_STOCK_TOOL_TEXT
 GIMP_STOCK_TOOL_TEXT#define GIMP_STOCK_TOOL_TEXT                "gimp-tool-text"
 
 
@@ -1432,7 +1435,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-THRESHOLD:CAPS"/>GIMP_STOCK_TOOL_THRESHOLD
+<anchor id="GIMP-STOCK-TOOL-THRESHOLD:CAPS" role="macro"/>GIMP_STOCK_TOOL_THRESHOLD
 GIMP_STOCK_TOOL_THRESHOLD#define GIMP_STOCK_TOOL_THRESHOLD           "gimp-tool-threshold"
 
 
@@ -1440,7 +1443,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-TOOL-ZOOM:CAPS"/>GIMP_STOCK_TOOL_ZOOM
+<anchor id="GIMP-STOCK-TOOL-ZOOM:CAPS" role="macro"/>GIMP_STOCK_TOOL_ZOOM
 GIMP_STOCK_TOOL_ZOOM#define GIMP_STOCK_TOOL_ZOOM                "gimp-tool-zoom"
 
 
@@ -1448,56 +1451,56 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-HCHAIN:CAPS"/>GIMP_STOCK_HCHAIN
+<anchor id="GIMP-STOCK-HCHAIN:CAPS" role="macro"/>GIMP_STOCK_HCHAIN
 GIMP_STOCK_HCHAIN#define GIMP_STOCK_HCHAIN                   "gimp-hchain"
 
 
 
 
 
-<anchor id="GIMP-STOCK-HCHAIN-BROKEN:CAPS"/>GIMP_STOCK_HCHAIN_BROKEN
+<anchor id="GIMP-STOCK-HCHAIN-BROKEN:CAPS" role="macro"/>GIMP_STOCK_HCHAIN_BROKEN
 GIMP_STOCK_HCHAIN_BROKEN#define GIMP_STOCK_HCHAIN_BROKEN            "gimp-hchain-broken"
 
 
 
 
 
-<anchor id="GIMP-STOCK-VCHAIN:CAPS"/>GIMP_STOCK_VCHAIN
+<anchor id="GIMP-STOCK-VCHAIN:CAPS" role="macro"/>GIMP_STOCK_VCHAIN
 GIMP_STOCK_VCHAIN#define GIMP_STOCK_VCHAIN                   "gimp-vchain"
 
 
 
 
 
-<anchor id="GIMP-STOCK-VCHAIN-BROKEN:CAPS"/>GIMP_STOCK_VCHAIN_BROKEN
+<anchor id="GIMP-STOCK-VCHAIN-BROKEN:CAPS" role="macro"/>GIMP_STOCK_VCHAIN_BROKEN
 GIMP_STOCK_VCHAIN_BROKEN#define GIMP_STOCK_VCHAIN_BROKEN            "gimp-vchain-broken"
 
 
 
 
 
-<anchor id="GIMP-STOCK-TEXTURE:CAPS"/>GIMP_STOCK_TEXTURE
+<anchor id="GIMP-STOCK-TEXTURE:CAPS" role="macro"/>GIMP_STOCK_TEXTURE
 GIMP_STOCK_TEXTURE#define GIMP_STOCK_TEXTURE                  "gimp-texture"
 
 
 
 
 
-<anchor id="GIMP-STOCK-FRAME:CAPS"/>GIMP_STOCK_FRAME
+<anchor id="GIMP-STOCK-FRAME:CAPS" role="macro"/>GIMP_STOCK_FRAME
 GIMP_STOCK_FRAME#define GIMP_STOCK_FRAME                    "gimp-frame"
 
 
 
 
 
-<anchor id="GIMP-STOCK-ERROR:CAPS"/>GIMP_STOCK_ERROR
+<anchor id="GIMP-STOCK-ERROR:CAPS" role="macro"/>GIMP_STOCK_ERROR
 GIMP_STOCK_ERROR#define GIMP_STOCK_ERROR                    "gimp-error"
 
 
 
 
 
-<anchor id="GIMP-STOCK-INFO:CAPS"/>GIMP_STOCK_INFO
+<anchor id="GIMP-STOCK-INFO:CAPS" role="macro"/>GIMP_STOCK_INFO
 GIMP_STOCK_INFO#define GIMP_STOCK_INFO                     "gimp-info"
 
 
@@ -1506,14 +1509,14 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-QUESTION:CAPS"/>GIMP_STOCK_QUESTION
+<anchor id="GIMP-STOCK-QUESTION:CAPS" role="macro"/>GIMP_STOCK_QUESTION
 GIMP_STOCK_QUESTION#define GIMP_STOCK_QUESTION                 "gimp-question"
 
 
 
 
 
-<anchor id="GIMP-STOCK-WARNING:CAPS"/>GIMP_STOCK_WARNING
+<anchor id="GIMP-STOCK-WARNING:CAPS" role="macro"/>GIMP_STOCK_WARNING
 GIMP_STOCK_WARNING#define GIMP_STOCK_WARNING                  "gimp-warning"
 
 
@@ -1522,7 +1525,7 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-WILBER:CAPS"/>GIMP_STOCK_WILBER
+<anchor id="GIMP-STOCK-WILBER:CAPS" role="macro"/>GIMP_STOCK_WILBER
 GIMP_STOCK_WILBER#define GIMP_STOCK_WILBER                   "gimp-wilber"
 
 
@@ -1530,56 +1533,56 @@ RTL variant
 
 
 
-<anchor id="GIMP-STOCK-WILBER-EEK:CAPS"/>GIMP_STOCK_WILBER_EEK
+<anchor id="GIMP-STOCK-WILBER-EEK:CAPS" role="macro"/>GIMP_STOCK_WILBER_EEK
 GIMP_STOCK_WILBER_EEK#define GIMP_STOCK_WILBER_EEK               "gimp-wilber-eek"
 
 
 
 
 
-<anchor id="GIMP-STOCK-BRUSH:CAPS"/>GIMP_STOCK_BRUSH
+<anchor id="GIMP-STOCK-BRUSH:CAPS" role="macro"/>GIMP_STOCK_BRUSH
 GIMP_STOCK_BRUSH#define GIMP_STOCK_BRUSH                    GIMP_STOCK_TOOL_PAINTBRUSH
 
 
 
 
 
-<anchor id="GIMP-STOCK-BUFFER:CAPS"/>GIMP_STOCK_BUFFER
+<anchor id="GIMP-STOCK-BUFFER:CAPS" role="macro"/>GIMP_STOCK_BUFFER
 GIMP_STOCK_BUFFER#define GIMP_STOCK_BUFFER                   GTK_STOCK_PASTE
 
 
 
 
 
-<anchor id="GIMP-STOCK-FONT:CAPS"/>GIMP_STOCK_FONT
+<anchor id="GIMP-STOCK-FONT:CAPS" role="macro"/>GIMP_STOCK_FONT
 GIMP_STOCK_FONT#define GIMP_STOCK_FONT                     GTK_STOCK_SELECT_FONT
 
 
 
 
 
-<anchor id="GIMP-STOCK-GRADIENT:CAPS"/>GIMP_STOCK_GRADIENT
+<anchor id="GIMP-STOCK-GRADIENT:CAPS" role="macro"/>GIMP_STOCK_GRADIENT
 GIMP_STOCK_GRADIENT#define GIMP_STOCK_GRADIENT                 GIMP_STOCK_TOOL_BLEND
 
 
 
 
 
-<anchor id="GIMP-STOCK-PALETTE:CAPS"/>GIMP_STOCK_PALETTE
+<anchor id="GIMP-STOCK-PALETTE:CAPS" role="macro"/>GIMP_STOCK_PALETTE
 GIMP_STOCK_PALETTE#define GIMP_STOCK_PALETTE                  GTK_STOCK_SELECT_COLOR
 
 
 
 
 
-<anchor id="GIMP-STOCK-PATTERN:CAPS"/>GIMP_STOCK_PATTERN
+<anchor id="GIMP-STOCK-PATTERN:CAPS" role="macro"/>GIMP_STOCK_PATTERN
 GIMP_STOCK_PATTERN#define GIMP_STOCK_PATTERN                  GIMP_STOCK_TOOL_BUCKET_FILL
 
 
 
 
 
-<anchor id="GIMP-STOCK-ZOOM-FOLLOW-WINDOW:CAPS"/>GIMP_STOCK_ZOOM_FOLLOW_WINDOW
+<anchor id="GIMP-STOCK-ZOOM-FOLLOW-WINDOW:CAPS" role="macro"/>GIMP_STOCK_ZOOM_FOLLOW_WINDOW
 GIMP_STOCK_ZOOM_FOLLOW_WINDOW#define GIMP_STOCK_ZOOM_FOLLOW_WINDOW       "gimp-zoom-follow-window"
 
 
diff --git a/devel-docs/libgimpwidgets/xml/gimpunitmenu.xml b/devel-docs/libgimpwidgets/xml/gimpunitmenu.xml
index 5f664de38f..f44d9944d3 100644
--- a/devel-docs/libgimpwidgets/xml/gimpunitmenu.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpunitmenu.xml
@@ -4,16 +4,19 @@
 
 
 
-GimpUnitMenu
+GimpUnitMenu
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpUnitMenuWidget for selecting a GimpUnit.
+GimpUnitMenu
+Widget for selecting a GimpUnit.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -35,26 +38,27 @@
 
 
 
-
-Object Hierarchy
+
+Object Hierarchy
 
 
   GObject
-   +----GtkObject
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkButton
-                                 +----GtkOptionMenu
-                                       +----GimpUnitMenu
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkButton
+                                       +----GtkOptionMenu
+                                             +----GimpUnitMenu
 
 
 
 
 
 
-
-Implemented Interfaces
+
+Implemented Interfaces
 
 GimpUnitMenu implements
  AtkImplementorIface.
@@ -63,19 +67,19 @@ GimpUnitMenu implements
 
 
 
-
-Signal Prototypes
+
+Signals
 
 
 "unit-changed"
             void        user_function      (GimpUnitMenu *arg0,
-                                            gpointer user_data);
+                                            gpointer      user_data)      : Run first
 
 
 
 
-
-Description
+
+Description
 
 This widget provides a GtkOptionMenu which contains a list of GimpUnit's.
 
@@ -94,16 +98,16 @@ Whenever the user selects a unit from the menu or the dialog, the
 
 
 
-
-Details
+
+Details
 
-<anchor id="GimpUnitMenu-struct"/>GimpUnitMenu
+<anchor id="GimpUnitMenu-struct" role="struct"/>GimpUnitMenu
 GimpUnitMenutypedef struct _GimpUnitMenu GimpUnitMenu;
 
 
 
 
-<anchor id="gimp-unit-menu-new"/>gimp_unit_menu_new ()
+<anchor id="gimp-unit-menu-new" role="function"/>gimp_unit_menu_new ()
 gimp_unit_menu_newGtkWidget*  gimp_unit_menu_new              (const gchar *format,
                                              GimpUnit unit,
                                              gboolean show_pixels,
@@ -157,22 +161,22 @@ The format string supports the following percent expansio
          The initially selected unit.
 
 show_pixels :
-  TRUE if the unit menu should contain an item for
+  TRUE if the unit menu should contain an item for
                GIMP_UNIT_PIXEL.
 
 show_percent :
- TRUE in the unit menu should contain an item for
+ TRUE in the unit menu should contain an item for
                GIMP_UNIT_PERCENT.
 
 show_custom :
-  TRUE if the unit menu should contain a "More..." item for
+  TRUE if the unit menu should contain a "More..." item for
                opening the user-defined-unit selection dialog.
 
 Returns : A pointer to the new GimpUnitMenu widget.
 
 
 
-<anchor id="gimp-unit-menu-set-unit"/>gimp_unit_menu_set_unit ()
+<anchor id="gimp-unit-menu-set-unit" role="function"/>gimp_unit_menu_set_unit ()
 gimp_unit_menu_set_unitvoid        gimp_unit_menu_set_unit         (GimpUnitMenu *menu,
                                              GimpUnit unit);
 
@@ -188,7 +192,7 @@ Sets a new GimpUnit for the specifi
 
 
 
-<anchor id="gimp-unit-menu-get-unit"/>gimp_unit_menu_get_unit ()
+<anchor id="gimp-unit-menu-get-unit" role="function"/>gimp_unit_menu_get_unit ()
 gimp_unit_menu_get_unitGimpUnit    gimp_unit_menu_get_unit         (GimpUnitMenu *menu);
 
 Returns the GimpUnit the user has selected from the GimpUnitMenu.
@@ -202,7 +206,7 @@ Returns the GimpUnit the user has s
 
 
 
-<anchor id="gimp-unit-menu-get-pixel-digits"/>gimp_unit_menu_get_pixel_digits ()
+<anchor id="gimp-unit-menu-get-pixel-digits" role="function"/>gimp_unit_menu_get_pixel_digits ()
 gimp_unit_menu_get_pixel_digitsgint        gimp_unit_menu_get_pixel_digits (GimpUnitMenu *menu);
 
 Retrieve the number of digits for a pixel size as set by
@@ -217,7 +221,7 @@ Retrieve the number of digits for a pixel size as set by
 
 
 
-<anchor id="gimp-unit-menu-set-pixel-digits"/>gimp_unit_menu_set_pixel_digits ()
+<anchor id="gimp-unit-menu-set-pixel-digits" role="function"/>gimp_unit_menu_set_pixel_digits ()
 gimp_unit_menu_set_pixel_digitsvoid        gimp_unit_menu_set_pixel_digits (GimpUnitMenu *menu,
                                              gint digits);
 
@@ -244,11 +248,11 @@ here. You should do this after attaching your spinbuttons.
 
 
 
-
-Signals
+
+Signal Details
 <anchor id="GimpUnitMenu-unit-changed"/>The "unit-changed" signal
-void        user_function                  (GimpUnitMenu *arg0,
-                                            gpointer user_data);
+GimpUnitMenu::unit-changedvoid        user_function                  (GimpUnitMenu *arg0,
+                                            gpointer      user_data)      : Run first
 
 This signal is emitted whenever the user selects a GimpUnit from
 the GimpUnitMenu.
diff --git a/devel-docs/libgimpwidgets/xml/gimpwidgets.xml b/devel-docs/libgimpwidgets/xml/gimpwidgets.xml
index f804c3b2d2..760b18fe30 100644
--- a/devel-docs/libgimpwidgets/xml/gimpwidgets.xml
+++ b/devel-docs/libgimpwidgets/xml/gimpwidgets.xml
@@ -4,17 +4,20 @@
 
 
 
-GimpWidgets
+GimpWidgets
 3
 LIBGIMPWIDGETS Library
 
 
 
-GimpWidgetsA collection of convenient widget constructors, standard callbacks and
+GimpWidgets
+A collection of convenient widget constructors, standard callbacks and
 helper functions.
+
 
 
-Synopsis
+
+Synopsis
 
 
 
@@ -159,17 +162,17 @@ helper functions.
 
 
 
-
-Description
+
+Description
 
 
 
 
 
-
-Details
+
+Details
 
-<anchor id="gimp-radio-group-new"/>gimp_radio_group_new ()
+<anchor id="gimp-radio-group-new" role="function"/>gimp_radio_group_new ()
 gimp_radio_group_newGtkWidget*  gimp_radio_group_new            (gboolean in_frame,
                                              const gchar *frame_title,
                                              ...);
@@ -180,19 +183,19 @@ a GtkFrame or 
 in_frame :
-    TRUE if you want a GtkFrame around the radio button group.
+    TRUE if you want a GtkFrame around the radio button group.
 
 frame_title :
- The title of the Frame or NULL if you don't want a title.
+ The title of the Frame or NULL if you don't want a title.
 
 ... :
-         A NULL-terminated va_list describing the radio buttons.
+         A NULL-terminated va_list describing the radio buttons.
 
 Returns : A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
-<anchor id="gimp-radio-group-new2"/>gimp_radio_group_new2 ()
+<anchor id="gimp-radio-group-new2" role="function"/>gimp_radio_group_new2 ()
 gimp_radio_group_new2GtkWidget*  gimp_radio_group_new2           (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
@@ -206,11 +209,11 @@ a GtkFrame or 
 in_frame :
-              TRUE if you want a GtkFrame around the
+              TRUE if you want a GtkFrame around the
                         radio button group.
 
 frame_title :
-           The title of the Frame or NULL if you don't want
+           The title of the Frame or NULL if you don't want
                         a title.
 
 radio_button_callback :
@@ -225,14 +228,14 @@ a GtkFrame or NULL-terminated va_list describing
                         the radio buttons.
 
 Returns : A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
-<anchor id="gimp-radio-group-set-active"/>gimp_radio_group_set_active ()
+<anchor id="gimp-radio-group-set-active" role="function"/>gimp_radio_group_set_active ()
 gimp_radio_group_set_activevoid        gimp_radio_group_set_active     (GtkRadioButton *radio_button,
                                              gpointer item_data);
 
@@ -249,7 +252,7 @@ created with a matching item_data.
 
 
 
-<anchor id="gimp-int-radio-group-new"/>gimp_int_radio_group_new ()
+<anchor id="gimp-int-radio-group-new" role="function"/>gimp_int_radio_group_new ()
 gimp_int_radio_group_newGtkWidget*  gimp_int_radio_group_new        (gboolean in_frame,
                                              const gchar *frame_title,
                                              GCallback radio_button_callback,
@@ -266,11 +269,11 @@ group).
 
 
 in_frame :
-              TRUE if you want a GtkFrame around the
+              TRUE if you want a GtkFrame around the
                         radio button group.
 
 frame_title :
-           The title of the Frame or NULL if you don't want
+           The title of the Frame or NULL if you don't want
                         a title.
 
 radio_button_callback :
@@ -285,14 +288,14 @@ group).
                The item_data of the initially pressed radio button.
 
 ... :
-                   A NULL-terminated va_list describing
+                   A NULL-terminated va_list describing
                         the radio buttons.
 
 Returns : A GtkFrame or GtkVbox (depending on in_frame).
 
 
 
-<anchor id="gimp-int-radio-group-set-active"/>gimp_int_radio_group_set_active ()
+<anchor id="gimp-int-radio-group-set-active" role="function"/>gimp_int_radio_group_set_active ()
 gimp_int_radio_group_set_activevoid        gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
                                              gint item_data);
 
@@ -311,7 +314,7 @@ of pointers.
 
 
 
-<anchor id="gimp-spin-button-new"/>gimp_spin_button_new ()
+<anchor id="gimp-spin-button-new" role="function"/>gimp_spin_button_new ()
 gimp_spin_button_newGtkWidget*  gimp_spin_button_new            (GtkObject **adjustment,
                                              gdouble value,
                                              gdouble lower,
@@ -359,7 +362,7 @@ setting a standard minimum horizontal size.
 
 
 
-<anchor id="GIMP-SCALE-ENTRY-LABEL:CAPS"/>GIMP_SCALE_ENTRY_LABEL()
+<anchor id="GIMP-SCALE-ENTRY-LABEL:CAPS" role="macro"/>GIMP_SCALE_ENTRY_LABEL()
 GIMP_SCALE_ENTRY_LABEL#define     GIMP_SCALE_ENTRY_LABEL(adj)
 
 Returns the scale_entry's GtkLabel.
@@ -371,7 +374,7 @@ Returns the scale_entry's GtkLabel.
 
 
 
-<anchor id="GIMP-SCALE-ENTRY-SCALE:CAPS"/>GIMP_SCALE_ENTRY_SCALE()
+<anchor id="GIMP-SCALE-ENTRY-SCALE:CAPS" role="macro"/>GIMP_SCALE_ENTRY_SCALE()
 GIMP_SCALE_ENTRY_SCALE#define     GIMP_SCALE_ENTRY_SCALE(adj)
 
 Returns the scale_entry's GtkHScale.
@@ -383,7 +386,7 @@ Returns the scale_entry's GtkHScale
 
 
-<anchor id="GIMP-SCALE-ENTRY-SCALE-ADJ:CAPS"/>GIMP_SCALE_ENTRY_SCALE_ADJ()
+<anchor id="GIMP-SCALE-ENTRY-SCALE-ADJ:CAPS" role="macro"/>GIMP_SCALE_ENTRY_SCALE_ADJ()
 GIMP_SCALE_ENTRY_SCALE_ADJ#define     GIMP_SCALE_ENTRY_SCALE_ADJ(adj)
 
 Returns the GtkAdjustment of the scale_entry's GtkHScale.
@@ -395,7 +398,7 @@ Returns the GtkAdjustment of t
 
 
 
-<anchor id="GIMP-SCALE-ENTRY-SPINBUTTON:CAPS"/>GIMP_SCALE_ENTRY_SPINBUTTON()
+<anchor id="GIMP-SCALE-ENTRY-SPINBUTTON:CAPS" role="macro"/>GIMP_SCALE_ENTRY_SPINBUTTON()
 GIMP_SCALE_ENTRY_SPINBUTTON#define     GIMP_SCALE_ENTRY_SPINBUTTON(adj)
 
 Returns the scale_entry's GtkSpinButton.
@@ -407,7 +410,7 @@ Returns the scale_entry's GtkSpinButton
 
 
-<anchor id="GIMP-SCALE-ENTRY-SPINBUTTON-ADJ:CAPS"/>GIMP_SCALE_ENTRY_SPINBUTTON_ADJ()
+<anchor id="GIMP-SCALE-ENTRY-SPINBUTTON-ADJ:CAPS" role="macro"/>GIMP_SCALE_ENTRY_SPINBUTTON_ADJ()
 GIMP_SCALE_ENTRY_SPINBUTTON_ADJ#define     GIMP_SCALE_ENTRY_SPINBUTTON_ADJ(adj)
 
 Returns the GtkAdjustment of the scale_entry's GtkSpinButton.
@@ -419,7 +422,7 @@ Returns the GtkAdjustment of t
 
 
 
-<anchor id="gimp-scale-entry-new"/>gimp_scale_entry_new ()
+<anchor id="gimp-scale-entry-new" role="function"/>gimp_scale_entry_new ()
 gimp_scale_entry_newGtkObject*  gimp_scale_entry_new            (GtkTable *table,
                                              gint column,
                                              gint row,
@@ -481,16 +484,16 @@ attaches them to a 3-column GtkTable              The number of decimal digits.
 
 constrain :
-           TRUE if the range of possible values of the
+           TRUE if the range of possible values of the
                       GtkSpinButton should be the same as of the GtkHScale.
 
 unconstrained_lower :
  The spinbutton's lower boundary
-                      if constrain == FALSE.
+                      if constrain == FALSE.
 
 unconstrained_upper :
  The spinbutton's upper boundary
-                      if constrain == FALSE.
+                      if constrain == FALSE.
 
 tooltip :
              A tooltip message for the scale and the spinbutton.
@@ -502,7 +505,7 @@ attaches them to a 3-column GtkTable
 
 
-<anchor id="gimp-scale-entry-set-sensitive"/>gimp_scale_entry_set_sensitive ()
+<anchor id="gimp-scale-entry-set-sensitive" role="function"/>gimp_scale_entry_set_sensitive ()
 gimp_scale_entry_set_sensitivevoid        gimp_scale_entry_set_sensitive  (GtkObject *adjustment,
                                              gboolean sensitive);
 
@@ -520,7 +523,7 @@ Sets the sensitivity of the scale_entry's GtkLabe
 
 
 
-<anchor id="gimp-scale-entry-set-logarithmic"/>gimp_scale_entry_set_logarithmic ()
+<anchor id="gimp-scale-entry-set-logarithmic" role="function" condition="since:GIMP 2.2"/>gimp_scale_entry_set_logarithmic ()
 gimp_scale_entry_set_logarithmicvoid        gimp_scale_entry_set_logarithmic
                                             (GtkObject *adjustment,
                                              gboolean logarithmic);
@@ -542,7 +545,7 @@ adjustment.
 Since  GIMP 2.2
 
 
-<anchor id="gimp-scale-entry-get-logarithmic"/>gimp_scale_entry_get_logarithmic ()
+<anchor id="gimp-scale-entry-get-logarithmic" role="function" condition="since:GIMP 2.2"/>gimp_scale_entry_get_logarithmic ()
 gimp_scale_entry_get_logarithmicgboolean    gimp_scale_entry_get_logarithmic
                                             (GtkObject *adjustment);
 
@@ -553,14 +556,14 @@ adjustment.
 adjustment :
  a  GtkAdjustment as returned by gimp_scale_entry_new()
 
-Returns : TRUE if the the entry's scale widget will behave in
-              logharithmic fashion, FALSE for linear behaviour.
+Returns : TRUE if the the entry's scale widget will behave in
+              logharithmic fashion, FALSE for linear behaviour.
 
 
 Since  GIMP 2.2
 
 
-<anchor id="gimp-color-scale-entry-new"/>gimp_color_scale_entry_new ()
+<anchor id="gimp-color-scale-entry-new" role="function"/>gimp_color_scale_entry_new ()
 gimp_color_scale_entry_newGtkObject*  gimp_color_scale_entry_new      (GtkTable *table,
                                              gint column,
                                              gint row,
@@ -628,7 +631,7 @@ This function creates a GtkLabel, a
 
 
 
-<anchor id="GIMP-RANDOM-SEED-SPINBUTTON:CAPS"/>GIMP_RANDOM_SEED_SPINBUTTON()
+<anchor id="GIMP-RANDOM-SEED-SPINBUTTON:CAPS" role="macro"/>GIMP_RANDOM_SEED_SPINBUTTON()
 GIMP_RANDOM_SEED_SPINBUTTON#define     GIMP_RANDOM_SEED_SPINBUTTON(hbox)
 
 Returns the random_seed's GtkSpinButton.
@@ -640,7 +643,7 @@ Returns the random_seed's GtkSpinButton
 
 
-<anchor id="GIMP-RANDOM-SEED-SPINBUTTON-ADJ:CAPS"/>GIMP_RANDOM_SEED_SPINBUTTON_ADJ()
+<anchor id="GIMP-RANDOM-SEED-SPINBUTTON-ADJ:CAPS" role="macro"/>GIMP_RANDOM_SEED_SPINBUTTON_ADJ()
 GIMP_RANDOM_SEED_SPINBUTTON_ADJ#define     GIMP_RANDOM_SEED_SPINBUTTON_ADJ(hbox)
 
 Returns the GtkAdjustment of the random_seed's GtkSpinButton.
@@ -652,7 +655,7 @@ Returns the GtkAdjustment of t
 
 
 
-<anchor id="GIMP-RANDOM-SEED-TOGGLE:CAPS"/>GIMP_RANDOM_SEED_TOGGLE()
+<anchor id="GIMP-RANDOM-SEED-TOGGLE:CAPS" role="macro"/>GIMP_RANDOM_SEED_TOGGLE()
 GIMP_RANDOM_SEED_TOGGLE#define     GIMP_RANDOM_SEED_TOGGLE(hbox)
 
 
@@ -664,7 +667,7 @@ Returns the GtkAdjustment of t
 
 
 
-<anchor id="gimp-random-seed-new"/>gimp_random_seed_new ()
+<anchor id="gimp-random-seed-new" role="function"/>gimp_random_seed_new ()
 gimp_random_seed_newGtkWidget*  gimp_random_seed_new            (guint32 *seed,
                                              gboolean *random_seed);
 
@@ -685,7 +688,7 @@ generator is initialized.
 
 
 
-<anchor id="GIMP-COORDINATES-CHAINBUTTON:CAPS"/>GIMP_COORDINATES_CHAINBUTTON()
+<anchor id="GIMP-COORDINATES-CHAINBUTTON:CAPS" role="macro"/>GIMP_COORDINATES_CHAINBUTTON()
 GIMP_COORDINATES_CHAINBUTTON#define     GIMP_COORDINATES_CHAINBUTTON(sizeentry)
 
 Returns the GimpChainButton which is attached to the GimpSizeEntry.
@@ -697,7 +700,7 @@ Returns the GimpChainButton
 
 
 
-<anchor id="gimp-coordinates-new"/>gimp_coordinates_new ()
+<anchor id="gimp-coordinates-new" role="function"/>gimp_coordinates_new ()
 gimp_coordinates_newGtkWidget*  gimp_coordinates_new            (GimpUnit unit,
                                              const gchar *unit_format,
                                              gboolean menu_show_pixels,
@@ -735,11 +738,11 @@ two fields' values or the ratio between them.
                          gimp_unit_menu_new().
 
 menu_show_pixels :
-       TRUE if the GimpUnitMenu should contain an item
+       TRUE if the GimpUnitMenu should contain an item
                          for GIMP_UNIT_PIXEL.
 
 menu_show_percent :
-      TRUE if the GimpUnitMenu should contain an item
+      TRUE if the GimpUnitMenu should contain an item
                          for GIMP_UNIT_PERCENT.
 
 spinbutton_width :
@@ -750,12 +753,12 @@ two fields' values or the ratio between them.
           The update policy for the GimpSizeEntry.
 
 chainbutton_active :
-     TRUE if the attached GimpChainButton should be
+     TRUE if the attached GimpChainButton should be
                          active.
 
 chain_constrains_ratio :
- TRUE if the chainbutton should constrain the
-                         fields' aspect ratio. If FALSE, the values will
+ TRUE if the chainbutton should constrain the
+                         fields' aspect ratio. If FALSE, the values will
                          be constrained.
 
 xlabel :
@@ -804,7 +807,7 @@ two fields' values or the ratio between them.
 
 
 
-<anchor id="gimp-pixmap-button-new"/>gimp_pixmap_button_new ()
+<anchor id="gimp-pixmap-button-new" role="function" condition="deprecated:"/>gimp_pixmap_button_new ()
 gimp_pixmap_button_newGtkWidget*  gimp_pixmap_button_new          (gchar **xpm_data,
                                              const gchar *text);
 gimp_pixmap_button_new is deprecated and should not be used in newly-written code.
@@ -824,7 +827,7 @@ and an optional GtkLabel.
 
 
 
-<anchor id="gimp-toggle-button-sensitive-update"/>gimp_toggle_button_sensitive_update ()
+<anchor id="gimp-toggle-button-sensitive-update" role="function"/>gimp_toggle_button_sensitive_update ()
 gimp_toggle_button_sensitive_updatevoid        gimp_toggle_button_sensitive_update
                                             (GtkToggleButton *toggle_button);
 
@@ -850,7 +853,7 @@ button's inverse "active" state by attaching widgets with the
 
 
 
-<anchor id="gimp-toggle-button-update"/>gimp_toggle_button_update ()
+<anchor id="gimp-toggle-button-update" role="function"/>gimp_toggle_button_update ()
 gimp_toggle_button_updatevoid        gimp_toggle_button_update       (GtkWidget *widget,
                                              gpointer data);
 
@@ -867,7 +870,7 @@ Note that this function calls gimp_radio_button_update ()
+<anchor id="gimp-radio-button-update" role="function"/>gimp_radio_button_update ()
 gimp_radio_button_updatevoid        gimp_radio_button_update        (GtkWidget *widget,
                                              gpointer data);
 
@@ -884,7 +887,7 @@ Note that this function calls gimp_int_adjustment_update ()
+<anchor id="gimp-int-adjustment-update" role="function"/>gimp_int_adjustment_update ()
 gimp_int_adjustment_updatevoid        gimp_int_adjustment_update      (GtkAdjustment *adjustment,
                                              gpointer data);
 
@@ -902,7 +905,7 @@ rounded with RINT().
 
 
-<anchor id="gimp-uint-adjustment-update"/>gimp_uint_adjustment_update ()
+<anchor id="gimp-uint-adjustment-update" role="function"/>gimp_uint_adjustment_update ()
 gimp_uint_adjustment_updatevoid        gimp_uint_adjustment_update     (GtkAdjustment *adjustment,
                                              gpointer data);
 
@@ -920,7 +923,7 @@ with (guint) (value + 0.5).
 
 
 
-<anchor id="gimp-float-adjustment-update"/>gimp_float_adjustment_update ()
+<anchor id="gimp-float-adjustment-update" role="function"/>gimp_float_adjustment_update ()
 gimp_float_adjustment_updatevoid        gimp_float_adjustment_update    (GtkAdjustment *adjustment,
                                              gpointer data);
 
@@ -937,7 +940,7 @@ with (guint) (value + 0.5).
 
 
 
-<anchor id="gimp-double-adjustment-update"/>gimp_double_adjustment_update ()
+<anchor id="gimp-double-adjustment-update" role="function"/>gimp_double_adjustment_update ()
 gimp_double_adjustment_updatevoid        gimp_double_adjustment_update   (GtkAdjustment *adjustment,
                                              gpointer data);
 
@@ -954,7 +957,7 @@ with (guint) (value + 0.5).
 
 
 
-<anchor id="gimp-unit-menu-update"/>gimp_unit_menu_update ()
+<anchor id="gimp-unit-menu-update" role="function"/>gimp_unit_menu_update ()
 gimp_unit_menu_updatevoid        gimp_unit_menu_update           (GtkWidget *widget,
                                              gpointer data);
 
@@ -978,7 +981,7 @@ to set up the list.
 
 
 
-<anchor id="gimp-table-attach-aligned"/>gimp_table_attach_aligned ()
+<anchor id="gimp-table-attach-aligned" role="function"/>gimp_table_attach_aligned ()
 gimp_table_attach_alignedGtkWidget*  gimp_table_attach_aligned       (GtkTable *table,
                                              gint column,
                                              gint row,
@@ -989,7 +992,7 @@ to set up the list.
                                              gint colspan,
                                              gboolean left_align);
 
-Note that the label_text can be NULL and that the widget will be
+Note that the label_text can be NULL and that the widget will be
 attached starting at (column + 1) in this case, too.
 
 
@@ -1020,13 +1023,13 @@ attached starting at (column + 1) in this case, too.    The number of columns the widget will use.
 
 left_align :
- TRUE if the widget should be left-aligned.
+ TRUE if the widget should be left-aligned.
 
 Returns : The created GtkLabel.
 
 
 
-<anchor id="gimp-label-set-attributes"/>gimp_label_set_attributes ()
+<anchor id="gimp-label-set-attributes" role="function" condition="since:GIMP 2.2"/>gimp_label_set_attributes ()
 gimp_label_set_attributesvoid        gimp_label_set_attributes       (GtkLabel *label,
                                              ...);
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 2209c47eeb..7dab34e9fb 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -59,6 +59,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -167,6 +168,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -328,6 +330,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -335,17 +338,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -362,6 +357,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -372,6 +370,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -383,10 +382,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/etc/Makefile.in b/etc/Makefile.in
index a106a6a13e..e8aca6921a 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/gimp.pc.in b/gimp.pc.in
index 2ee52d4267..e727386331 100644
--- a/gimp.pc.in
+++ b/gimp.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 
 gimpdatadir=@gimpdatadir@
 gimplibdir=@gimpplugindir@
diff --git a/gtk-doc.make b/gtk-doc.make
index 91cdd34d2f..d50629a1b9 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -46,7 +46,7 @@ all-local: html-build.stamp
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '*** Scanning header files ***'
+	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
@@ -66,7 +66,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
 #### templates ####
 
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
+	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	touch tmpl-build.stamp
@@ -77,10 +77,10 @@ tmpl.stamp: tmpl-build.stamp
 #### xml ####
 
 sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '*** Building XML ***'
+	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -89,13 +89,13 @@ sgml.stamp: sgml-build.stamp
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
+	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
 	rm -rf $(srcdir)/html 
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
+	@echo 'gtk-doc: Fixing cross-references' 
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 else
diff --git a/intltool-extract.in b/intltool-extract.in
index fc39314c97..bb6c36892b 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.34.2";
+my $VERSION      = "0.35.0";
 
 ## Loaded modules
 use strict; 
diff --git a/intltool-merge.in b/intltool-merge.in
index e50cfb3ace..d0535abd02 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
 
 ## Loaded modules
 use strict; 
@@ -395,7 +395,7 @@ sub create_translation_database
             } 
             else 
             {
-		print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
+		print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
 
                 open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
             }
diff --git a/intltool-update.in b/intltool-update.in
index 30de888b79..661d8fe6ac 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -125,7 +125,7 @@ my $arg_count = ($DIST_ARG > 0)
 &Console_Write_IntltoolHelp if $arg_count > 1;
 
 # --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName;
+my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
 
 if ($POT_ARG)
 {
@@ -722,6 +722,8 @@ sub GeneratePOTemplate
 			   "--files-from\=\.\/POTFILES\.in\.temp");
     my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
     push @xgettext_argument, $XGETTEXT_KEYWORDS;
+    my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+    push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
     push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
     push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
     my $xgettext_command = join ' ', @xgettext_argument;
@@ -874,8 +876,10 @@ sub SubstituteVariable
     {
 	my $rest = $3;
 	my $untouched = $1;
-	my $sub = $varhash{$2};
-	
+	my $sub = "";
+        # Ignore recursive definitions of variables
+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+
 	return SubstituteVariable ("$untouched$sub$rest");
     }
     
@@ -992,10 +996,10 @@ sub FindPackageName
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name;
-	$varhash{"PACKAGE"} = $name;
-	$varhash{"PACKAGE_VERSION"} = $version;
-	$varhash{"VERSION"} = $version;
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
     }
     
     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) 
@@ -1003,10 +1007,10 @@ sub FindPackageName
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name;
-	$varhash{"PACKAGE"} = $name;
-	$varhash{"PACKAGE_VERSION"} = $version;
-	$varhash{"VERSION"} = $version;
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
     }
 
     # \s makes this not work, why?
@@ -1063,3 +1067,23 @@ sub FindMakevarsDomain
     
     return $domain;
 }
+
+sub FindMakevarsBugAddress
+{
+
+    my $address = "";
+    my $makevars_source; { 
+	local (*IN);
+	open (IN, ";
+	close IN;
+    }
+
+    $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
+    $address =~ s/^\s+//;
+    $address =~ s/\s+$//;
+    
+    return $address;
+}
diff --git a/libgimp/Makefile.in b/libgimp/Makefile.in
index a7f798c5fb..ac2577550c 100644
--- a/libgimp/Makefile.in
+++ b/libgimp/Makefile.in
@@ -123,6 +123,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -231,6 +232,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -392,6 +394,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -399,17 +402,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -426,6 +421,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -436,6 +434,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -447,10 +446,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpbase/Makefile.in b/libgimpbase/Makefile.in
index 65c3ff16dc..ae55d61f64 100644
--- a/libgimpbase/Makefile.in
+++ b/libgimpbase/Makefile.in
@@ -89,6 +89,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -197,6 +198,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -358,6 +360,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -365,17 +368,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -392,6 +387,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -402,6 +400,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -413,10 +412,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpbase/gimpversion.h b/libgimpbase/gimpversion.h
index 0032a08eb0..5d664b6807 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                              (2)
-#define GIMP_MICRO_VERSION                              (11)
-#define GIMP_VERSION                                    "2.2.11"
+#define GIMP_MICRO_VERSION                              (12)
+#define GIMP_VERSION                                    "2.2.12"
 #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 e230c04ea0..063d290d89 100644
--- a/libgimpcolor/Makefile.in
+++ b/libgimpcolor/Makefile.in
@@ -90,6 +90,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -198,6 +199,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -359,6 +361,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -366,17 +369,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -393,6 +388,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -403,6 +401,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -414,10 +413,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpmath/Makefile.in b/libgimpmath/Makefile.in
index a957502f9b..fd77a3ea40 100644
--- a/libgimpmath/Makefile.in
+++ b/libgimpmath/Makefile.in
@@ -88,6 +88,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -196,6 +197,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -357,6 +359,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -364,17 +367,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -391,6 +386,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -401,6 +399,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -412,10 +411,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpmodule/Makefile.in b/libgimpmodule/Makefile.in
index b8658daec9..fc54db6475 100644
--- a/libgimpmodule/Makefile.in
+++ b/libgimpmodule/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpthumb/Makefile.in b/libgimpthumb/Makefile.in
index 05ab7425bb..8f7266a351 100644
--- a/libgimpthumb/Makefile.in
+++ b/libgimpthumb/Makefile.in
@@ -88,6 +88,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -196,6 +197,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -357,6 +359,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -364,17 +367,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -391,6 +386,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -401,6 +399,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -412,10 +411,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpwidgets/Makefile.in b/libgimpwidgets/Makefile.in
index 3bf15c5e68..71c75068ce 100644
--- a/libgimpwidgets/Makefile.in
+++ b/libgimpwidgets/Makefile.in
@@ -107,6 +107,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -215,6 +216,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -376,6 +378,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -383,17 +386,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -410,6 +405,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -420,6 +418,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -431,10 +430,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c
index 9aecbf93b1..23efe3dfbc 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -1075,7 +1075,7 @@ gimp_coordinates_callback (GtkWidget           *widget,
 	{
 	  if ((gcd->orig_x != 0) && (gcd->orig_y != 0))
 	    {
-	      if (new_x != gcd->last_x)
+	      if (ROUND (new_x) != ROUND (gcd->last_x))
 		{
 		  gcd->last_x = new_x;
 		  new_y = (new_x * gcd->orig_y) / gcd->orig_x;
@@ -1086,7 +1086,7 @@ gimp_coordinates_callback (GtkWidget           *widget,
 		  gcd->last_y
                     = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1);
 		}
-	      else if (new_y != gcd->last_y)
+	      else if (ROUND (new_y) != ROUND (gcd->last_y))
 		{
 		  gcd->last_y = new_y;
 		  new_x = (new_y * gcd->orig_x) / gcd->orig_y;
diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
index c7e3a4717d..c0d385c7ba 100644
--- a/m4macros/Makefile.in
+++ b/m4macros/Makefile.in
@@ -63,6 +63,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -171,6 +172,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -332,6 +334,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -339,17 +342,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -366,6 +361,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -376,6 +374,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -387,10 +386,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/menus/Makefile.in b/menus/Makefile.in
index 81ef8e7929..6ff3b78f62 100644
--- a/menus/Makefile.in
+++ b/menus/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 26a5ab5793..e4488e5639 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -136,6 +136,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -244,6 +245,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -405,6 +407,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -412,17 +415,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -439,6 +434,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -449,6 +447,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -460,10 +459,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/FractalExplorer/Makefile.in b/plug-ins/FractalExplorer/Makefile.in
index edf0fa3b54..60f750fff7 100644
--- a/plug-ins/FractalExplorer/Makefile.in
+++ b/plug-ins/FractalExplorer/Makefile.in
@@ -93,6 +93,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -201,6 +202,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -362,6 +364,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -369,17 +372,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -396,6 +391,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -406,6 +404,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -417,10 +416,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/FractalExplorer/examples/Makefile.in b/plug-ins/FractalExplorer/examples/Makefile.in
index cad5b7783a..4cb6fb42e5 100644
--- a/plug-ins/FractalExplorer/examples/Makefile.in
+++ b/plug-ins/FractalExplorer/examples/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/Lighting/Makefile.in b/plug-ins/Lighting/Makefile.in
index 66f63592e1..269d20cc5d 100644
--- a/plug-ins/Lighting/Makefile.in
+++ b/plug-ins/Lighting/Makefile.in
@@ -96,6 +96,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -204,6 +205,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -365,6 +367,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -372,17 +375,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -399,6 +394,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -409,6 +407,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -420,10 +419,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/Lighting/images/Makefile.in b/plug-ins/Lighting/images/Makefile.in
index dc68fe1851..d180d61074 100644
--- a/plug-ins/Lighting/images/Makefile.in
+++ b/plug-ins/Lighting/images/Makefile.in
@@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -356,6 +351,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -366,6 +364,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -377,10 +376,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/Makefile.in b/plug-ins/Makefile.in
index fbf9ee15b7..9d7937a617 100644
--- a/plug-ins/Makefile.in
+++ b/plug-ins/Makefile.in
@@ -63,6 +63,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -171,6 +172,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -332,6 +334,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -339,17 +342,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -366,6 +361,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -376,6 +374,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -387,10 +386,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/MapObject/Makefile.in b/plug-ins/MapObject/Makefile.in
index 04e752f809..d6b35e09b3 100644
--- a/plug-ins/MapObject/Makefile.in
+++ b/plug-ins/MapObject/Makefile.in
@@ -89,6 +89,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -197,6 +198,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -358,6 +360,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -365,17 +368,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -392,6 +387,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -402,6 +400,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -413,10 +412,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/bmp/Makefile.in b/plug-ins/bmp/Makefile.in
index e7df0d4afb..07f8aea544 100644
--- a/plug-ins/bmp/Makefile.in
+++ b/plug-ins/bmp/Makefile.in
@@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -192,6 +193,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -353,6 +355,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -360,17 +363,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -387,6 +382,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -397,6 +395,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -408,10 +407,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in
index fa6032ee01..e85303a8e5 100644
--- a/plug-ins/common/Makefile.in
+++ b/plug-ins/common/Makefile.in
@@ -1091,6 +1091,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -1199,6 +1200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -1360,6 +1362,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -1367,17 +1370,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -1394,6 +1389,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -1404,6 +1402,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -1415,10 +1414,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c
index 763b674d2b..8ae3a4b14a 100644
--- a/plug-ins/common/animationplay.c
+++ b/plug-ins/common/animationplay.c
@@ -834,11 +834,8 @@ render_frame (gint32 whichframe)
             {
               if ((dispose!=DISPOSE_REPLACE)&&(whichframe!=0))
                 {
-                  int top, bottom;
-
-                  top = (rawy < 0) ? 0 : rawy;
-                  bottom = (rawy+rawheight) < height ?
-                    (rawy+rawheight) : height-1;
+                  gint top    = MAX (rawy, 0);
+                  gint bottom = MIN (rawy + rawheight, height);
 
                   reshape_from_bitmap (shape_preview_mask);
                   gdk_draw_rgb_image (shape_drawing_area->window,
@@ -863,11 +860,8 @@ render_frame (gint32 whichframe)
             {
               if ((dispose!=DISPOSE_REPLACE)&&(whichframe!=0))
                 {
-                  int top, bottom;
-
-                  top = (rawy < 0) ? 0 : rawy;
-                  bottom = (rawy+rawheight) < height ?
-                    (rawy+rawheight) : height-1;
+                  gint top    = MAX (rawy, 0);
+                  gint bottom = MIN (rawy + rawheight, height);
 
                   gdk_draw_rgb_image (drawing_area->window,
                                       drawing_area->style->white_gc,
@@ -1063,11 +1057,8 @@ render_frame (gint32 whichframe)
             {
               if ((dispose!=DISPOSE_REPLACE)&&(whichframe!=0))
                 {
-                  int top, bottom;
-
-                  top = (rawy < 0) ? 0 : rawy;
-                  bottom = (rawy+rawheight) < height ?
-                    (rawy+rawheight) : height-1;
+                  gint top    = MAX (rawy, 0);
+                  gint bottom = MIN (rawy + rawheight, height);
 
                   reshape_from_bitmap (shape_preview_mask);
                   gdk_draw_rgb_image (shape_drawing_area->window,
@@ -1092,11 +1083,8 @@ render_frame (gint32 whichframe)
             {
               if ((dispose!=DISPOSE_REPLACE)&&(whichframe!=0))
                 {
-                  int top, bottom;
-
-                  top = (rawy < 0) ? 0 : rawy;
-                  bottom = (rawy+rawheight) < height ?
-                    (rawy+rawheight) : height-1;
+                  gint top    = MAX (rawy, 0);
+                  gint bottom = MIN (rawy + rawheight, height);
 
                   gdk_draw_rgb_image (drawing_area->window,
                                       drawing_area->style->white_gc,
diff --git a/plug-ins/common/dicom.c b/plug-ins/common/dicom.c
index bb0e754b6d..068adfc1ee 100644
--- a/plug-ins/common/dicom.c
+++ b/plug-ins/common/dicom.c
@@ -320,7 +320,7 @@ load_image (const gchar *filename)
       return -1;
     }
 
-  while (TRUE)
+  while (!feof (DICOM))
     {
       guint16  group_word;
       guint16  element_word;
@@ -329,6 +329,9 @@ load_image (const gchar *filename)
       guint32  ctx_ul;
       guint16  ctx_us;
       guint8  *value;
+      guint32  tag;
+      gboolean do_toggle_endian= FALSE;
+      gboolean implicit_encoding = FALSE;
 
       if (fread (&group_word, 1, 2, DICOM) == 0)
 	break;
@@ -337,14 +340,25 @@ load_image (const gchar *filename)
       fread (&element_word, 1, 2, DICOM);
       element_word = g_ntohs (GUINT16_SWAP_LE_BE (element_word));
 
-      fread (value_rep, 1, 2, DICOM);
+      tag = (group_word << 16) | element_word;
+      fread(value_rep, 2, 1, DICOM);
       value_rep[2] = 0;
 
-      /* Implicit encoding */
-      if (value_rep[0] < 'A' ||
-          value_rep[0] > 'Z' ||
-          value_rep[1] < 'A' ||
-          value_rep[1] > 'Z')
+      /* Check if the value rep looks valid. There probably is a
+         better way of checking this...
+       */
+      if ((/* Always need lookup for implicit encoding */
+	   tag > 0x0002ffff && implicit_encoding)
+	  /* This heuristics isn't used if we are doing implicit
+	     encoding according to the value representation... */
+	  || ((value_rep[0] < 'A' || value_rep[0] > 'Z'
+	  || value_rep[1] < 'A' || value_rep[1] > 'Z')
+
+	  /* I found this in one of Ednas images. It seems like a
+	     bug...
+	  */
+	      && !(value_rep[0] == ' ' && value_rep[1]))
+          )
         {
           /* Look up type from the dictionary. At the time we dont
 	     support this option... */
@@ -375,6 +389,7 @@ load_image (const gchar *filename)
 	  fread (&element_length, 1, 4, DICOM);
 	  element_length = g_ntohl (GUINT32_SWAP_LE_BE (element_length));
 	}
+      /* Short length */
       else
 	{
 	  guint16 el16;
@@ -383,6 +398,14 @@ load_image (const gchar *filename)
 	  element_length = g_ntohs (GUINT16_SWAP_LE_BE (el16));
 	}
 
+      /* Sequence of items - just ignore the delimiters... */
+      if (element_length == 0xffffffff)
+	continue;
+
+      /* Sequence of items item tag... Ignore as well */
+      if (tag == 0xFFFEE000)
+	continue;
+
       /* Read contents. Allocate a bit more to make room for casts to int
        below. */
       value = g_new0 (guint8, element_length + 4);
@@ -393,7 +416,24 @@ load_image (const gchar *filename)
       ctx_us = *(guint16 *) value;
 
       /* Recognize some critical tags */
-      if (group_word == 0x0028)
+      if (group_word == 0x0002)
+        {
+          switch (element_word)
+            {
+            case 0x0010:   /* transfer syntax id */
+              if (strcmp("1.2.840.10008.1.2", (char*)value) == 0)
+                {
+                  do_toggle_endian = FALSE;
+                  implicit_encoding = TRUE;
+                }
+              else if (strcmp("1.2.840.10008.1.2.1", (char*)value) == 0)
+                do_toggle_endian = FALSE;
+              else if (strcmp("1.2.840.10008.1.2.2", (char*)value) == 0)
+                do_toggle_endian = TRUE;
+              break;
+            }
+        }
+      else if (group_word == 0x0028)
 	{
 	  switch (element_word)
 	    {
diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c
index 5c524af995..c7e083ed0f 100644
--- a/plug-ins/common/png.c
+++ b/plug-ins/common/png.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: png.c,v 1.118 2004/11/23 14:28:43 mitch Exp $"
+ * "$Id: png.c,v 1.118.2.2 2006/06/05 04:30:17 kcozens Exp $"
  *
  *   Portable Network Graphics (PNG) plug-in for The GIMP -- an image
  *   manipulation program
@@ -502,7 +502,7 @@ run (const gchar      *name,
     {
       load_defaults ();
 
-      *nreturn_vals = 9;
+      *nreturn_vals = 10;
 
 #define SET_VALUE(index, field)	G_STMT_START { \
  values[(index)].type = GIMP_PDB_INT32;        \
@@ -523,17 +523,17 @@ run (const gchar      *name,
     }
   else if (strcmp (name, "file_png_set_defaults") == 0)
     {
-      if (nparams == 10)
+      if (nparams == 9)
         {
-          pngvals.interlaced          = param[1].data.d_int32;
-          pngvals.compression_level   = param[2].data.d_int32;
-          pngvals.bkgd                = param[3].data.d_int32;
-          pngvals.gama                = param[4].data.d_int32;
-          pngvals.offs                = param[5].data.d_int32;
-          pngvals.phys                = param[6].data.d_int32;
-          pngvals.time                = param[7].data.d_int32;
-          pngvals.comment             = param[8].data.d_int32;
-          pngvals.save_transp_pixels  = param[9].data.d_int32;
+          pngvals.interlaced          = param[0].data.d_int32;
+          pngvals.compression_level   = param[1].data.d_int32;
+          pngvals.bkgd                = param[2].data.d_int32;
+          pngvals.gama                = param[3].data.d_int32;
+          pngvals.offs                = param[4].data.d_int32;
+          pngvals.phys                = param[5].data.d_int32;
+          pngvals.time                = param[6].data.d_int32;
+          pngvals.comment             = param[7].data.d_int32;
+          pngvals.save_transp_pixels  = param[8].data.d_int32;
 
           save_defaults ();
         }
@@ -1012,7 +1012,11 @@ load_image (const gchar *filename,
    * Done with the file...
    */
 
+#if PNG_LIBPNG_VER > 99
+  png_destroy_read_struct (&pp, &info, NULL);
+#else
   png_read_destroy (pp, info, NULL);
+#endif
 
   g_free (pixel);
   g_free (pixels);
@@ -1441,7 +1445,12 @@ save_image (const gchar *filename,
     };
 
   png_write_end (pp, info);
+
+#if PNG_LIBPNG_VER > 99
+  png_destroy_write_struct (&pp, &info);
+#else
   png_write_destroy (pp);
+#endif
 
   g_free (pixel);
   g_free (pixels);
diff --git a/plug-ins/dbbrowser/Makefile.in b/plug-ins/dbbrowser/Makefile.in
index c540953a96..2e20f61bf5 100644
--- a/plug-ins/dbbrowser/Makefile.in
+++ b/plug-ins/dbbrowser/Makefile.in
@@ -101,6 +101,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -209,6 +210,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -370,6 +372,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -377,17 +380,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -404,6 +399,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -414,6 +412,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -425,10 +424,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/faxg3/Makefile.in b/plug-ins/faxg3/Makefile.in
index 416fc2ed38..397adf88e2 100644
--- a/plug-ins/faxg3/Makefile.in
+++ b/plug-ins/faxg3/Makefile.in
@@ -80,6 +80,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -188,6 +189,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -349,6 +351,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -356,17 +359,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -383,6 +378,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -393,6 +391,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -404,10 +403,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/fits/Makefile.in b/plug-ins/fits/Makefile.in
index 94af615964..37d94bab1b 100644
--- a/plug-ins/fits/Makefile.in
+++ b/plug-ins/fits/Makefile.in
@@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -192,6 +193,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -353,6 +355,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -360,17 +363,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -387,6 +382,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -397,6 +395,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -408,10 +407,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/flame/Makefile.in b/plug-ins/flame/Makefile.in
index 2ccab01a3e..fdfd26eea6 100644
--- a/plug-ins/flame/Makefile.in
+++ b/plug-ins/flame/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gfig/Makefile.in b/plug-ins/gfig/Makefile.in
index 968649a15b..d207dbf72a 100644
--- a/plug-ins/gfig/Makefile.in
+++ b/plug-ins/gfig/Makefile.in
@@ -97,6 +97,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -205,6 +206,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -366,6 +368,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -373,17 +376,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -400,6 +395,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -410,6 +408,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -421,10 +420,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gfig/gfig-examples/Makefile.in b/plug-ins/gfig/gfig-examples/Makefile.in
index d48d3f01aa..3e92db6258 100644
--- a/plug-ins/gfig/gfig-examples/Makefile.in
+++ b/plug-ins/gfig/gfig-examples/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gfig/images/Makefile.in b/plug-ins/gfig/images/Makefile.in
index 303851bbd9..ed58bc3682 100644
--- a/plug-ins/gfig/images/Makefile.in
+++ b/plug-ins/gfig/images/Makefile.in
@@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -356,6 +351,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -366,6 +364,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -377,10 +376,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gflare/Makefile.in b/plug-ins/gflare/Makefile.in
index d09f0f2209..ed7f905e4e 100644
--- a/plug-ins/gflare/Makefile.in
+++ b/plug-ins/gflare/Makefile.in
@@ -91,6 +91,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -199,6 +200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -360,6 +362,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -367,17 +370,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -394,6 +389,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -404,6 +402,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -415,10 +414,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gflare/gflares/Makefile.in b/plug-ins/gflare/gflares/Makefile.in
index 3e85692833..7c5ea06020 100644
--- a/plug-ins/gflare/gflares/Makefile.in
+++ b/plug-ins/gflare/gflares/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gfli/Makefile.in b/plug-ins/gfli/Makefile.in
index fc0195149d..5a03181d30 100644
--- a/plug-ins/gfli/Makefile.in
+++ b/plug-ins/gfli/Makefile.in
@@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -192,6 +193,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -353,6 +355,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -360,17 +363,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -387,6 +382,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -397,6 +395,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -408,10 +407,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gimpressionist/Brushes/Makefile.in b/plug-ins/gimpressionist/Brushes/Makefile.in
index c3c368ba2d..29abfc1046 100644
--- a/plug-ins/gimpressionist/Brushes/Makefile.in
+++ b/plug-ins/gimpressionist/Brushes/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gimpressionist/Makefile.in b/plug-ins/gimpressionist/Makefile.in
index 9d418a9eaf..f5f1ec8c9f 100644
--- a/plug-ins/gimpressionist/Makefile.in
+++ b/plug-ins/gimpressionist/Makefile.in
@@ -100,6 +100,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -208,6 +209,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -369,6 +371,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -376,17 +379,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -403,6 +398,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -413,6 +411,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -424,10 +423,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gimpressionist/Paper/Makefile.in b/plug-ins/gimpressionist/Paper/Makefile.in
index 07ff6c8bc5..ddace31463 100644
--- a/plug-ins/gimpressionist/Paper/Makefile.in
+++ b/plug-ins/gimpressionist/Paper/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/gimpressionist/Presets/Makefile.in b/plug-ins/gimpressionist/Presets/Makefile.in
index b78f4c0608..1a5e26fd83 100644
--- a/plug-ins/gimpressionist/Presets/Makefile.in
+++ b/plug-ins/gimpressionist/Presets/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/help/Makefile.in b/plug-ins/help/Makefile.in
index 141253f5b1..a5a740b0f9 100644
--- a/plug-ins/help/Makefile.in
+++ b/plug-ins/help/Makefile.in
@@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -192,6 +193,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -353,6 +355,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -360,17 +363,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -387,6 +382,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -397,6 +395,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -408,10 +407,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/helpbrowser/Makefile.in b/plug-ins/helpbrowser/Makefile.in
index b43c97546f..fb2be1be63 100644
--- a/plug-ins/helpbrowser/Makefile.in
+++ b/plug-ins/helpbrowser/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/ifscompose/Makefile.in b/plug-ins/ifscompose/Makefile.in
index 6fae82a9fa..db53d26d57 100644
--- a/plug-ins/ifscompose/Makefile.in
+++ b/plug-ins/ifscompose/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/imagemap/Makefile.in b/plug-ins/imagemap/Makefile.in
index a9ca912dc2..f7e9ea5292 100644
--- a/plug-ins/imagemap/Makefile.in
+++ b/plug-ins/imagemap/Makefile.in
@@ -124,6 +124,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -232,6 +233,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -393,6 +395,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -400,17 +403,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -427,6 +422,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -437,6 +435,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -448,10 +447,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/imagemap/images/Makefile.in b/plug-ins/imagemap/images/Makefile.in
index c8e210f55d..f386b8bd6c 100644
--- a/plug-ins/imagemap/images/Makefile.in
+++ b/plug-ins/imagemap/images/Makefile.in
@@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -356,6 +351,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -366,6 +364,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -377,10 +376,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/maze/Makefile.in b/plug-ins/maze/Makefile.in
index 895671cc07..d38ce0dba1 100644
--- a/plug-ins/maze/Makefile.in
+++ b/plug-ins/maze/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/pagecurl/Makefile.in b/plug-ins/pagecurl/Makefile.in
index f78a7716c5..56b57687fc 100644
--- a/plug-ins/pagecurl/Makefile.in
+++ b/plug-ins/pagecurl/Makefile.in
@@ -88,6 +88,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -196,6 +197,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -357,6 +359,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -364,17 +367,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -391,6 +386,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -401,6 +399,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -412,10 +411,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/print/Makefile.in b/plug-ins/print/Makefile.in
index 5aaf2c0b8f..5c23849071 100644
--- a/plug-ins/print/Makefile.in
+++ b/plug-ins/print/Makefile.in
@@ -86,6 +86,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -194,6 +195,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -355,6 +357,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -362,17 +365,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -389,6 +384,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -399,6 +397,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -410,10 +409,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/pygimp/Makefile.in b/plug-ins/pygimp/Makefile.in
index d6571f98df..626ac102fc 100644
--- a/plug-ins/pygimp/Makefile.in
+++ b/plug-ins/pygimp/Makefile.in
@@ -115,6 +115,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -223,6 +224,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -384,6 +386,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -391,17 +394,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -418,6 +413,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -428,6 +426,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -439,10 +438,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/pygimp/doc/Makefile.in b/plug-ins/pygimp/doc/Makefile.in
index 2f168bab75..d05eb1d612 100644
--- a/plug-ins/pygimp/doc/Makefile.in
+++ b/plug-ins/pygimp/doc/Makefile.in
@@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -356,6 +351,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -366,6 +364,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -377,10 +376,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/pygimp/plug-ins/Makefile.in b/plug-ins/pygimp/plug-ins/Makefile.in
index f5005243f0..1c6bf71038 100644
--- a/plug-ins/pygimp/plug-ins/Makefile.in
+++ b/plug-ins/pygimp/plug-ins/Makefile.in
@@ -65,6 +65,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -173,6 +174,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -334,6 +336,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -341,17 +344,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -368,6 +363,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -378,6 +376,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -389,10 +388,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/rcm/Makefile.in b/plug-ins/rcm/Makefile.in
index a50a44bd28..347d54df59 100644
--- a/plug-ins/rcm/Makefile.in
+++ b/plug-ins/rcm/Makefile.in
@@ -93,6 +93,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -201,6 +202,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -362,6 +364,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -369,17 +372,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -396,6 +391,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -406,6 +404,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -417,10 +416,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/rcm/images/Makefile.in b/plug-ins/rcm/images/Makefile.in
index b1a3fa5f27..222af509e5 100644
--- a/plug-ins/rcm/images/Makefile.in
+++ b/plug-ins/rcm/images/Makefile.in
@@ -53,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -161,6 +162,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -322,6 +324,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -329,17 +332,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -356,6 +351,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -366,6 +364,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -377,10 +376,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/script-fu/Makefile.in b/plug-ins/script-fu/Makefile.in
index 205ecb2b9c..64ff09c1aa 100644
--- a/plug-ins/script-fu/Makefile.in
+++ b/plug-ins/script-fu/Makefile.in
@@ -100,6 +100,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -208,6 +209,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -369,6 +371,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -376,17 +379,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -403,6 +398,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -413,6 +411,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -424,10 +423,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/script-fu/scripts/Makefile.in b/plug-ins/script-fu/scripts/Makefile.in
index c9877662d0..18e5ceef95 100644
--- a/plug-ins/script-fu/scripts/Makefile.in
+++ b/plug-ins/script-fu/scripts/Makefile.in
@@ -70,6 +70,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -178,6 +179,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -339,6 +341,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -346,17 +349,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -373,6 +368,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -383,6 +381,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -394,10 +393,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/script-fu/scripts/images/Makefile.in b/plug-ins/script-fu/scripts/images/Makefile.in
index 6bedbaa4e0..c9a50ac736 100644
--- a/plug-ins/script-fu/scripts/images/Makefile.in
+++ b/plug-ins/script-fu/scripts/images/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/script-fu/siod/Makefile.in b/plug-ins/script-fu/siod/Makefile.in
index 3a3f02d673..e6bf9ddd5c 100644
--- a/plug-ins/script-fu/siod/Makefile.in
+++ b/plug-ins/script-fu/siod/Makefile.in
@@ -72,6 +72,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -180,6 +181,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -341,6 +343,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -348,17 +351,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -375,6 +370,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -385,6 +383,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -396,10 +395,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/sel2path/Makefile.in b/plug-ins/sel2path/Makefile.in
index c56f57e45a..5ef96de31c 100644
--- a/plug-ins/sel2path/Makefile.in
+++ b/plug-ins/sel2path/Makefile.in
@@ -87,6 +87,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -195,6 +196,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -356,6 +358,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -363,17 +366,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -390,6 +385,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -400,6 +398,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -411,10 +410,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/sgi/Makefile.in b/plug-ins/sgi/Makefile.in
index aa5adee5f3..632f8b33ec 100644
--- a/plug-ins/sgi/Makefile.in
+++ b/plug-ins/sgi/Makefile.in
@@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -192,6 +193,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -353,6 +355,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -360,17 +363,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -387,6 +382,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -397,6 +395,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -408,10 +407,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/twain/Makefile.in b/plug-ins/twain/Makefile.in
index 2b3ba10a2e..4d228a17fb 100644
--- a/plug-ins/twain/Makefile.in
+++ b/plug-ins/twain/Makefile.in
@@ -95,6 +95,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -203,6 +204,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -364,6 +366,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -371,17 +374,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -398,6 +393,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -408,6 +406,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -419,10 +418,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/winicon/Makefile.in b/plug-ins/winicon/Makefile.in
index 533797a304..1f541f8f7c 100644
--- a/plug-ins/winicon/Makefile.in
+++ b/plug-ins/winicon/Makefile.in
@@ -87,6 +87,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -195,6 +196,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -356,6 +358,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -363,17 +366,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -390,6 +385,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -400,6 +398,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -411,10 +410,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/winsnap/Makefile.in b/plug-ins/winsnap/Makefile.in
index f1b62337e8..f08e6836a4 100644
--- a/plug-ins/winsnap/Makefile.in
+++ b/plug-ins/winsnap/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/plug-ins/xjt/Makefile.in b/plug-ins/xjt/Makefile.in
index 22d69aeefb..db3d552a4c 100644
--- a/plug-ins/xjt/Makefile.in
+++ b/plug-ins/xjt/Makefile.in
@@ -85,6 +85,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -193,6 +194,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -354,6 +356,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -361,17 +364,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -388,6 +383,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -398,6 +396,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -409,10 +408,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/po-libgimp/ChangeLog b/po-libgimp/ChangeLog
index 5ca1e0728b..7e99935511 100644
--- a/po-libgimp/ChangeLog
+++ b/po-libgimp/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-20  Inaki Larranaga  
+
+	* eu.po: Updated Basque translation.
+
 2005-11-12  Takeshi AIHANA 
 
 	* ja.po: Updated Japanese translation by
diff --git a/po-libgimp/eu.gmo b/po-libgimp/eu.gmo
index c8293a5c1f79e49c6fa0f14e8944085338708d46..e693e06be4b469e18f7b53688b581b9c2baaf855 100644
GIT binary patch
literal 11590
zcmb`Ld2nP$eaG7ewpYeB7{XPP_9&^iX*9z&$nNX
zv|6tZjw${0d9Poezy9^_*WLG@d+OT_zfU6PBky~hF%RnbO#bovm$QvI9eyY9`+@%v
z_+Np)3_R%^W6mJ|CP-E0+`y*=J`?^S>Cb`Bg=26KcHj%(JK(e7*WfUG5Ize&^9jb(
z;1%#Zm_U7h1AGen3{?NW37-ys2G#G=pICiA2mS%?7eM~ZW&BhBu7sz-g^>P|@ZJgE
z3pl{{9;7SgweVE<_VE6m@ct3_B+@?t)$SKz2EPVX{_=B;kxHkb`hO4}g4aX!|EuBq
zzrm;S{!=&#PoYxjX#%R=E_^&Z3Z>`QLYgqQ!Y9K!-~#*b#kfSPAbp7eVrlpdb|
zH9r?aeV>9VHy_ep9?~;q5AOyDEDBrW7
z-k$^2j|-vtaS>Fx-B9`Vhx7yC{o3&UGN^vJke&oy52f!Se7`BY-x9vR1*+Y*L5=5j
zsCGXb_;ILqKOMe*Ch*?y{VP!AzX6r+yW#tN;r)kD^*sPTb`t(CyuTl(sq{MoKNk3@
zz|RJLIq>UHdii$XzXpCE4yk^)3qJ9g*an=16YzEL`S2g$9(Xd7sr5JsUkH0}5dJNk
zhW9}WxAISZdkWHJ(}wEr>mVj*-VBv~7nDEv5|my2Gu#Bf2QfACW2kb!hSKlpEC#Lj
zv!TkJ50!o)#KoJ7q3W50DnApxJGjDo8_FKO9ryrbXy%vD!KZDm*7r?N_I(>vKR*a(
z;OC&meI|pGy-Yy$<4UM`j3BPow4v73E8zlsC)@}B6Kefk`kX3W?SYz?9BQ1a;r&%m
z{k#PZ!*@gZov%W*dmq$1{20oAJbg=5{sO3R4@1>E3CUt+p~_`Y`o96H+-*?(xdTdn
z_dx0Mvrzu+OYkE2k8nF2xS$&6E~t6h3sr6oN?#FFJ6)*$u0rYIR(Kk`6KY)dK7-u>x4}!`DX;;huN8O(EZ}MIMyP(h2CDr#pxXH;R6U=E
zqwp(G?QI&W^m{&3xouGOOu@_GeyDZ#MyUGkh3d!G;2H22Q2zd;=Ngm3r$Uv#1**MU
zq4K>0GIi#5sQLaf+yuV`9|yk&oA3wlTKMAUVaxDNcryI&z@J0;-CseimnYMiGvV{0
z^1TSE-Z7|lXW#%l2yxZs2(;r(W)d3!xn{&$7+4+VZ0KA!Zuq1yX2R6AdQ
zs_*Zi%6}t#zaPqOe*)Fcub}dsT&v1G4yv7VpuRr?o&`5U<=YOW$LELl5vcL(h9|){
zA$K6C!S7F}p?+^eUW)t)@-akfLhG*oqqzS`hkL_w8(tWmg^z^iTj3P48&O~X3i(S!
zKiP!(eF%9Gav1q2a_nz0yvW}5)4b|8SiyWe@I$Z>p6?12UWRDzdHi!LTabOoTag9ioru=3e#6KT^5=TtcXb8x
z7WiI7HhvQ#U#j2j$gBKQwLjG33z0V?FV+jcQDiG}9`Xs~!^mlfey>NaL@ZJw&qdyc
zWXPS!B%IK3?c{z7QzRl)w&slnycB7@ZSPg1FF8f1k
zDY7WZyHVznC0{0SuAz?EsNG$O>=N^txV9Ob=yZ$KAu|{!hog4fum>0R)-JVqk;O@K
z$c!%LX}c_(9hc_gjw5}^j5Zo})K@bes_}1TG+A0nGc(%lVlXq(hMo089BW5Q^_CIB
zf4d)}suFB{u57o{vKZmLbY?6o^A$Vq+HOfIG~=_^?DPMs>9@K6LObJimlO^%l(eu7
z$4e(poQ-TXmX);QY$ML7D9u)f2NqV!&SDb9?c5%T+ikn(7-*Ww{1RKNIJ=y-8+3XZ
zbr-JFO|vLlwaana<#upOF2l_=;O<*?Fd>|5&WH^_-?T?I(76e7w?`oy$_y
zV8+`qMbwI0b&V|Tc3rkj?}=UVpO_RWnbNCAR$RuUCw4V0Gn+4Ej$B0=hEAcVs4~+N
zUuKV6j+bK8VGqT*SDH_z?Q}V0srU0Nt=fgvt{VyI4PUgt&N^i~7;W4}m3D9}b4B6W
zwL{dL7PZ-wX_5goF@<8KGZbp*suih8g~}Ym@x!l1!^dj)X|fz=9g29``RFh@NfYce
zFV-IHcztyVb*pp9VV4ye^<>|j9Gf^D97ok&a1x9qD%*^Oe$$P7U~o@rMtml>;-
zRWQC9C1y{QwX8R@-0X2ILDqBHjU&rS&0UhmMSK`{pb<4?9z$m0Cy~`$u-VJR7nsD
z)0TO)dVMKElpUX+H&bzQ#rAFM#GReO(S+IVv&z_i3w_!bx6^7+Gj%P7%+AXXCrvX`
zm#bNOi!wAfL&HUX)@I_Q_4s37R9Np9wehL#o8NINzmC@`-mpEbs+AvP2%#E_71d`8MDGF9uW|6Hw@`BvQR
zK6GN|G2OOVkms+K=#uw1^3(Q6nh?q{gm`(i^7i=FW}IN`e(yBw%MmJ;WE+?Po_0}T
zRExSx+_VHvCCa0D9r^Xp$|)G;P!A8Utf`6)SPBU|K3RW)G{e
zTb()dDV-RSk!;DeLtwmq
zZy=ZLOG&YZtKM0^Z9}yWSHJ)6w{^dHh3rA)eQmztLk4@3%3A2>qC@#?rU@c!EwpR#
z-S>U2HY@azy$eH^^$}?DG$Dr8M@@ZrKP;1wgsek3z|z=@+5V-#FJ_=>SGy`
z=N&|S+|>7!UA87niK$OCu#kEcV@!Q7{n=RMq^bMZK&w-xKHW^n0r4pcY4v@kK5ObY
z1`LdqTgL+&j&Tz_`27J{4)Et!q;^&H1CAi>QN7CNlRVF#mM~ax5kr|Tvb4qP0+yAd
zrjDr}GIehorhbhHD@TszI#z9Mx=}mCCY?DSv926A;1n}!vw0JDI#xDweCmiDnA^Wl
z8&|w0Uu_Q!kJz2tw_jY_{({=h?RLk-BRej6-gbUutQ}w=s_%sPc3xEFo53~Kd>8Rp
za?8_S{F|s1Dl(gQ6Eg
z8;bOgyo<4IX~8;99*?O5zfGq%meJ5R^yRTN{96=hx~xR;)mgb0r?n0{Ui2R4(W6X}
z>v3FT+DbyS>Yya^lu?(T(W30n<#8E_KMkiXYmYN|(kP=A=dY;48i=gM%?Z23oaH6&
zk6hEkHARo2tf5GKqDrFnG8IR}c1Gw}bhc5N!Kt#yBM#uz!MlaCVfgJhW%uVu-{%d0
zNahdXr4IDgAH!R0#vLJ$NVi_E8RglGvRbtTDmjX`W2$_JrU(J9joq6Kuz4Djze=n%
zU44ZuJxe7TF$XhT0NL5E9gS)$k!;(sSzSMzSC(3RqGk>r5%Gdzk(uxlrfFqdJto-|
zM;*}7yoEcA)5!KvNUtb|2llaf%{ZnVjayo+QM(aSkX?Zm({fDng=?}qtxn_|MH`{2
zXxL2fp+}%#>ru_?F)1!D*vq4wvZbv@>CdR4)72qW&8R?PTWEnQn8#WRw~2d>+hvq&
zqvM#$T8o^x5^w-w4D4TG}PW3AqcTTDWWtDbnJ%w(ABem0BjT5{i^kXCua
zn(IXwksZkkpluLMrHrA6RBC?@brDf2yN-Kkq!Ia(
z*I+h84_n7tFl&lo`g7O>ktb%CO`n)To${q6tQ|AJC17Gn)H?34&&h-!#WIPRRnGkd
z%)BLFp{~cNKi3XM_Po9}IQMH=p?Nu%%3vGihJMjaojP$xC{@NoCCpkfY-TXiGQ=CR
zulj6excG}|Mchrj&3RMSwxhZasQw3I*M#K-?$|4T-IVfY6
zK|S$4XmZ^yD6kfby|a_Kp_On|pz8qQ$J(l(MgoFkNwBw43;hgMmjqZZ!yO-=*G9UB
zD_%ELe>p2XSL^p-2lC+OKf8#V$HSUw-9n*!)uKSX7CVpmRCQSw34Zimm7Gort6Yu^Z&&L+v4H&M3fWIl`5ul@(#kdA_ONVrNlA#bEfaEcrb?(d*t)l0I;9&2c2wT5IMQxt
zH=T<%hWzkal
z#+c);D2}tNX+kU>!>%~It?9q9ws6bZaL{$feqf_H&T;+Nl!0vp?KVS%s1
zZ9l@=l#kHPGuV@VRsXHl&-Guo0B;*|Oi>sEgv
zTfer%0Q(+ux*;QA(U>W=8+at`G<~y!RaB19z4zSe)ex((+H6-Jd-T`#(x^8)Kyei4
zCr{hU6MKRx(rfl6H*CUvgTJq;86PgyAAKx4_YmlOtPdOLXyY(g3fhs#R!~GQ^}8;Y
z;Q3w2Dj|1d?ja_1EWInK0fOCtCIonq4-3L?)bvUx)Qk_Mn)oyp?W8#)uU$
zd)Df5gbzIQJ4svW2^xQBGxd#kB{)8*IQDUx+Y{Gb)c$Yn(qxL(iB@4+Q}kF?>sKm1
Pm0J~WZn{rR|l+mQt`F9neld9)6TxA85I)w=Gf>
zucCkohPi`@48bsV0<&r9cXk1+K?oe4R{l7aqR(|N_!YJfyb~NUq(&f
zI`YtFDi>v80WQW`^W45
zUvTZ$a5n9qp(bz!C*WsTg8x90U~Xa%_2;4PHw$A*MKzUdtj7#oi|X&fBHV%F@W;rU
z%n{TLUqapRP1L||yY@*`%0ECo@n2C7b{RF!|4LBMP=d_s0p4yrSL3v;y+OtTg7AQf!a_5Z^Q!ZM&0L8)C8Wy&G>YTN-LGGu??3q
z?PPr3`66mHzl^%!3D^I=YySZ?@F%E&&$;7&ckN5Aea*GML`~$n>yM@IxEe4Oe}I#m
z(_DW6YTzQ&%!8>*DrC$o1J%}u4{A0w>Udc*LR{#;{8WlNAirsfr-uxXSTD*
zIma17J$cx<$hj2D=wE?)$2&2MZ(-tFH|6S<0d1xb8wS)XPyl57*ewOEU>7Al9RXcv5f
zO6f(^JG$)JUtk68uTc{zVRjm59x8K9sO`B6b=^MHgFJz{-zzu^kE1en8kLDl`Q*Qn
z%D?H*Obgj78lW6C)5WO%yIg+*BL8Yn_^+dZ-1029|JdB$8FHr-&hZ^8K>blFQ^S?!X`zP>K(tVeq
zzMLCS*Y)B&JP@Oz8~heEz#maFypC*9lTu_%KjxqYK8PCNC#dtD#o2fam6=nhlz)U>
zcox^=V$yOa9>rw*mos*i3fVW;P-|ccFG?rmqHb7#8mJ64(U3bnA2pFhuDuME@)p#2
z>s`O^>_%m@7vrxm(H}E=sp!Ies0kcFrRoLL06#}f=q=QR@1O=aiF&7ha>vg(KSxdY
zA|~NdqMcCDC%uo*eZxe2|6}|=9&)dKC>n6AY^1_p(D)AU@P499)V61^!
z4=T4Li2v$U>Gf!WD(hH(-xaoNeASP2bh(Ol#P>@F4P|U0p?$oA;G1Oz36*7p?t3qx
zci%{q5-h2B*~4!E(L=;~<6VhQtBu9vtvbzRAoL9Alis~h!uoh%K-5(
zv6!eP?juxo5qA(jB(#us6H(2xo620`QDQq0B2?}ohKV4doiJ89sT8|L3vP4u1*rAI
zYmcw=2x^P@#C}3wNbRIW#BD^Pkf+VmZYHvcAwvIASVerljJSqA8v5{P536h;s)#v+
z7Ng38#0DadXdspoJBcP@E1}X#6cHJB^Yaj)@+0CP@fe~0@x&%VAHK+18vY`*_ZR$!nutWU#Y8y2EU4w-<6+>uw8H
z@~u;bP
z@VE8bl?64Uhx7lFWSx4$ZGu{kBVc1_8Cd!=NTeW3JxyQ*yd
n=(}YpNuz(BQ<`Km%U9a_%Wt>um2a@c!L&*1jNd&RAI$t8@34tP

diff --git a/po-libgimp/eu.po b/po-libgimp/eu.po
index 25f302a441..0205246a60 100644
--- a/po-libgimp/eu.po
+++ b/po-libgimp/eu.po
@@ -1,23 +1,26 @@
+# translation of eu3.po to Basque
 # translation of eu.po to Basque
 # translation of gimp-libgimp.HEAD.po to basque
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Hizkuntza Politikarako Sailburuordetza , 2004.
-# Iñaki Larrañaga Murgoitio , 2004.
+# Iñaki Larrañaga Murgoitio , 2004, 2006.
+# Iñaki Larrañaga Murgoitio , 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-08 12:28+0200\n"
-"PO-Revision-Date: 2004-04-06 17:16+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio \n"
+"POT-Creation-Date: 2006-04-20 16:17+0000\n"
+"PO-Revision-Date: 2006-04-20 16:25+0000\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.0.2\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
 
 #: ../libgimp/gimpbrushmenu.c:129
 msgid "Brush Selection"
@@ -40,8 +43,7 @@ msgstr "Batu ikusgai dauden geruzak"
 #: ../libgimp/gimpexport.c:224
 #, c-format
 msgid "%s can't handle layer offsets, size or opacity"
-msgstr ""
-"%s(e)k ezin ditu geruzen desplazamenduak, tamaina edo opakutasuna kudeatu"
+msgstr "%s(e)k ezin ditu geruzen desplazamenduak, tamaina edo opakutasuna kudeatu"
 
 #: ../libgimp/gimpexport.c:233 ../libgimp/gimpexport.c:242
 #, c-format
@@ -74,12 +76,12 @@ msgstr "Aplikatu geruza-maskarak"
 #: ../libgimp/gimpexport.c:278
 #, c-format
 msgid "%s can only handle RGB images"
-msgstr "%s(e)k RGB irudiak bakarrik kudea ditzake"
+msgstr "%s(e)k GBU irudiak bakarrik kudea ditzake"
 
 #: ../libgimp/gimpexport.c:279 ../libgimp/gimpexport.c:317
 #: ../libgimp/gimpexport.c:326
 msgid "Convert to RGB"
-msgstr "Bihurtu RGB"
+msgstr "Bihurtu GBU"
 
 #: ../libgimp/gimpexport.c:287
 #, c-format
@@ -121,12 +123,12 @@ msgstr ""
 #: ../libgimp/gimpexport.c:316
 #, c-format
 msgid "%s can only handle RGB or grayscale images"
-msgstr "%s(e)k RGB edo gris-eskalako irudiak bakarrik kudea ditzake"
+msgstr "%s(e)k GBU edo gris-eskalako irudiak bakarrik kudea ditzake"
 
 #: ../libgimp/gimpexport.c:325
 #, c-format
 msgid "%s can only handle RGB or indexed images"
-msgstr "%s(e)k RGB edo indexatutako irudiak bakarrik kudea ditzake"
+msgstr "%s(e)k GBU edo indexatutako irudiak bakarrik kudea ditzake"
 
 #: ../libgimp/gimpexport.c:335
 #, c-format
@@ -205,12 +207,11 @@ msgstr "Gradientearen hautapena"
 
 #: ../libgimp/gimpmenu.c:406 ../libgimpwidgets/gimpintstore.c:167
 msgid "(Empty)"
-msgstr ""
+msgstr "(Hutsa)"
 
 #: ../libgimp/gimppalettemenu.c:91
-#, fuzzy
 msgid "Palette Selection"
-msgstr "Ereduaren hautapena"
+msgstr "Paletaren hautapena"
 
 #: ../libgimp/gimppatternmenu.c:113
 msgid "Pattern Selection"
@@ -222,73 +223,71 @@ msgstr "ehunekoa"
 
 #: ../libgimpbase/gimpbaseenums.c:23
 msgid "Small"
-msgstr ""
+msgstr "Txikia"
 
 #: ../libgimpbase/gimpbaseenums.c:24
 msgid "Medium"
-msgstr ""
+msgstr "Tartekoa"
 
 #: ../libgimpbase/gimpbaseenums.c:25
 msgid "Large"
-msgstr ""
+msgstr "Handia"
 
 #: ../libgimpbase/gimpbaseenums.c:57
 msgid "Light Checks"
-msgstr ""
+msgstr "Koadrikula argiak"
 
 #: ../libgimpbase/gimpbaseenums.c:58
 msgid "Mid-Tone Checks"
-msgstr ""
+msgstr "Tarteko tonodun koadrikulak"
 
 #: ../libgimpbase/gimpbaseenums.c:59
 msgid "Dark Checks"
-msgstr ""
+msgstr "Koadrikula ilunak"
 
 #: ../libgimpbase/gimpbaseenums.c:60
 msgid "White Only"
-msgstr ""
+msgstr "Zuria soilik"
 
 #: ../libgimpbase/gimpbaseenums.c:61
 msgid "Gray Only"
-msgstr ""
+msgstr "Grisa soilik"
 
 #: ../libgimpbase/gimpbaseenums.c:62
-#, fuzzy
 msgid "Black Only"
-msgstr "Beltza"
+msgstr "Beltza soilik"
 
 #: ../libgimpbase/gimpbaseenums.c:91
 msgid "RGB color"
-msgstr ""
+msgstr "GBU kolorea"
 
 #: ../libgimpbase/gimpbaseenums.c:92 ../libgimpbase/gimpbaseenums.c:127
-#, fuzzy
 msgid "Grayscale"
-msgstr "Bihurtu gris-eskalara "
+msgstr "Gris-eskala"
 
 #: ../libgimpbase/gimpbaseenums.c:93
 msgid "Indexed color"
-msgstr ""
+msgstr "Kolore indexatua"
 
 #: ../libgimpbase/gimpbaseenums.c:125
 msgid "RGB"
-msgstr ""
+msgstr "GBU"
 
 #: ../libgimpbase/gimpbaseenums.c:126
 msgid "RGB-alpha"
-msgstr ""
+msgstr "GBU alfa"
 
 #: ../libgimpbase/gimpbaseenums.c:128
 msgid "Grayscale-alpha"
-msgstr ""
+msgstr "Gris-eskala alfa"
 
 #: ../libgimpbase/gimpbaseenums.c:129
 msgid "Indexed"
-msgstr ""
+msgstr "Indexatua"
 
 #: ../libgimpbase/gimpbaseenums.c:130
 msgid "Indexed-alpha"
-msgstr ""
+msgstr "Indexatua alfa"
 
 #: ../libgimpbase/gimpmemsize.c:177
 #, c-format
@@ -383,6 +382,8 @@ msgid ""
 "Cannot determine a valid home directory.\n"
 "Thumbnails will be stored in the folder for temporary files (%s) instead."
 msgstr ""
+"Ezin da baliozko etxeko direktorioa zehaztu.\n"
+"Koadro txikiak aldi baterako fitxategian (%s) gordeko dira."
 
 #: ../libgimpthumb/gimpthumb-utils.c:249 ../libgimpthumb/gimpthumb-utils.c:317
 #, c-format
@@ -390,29 +391,25 @@ msgid "Failed to create thumbnail folder '%s'."
 msgstr "Huts egin du koadro txikien '%s' karpeta sortzean."
 
 #: ../libgimpthumb/gimpthumbnail.c:919
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create thumbnail for %s: %s"
-msgstr "Huts egin du koadro txikien '%s' karpeta sortzean."
+msgstr "Ezin izan da '%s'(r)en koadro txikia sortu: %s"
 
 #: ../libgimpwidgets/gimpcolorbutton.c:99
-#, fuzzy
 msgid "_Foreground Color"
-msgstr "/_Aurreko planoaren kolorea"
+msgstr "_Aurreko planoaren kolorea"
 
 #: ../libgimpwidgets/gimpcolorbutton.c:103
-#, fuzzy
 msgid "_Background Color"
-msgstr "/_Atzeko planoaren kolorea"
+msgstr "_Atzeko planoaren kolorea"
 
 #: ../libgimpwidgets/gimpcolorbutton.c:107
-#, fuzzy
 msgid "Blac_k"
-msgstr "/_Beltza"
+msgstr "_Beltza"
 
 #: ../libgimpwidgets/gimpcolorbutton.c:111
-#, fuzzy
 msgid "_White"
-msgstr "/_Zuria"
+msgstr "_Zuria"
 
 #: ../libgimpwidgets/gimpcolorscales.c:133
 msgid "Scales"
@@ -489,13 +486,12 @@ msgid "Alpha"
 msgstr "Alfa"
 
 #: ../libgimpwidgets/gimpcolorscales.c:243
-#, fuzzy
 msgid "Hexadecimal color notation as used in HTML and CSS"
-msgstr "Kolore hamaseitarraren notazioa HTMLn bezala"
+msgstr "Kolore hamaseitarraren notazioa HTMLn eta CCSn bezala"
 
 #: ../libgimpwidgets/gimpcolorscales.c:248
 msgid "HTML _Notation:"
-msgstr ""
+msgstr "HTML _notazioa:"
 
 #: ../libgimpwidgets/gimpcolorselection.c:203
 msgid "Current:"
@@ -514,17 +510,14 @@ msgid "Select File"
 msgstr "Hautatu fitxategia"
 
 #: ../libgimpwidgets/gimpmemsizeentry.c:232
-#, fuzzy
 msgid "Kilobytes"
 msgstr "KiloByte"
 
 #: ../libgimpwidgets/gimpmemsizeentry.c:233
-#, fuzzy
 msgid "Megabytes"
 msgstr "MegaByte"
 
 #: ../libgimpwidgets/gimpmemsizeentry.c:234
-#, fuzzy
 msgid "Gigabytes"
 msgstr "GigaByte"
 
@@ -546,17 +539,16 @@ msgstr ""
 
 #: ../libgimpwidgets/gimppreviewarea.c:126
 msgid "Check Size"
-msgstr ""
+msgstr "Egiaztatu tamaina"
 
 #: ../libgimpwidgets/gimppreviewarea.c:133
 msgid "Check Style"
-msgstr ""
+msgstr "Egiaztatu estiloa"
 
 #. toggle button to (des)activate the instant preview
 #: ../libgimpwidgets/gimppreview.c:240
-#, fuzzy
 msgid "_Preview"
-msgstr "Aurrebista"
+msgstr "_Aurrebista"
 
 #: ../libgimpwidgets/gimpstock.c:113
 msgid "Anchor"
@@ -564,7 +556,7 @@ msgstr "Ainguratu"
 
 #: ../libgimpwidgets/gimpstock.c:114
 msgid "C_enter"
-msgstr ""
+msgstr "_Erdia"
 
 #: ../libgimpwidgets/gimpstock.c:115
 msgid "_Duplicate"
@@ -596,7 +588,7 @@ msgstr "Ikusgai"
 
 #: ../libgimpwidgets/gimpstock.c:154 ../libgimpwidgets/gimpstock.c:158
 msgid "_Stroke"
-msgstr ""
+msgstr "_Trazua"
 
 #: ../libgimpwidgets/gimpstock.c:170
 msgid "L_etter Spacing"
@@ -680,8 +672,7 @@ msgstr "Tritanopia (urdinarekiko sentikortasunik ez)"
 
 #: ../modules/cdisplay_colorblind.c:153
 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
-msgstr ""
-"Kolorearen defizita simulatzeko iragazkia (Brettel-Vienot-Mollon algoritmoa)"
+msgstr "Kolorearen defizita simulatzeko iragazkia (Brettel-Vienot-Mollon algoritmoa)"
 
 #: ../modules/cdisplay_colorblind.c:242
 msgid "Color Deficient Vision"
@@ -792,13 +783,12 @@ msgid "Black"
 msgstr "Beltza"
 
 #: ../modules/colorsel_cmyk.c:191
-#, fuzzy
 msgid "Black _Pullout:"
-msgstr "Beltza (%):"
+msgstr "Beltz-ge_higarria:"
 
 #: ../modules/colorsel_cmyk.c:208
 msgid "The percentage of black to pull out of the colored inks."
-msgstr ""
+msgstr "Beltzaren ehunekoa koloredun tintetatik ateratzeko."
 
 #: ../modules/colorsel_triangle.c:104
 msgid "Painter-style triangle color selector"
@@ -820,25 +810,3 @@ msgstr "Akuarela"
 msgid "Pressure"
 msgstr "Presioa"
 
-#~ msgid "He_x Triplet:"
-#~ msgstr "Hirukote ha_maseitarra:"
-
-#~ msgid "None"
-#~ msgstr "Bat ere ez"
-
-#~ msgid ""
-#~ "No %s in gimprc:\n"
-#~ "You need to add an entry like\n"
-#~ "(%s \"%s\")\n"
-#~ "to your %s file."
-#~ msgstr ""
-#~ "Ez dago %s gimprc-en:\n"
-#~ "(%s \"%s\") bezalako elementu bat\n"
-#~ "gehitu behar duzu\n"
-#~ "%s fitxategian."
-
-#~ msgid "Parameter Settings"
-#~ msgstr "Parametroaren ezarpenak"
-
-#~ msgid "None (normal vision)"
-#~ msgstr "Bat ere ez (ikusmen normala)"
diff --git a/po-plug-ins/ChangeLog b/po-plug-ins/ChangeLog
index a35295b042..703495183c 100644
--- a/po-plug-ins/ChangeLog
+++ b/po-plug-ins/ChangeLog
@@ -1,3 +1,27 @@
+2006-06-09  Jakub Friedl  
+
+	* cs.po: Updated Czech translation.
+
+2006-05-26  Jakub Friedl  
+
+	* cs.po: Fixed bad Czech strings.
+
+2006-04-24  Francisco Javier F. Serrador  
+
+	* es.po: Updated Spanish translation.
+
+2006-04-21  Hendrik Richter  
+
+	* de.po: Updated German translation (#304298).
+
+2006-04-20  Inaki Larranaga  
+
+	* eu.po: Updated Basque translation.
+
+2006-04-19  Jakub Friedl  
+
+	* cs.po: Fixed an ugly typo in a string.
+
 2006-01-10  Alexander Shopov  
 
 	* bg.po: Updated Bulgarian translation by
diff --git a/po-plug-ins/cs.gmo b/po-plug-ins/cs.gmo
index 63987c0c52952e62c737ef3b94898959160e7403..f49257d256f1ada464817ab10350ab8cb993d821 100644
GIT binary patch
delta 57080
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
HzqtMfu~I}g

delta 56903
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
CB{i@B

diff --git a/po-plug-ins/cs.po b/po-plug-ins/cs.po
index c2a92f6b2d..f6e38c0b2e 100644
--- a/po-plug-ins/cs.po
+++ b/po-plug-ins/cs.po
@@ -1,22 +1,25 @@
+# translation of cs.po to
 # Czech translation of GIMP plugins
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
 # Copyright (C) 2003, 2004, 2005 Miloslav Trmac 
 # Stanislav Brabec , 1999-2001.
 # Michal Bukovjan , 2002, 2003.
 # Miloslav Trmac , 2003, 2004, 2005.
-# Jakub Friedl , 2005.
+# Jakub Friedl , 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-08 12:28+0200\n"
-"PO-Revision-Date: 2005-04-27 14:05+0200\n"
+"POT-Creation-Date: 2006-06-09 12:34+0200\n"
+"PO-Revision-Date: 2006-06-09 12:35+0200\n"
 "Last-Translator: Jakub Friedl \n"
 "Language-Team:  \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:523
 #: ../plug-ins/gfig/gfig-dialog.c:283 ../plug-ins/gflare/gflare.c:891
@@ -233,7 +236,7 @@ msgstr "Hustota barvy"
 #. to figure out which button the user pushed, etc.
 #. Not my design, please don't blame me -- njl
 #: ../plug-ins/FractalExplorer/Dialogs.c:928 ../plug-ins/common/compose.c:128
-#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:217
+#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:228
 msgid "Red:"
 msgstr "Červená:"
 
@@ -242,7 +245,7 @@ msgid "Change the intensity of the red channel"
 msgstr "Změna intenzity červeného kanálu"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:938 ../plug-ins/common/compose.c:129
-#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:218
+#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:229
 msgid "Green:"
 msgstr "Zelená:"
 
@@ -251,7 +254,7 @@ msgid "Change the intensity of the green channel"
 msgstr "Změna intenzity zeleného kanálu"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:948 ../plug-ins/common/compose.c:130
-#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:219
+#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:230
 msgid "Blue:"
 msgstr "Modrá:"
 
@@ -327,8 +330,7 @@ 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"
 
 #. Greenmode radio frame
 #: ../plug-ins/FractalExplorer/Dialogs.c:1007
@@ -380,19 +382,19 @@ msgstr "_Fraktály"
 #: ../plug-ins/common/CEL.c:577 ../plug-ins/common/CML_explorer.c:2001
 #: ../plug-ins/common/channel_mixer.c:1044 ../plug-ins/common/compressor.c:404
 #: ../plug-ins/common/compressor.c:535 ../plug-ins/common/curve_bend.c:861
-#: ../plug-ins/common/dicom.c:647 ../plug-ins/common/gbr.c:586
+#: ../plug-ins/common/dicom.c:687 ../plug-ins/common/gbr.c:586
 #: ../plug-ins/common/gif.c:994 ../plug-ins/common/gih.c:1254
-#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1498
+#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1499
 #: ../plug-ins/common/mng.c:558 ../plug-ins/common/mng.c:946
 #: ../plug-ins/common/pat.c:433 ../plug-ins/common/pcx.c:585
-#: ../plug-ins/common/pix.c:515 ../plug-ins/common/png.c:1178
+#: ../plug-ins/common/pix.c:515 ../plug-ins/common/png.c:1182
 #: ../plug-ins/common/pnm.c:809 ../plug-ins/common/postscript.c:1123
-#: ../plug-ins/common/psd_save.c:1336 ../plug-ins/common/raw.c:517
+#: ../plug-ins/common/psd_save.c:1378 ../plug-ins/common/raw.c:517
 #: ../plug-ins/common/raw.c:544 ../plug-ins/common/spheredesigner.c:2088
 #: ../plug-ins/common/sunras.c:513 ../plug-ins/common/tga.c:1030
 #: ../plug-ins/common/tiff.c:1825 ../plug-ins/common/xbm.c:996
 #: ../plug-ins/common/xwd.c:577 ../plug-ins/fits/fits.c:450
-#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:783
+#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:788
 #: ../plug-ins/gfli/gfli.c:715 ../plug-ins/ifscompose/ifscompose.c:2395
 #: ../plug-ins/winicon/icosave.c:243 ../plug-ins/xjt/xjt.c:1263
 #: ../plug-ins/xjt/xjt.c:1702
@@ -421,15 +423,15 @@ msgstr "Zapsat parametry fraktálu"
 #: ../plug-ins/common/channel_mixer.c:966 ../plug-ins/common/curve_bend.c:913
 #: ../plug-ins/common/dicom.c:290 ../plug-ins/common/gbr.c:327
 #: ../plug-ins/common/gifload.c:296 ../plug-ins/common/gih.c:648
-#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2607
+#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2612
 #: ../plug-ins/common/mng.c:1117 ../plug-ins/common/pat.c:300
 #: ../plug-ins/common/pcx.c:302 ../plug-ins/common/pix.c:332
 #: ../plug-ins/common/png.c:674 ../plug-ins/common/pnm.c:432
-#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1759
+#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1780
 #: ../plug-ins/common/psp.c:1457 ../plug-ins/common/raw.c:230
 #: ../plug-ins/common/raw.c:635 ../plug-ins/common/spheredesigner.c:1990
-#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:311
-#: ../plug-ins/common/svg.c:694 ../plug-ins/common/tga.c:415
+#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:312
+#: ../plug-ins/common/svg.c:712 ../plug-ins/common/tga.c:415
 #: ../plug-ins/common/tiff.c:510 ../plug-ins/common/xbm.c:719
 #: ../plug-ins/common/xwd.c:422 ../plug-ins/faxg3/faxg3.c:220
 #: ../plug-ins/fits/fits.c:337 ../plug-ins/flame/flame.c:412
@@ -539,8 +541,7 @@ msgstr "P_růhledné pozadí"
 
 #: ../plug-ins/Lighting/lighting_ui.c:279
 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:282
 msgid "Cre_ate new image"
@@ -985,7 +986,7 @@ msgstr "_Hloubka:"
 msgid "Antialiasing quality. Higher is better, but slower"
 msgstr "Kvalita vyhlazování. Vyšší je lepší, ale pomalejší"
 
-#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:691
+#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:692
 #: ../plug-ins/common/wind.c:993 ../plug-ins/imagemap/imap_preferences.c:539
 msgid "_Threshold:"
 msgstr "Prá_h:"
@@ -1212,7 +1213,7 @@ msgstr "Špatná barevná mapa"
 #: ../plug-ins/common/jpeg.c:953 ../plug-ins/common/pat.c:305
 #: ../plug-ins/common/pcx.c:307 ../plug-ins/common/pix.c:338
 #: ../plug-ins/common/png.c:681 ../plug-ins/common/pnm.c:437
-#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1764
+#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1785
 #: ../plug-ins/common/raw.c:640 ../plug-ins/common/sunras.c:436
 #: ../plug-ins/common/tga.c:420 ../plug-ins/common/tiff.c:515
 #: ../plug-ins/common/wmf.c:952 ../plug-ins/common/xbm.c:724
@@ -1250,12 +1251,12 @@ msgstr "Neznámý nebo neplatný formát komprese BMP."
 #: ../plug-ins/bmp/bmpread.c:490 ../plug-ins/common/CEL.c:357
 #: ../plug-ins/common/CEL.c:360 ../plug-ins/common/blinds.c:273
 #: ../plug-ins/common/compose.c:625 ../plug-ins/common/decompose.c:595
-#: ../plug-ins/common/dicom.c:442 ../plug-ins/common/film.c:946
+#: ../plug-ins/common/dicom.c:482 ../plug-ins/common/film.c:946
 #: ../plug-ins/common/gifload.c:864 ../plug-ins/common/jpeg.c:1113
-#: ../plug-ins/common/jpeg.c:2474 ../plug-ins/common/pcx.c:334
+#: ../plug-ins/common/jpeg.c:2479 ../plug-ins/common/pcx.c:334
 #: ../plug-ins/common/pcx.c:340 ../plug-ins/common/pix.c:374
 #: ../plug-ins/common/png.c:808 ../plug-ins/common/pnm.c:517
-#: ../plug-ins/common/psd.c:2174 ../plug-ins/common/raw.c:677
+#: ../plug-ins/common/psd.c:2204 ../plug-ins/common/raw.c:677
 #: ../plug-ins/common/smooth_palette.c:257 ../plug-ins/common/sunras.c:925
 #: ../plug-ins/common/tga.c:929 ../plug-ins/common/tiff.c:848
 #: ../plug-ins/common/tile.c:266 ../plug-ins/common/winclipboard.c:579
@@ -1266,12 +1267,12 @@ msgstr "Neznámý nebo neplatný formát komprese BMP."
 msgid "Background"
 msgstr "Pozadí"
 
-#: ../plug-ins/bmp/bmpwrite.c:136 ../plug-ins/common/dicom.c:617
+#: ../plug-ins/bmp/bmpwrite.c:136 ../plug-ins/common/dicom.c:657
 #: ../plug-ins/common/pcx.c:579
 msgid "Cannot save images with alpha channel."
 msgstr "Nemohu uložit obrázky s alfa kanálem."
 
-#: ../plug-ins/bmp/bmpwrite.c:182 ../plug-ins/common/dicom.c:632
+#: ../plug-ins/bmp/bmpwrite.c:182 ../plug-ins/common/dicom.c:672
 #: ../plug-ins/common/postscript.c:1114 ../plug-ins/common/xwd.c:568
 #: ../plug-ins/fits/fits.c:441 ../plug-ins/xjt/xjt.c:1677
 msgid "Cannot operate on unknown image types."
@@ -1283,10 +1284,10 @@ msgstr "Nemohu pracovat s neznámými typy obrázků."
 #: ../plug-ins/bmp/bmpwrite.c:209 ../plug-ins/common/CEL.c:582
 #: ../plug-ins/common/gbr.c:591 ../plug-ins/common/gif.c:1001
 #: ../plug-ins/common/gih.c:1259 ../plug-ins/common/gtm.c:245
-#: ../plug-ins/common/jpeg.c:1453 ../plug-ins/common/pat.c:438
+#: ../plug-ins/common/jpeg.c:1454 ../plug-ins/common/pat.c:438
 #: ../plug-ins/common/pcx.c:545 ../plug-ins/common/pix.c:521
-#: ../plug-ins/common/png.c:1185 ../plug-ins/common/pnm.c:814
-#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1341
+#: ../plug-ins/common/png.c:1189 ../plug-ins/common/pnm.c:814
+#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1383
 #: ../plug-ins/common/sunras.c:518 ../plug-ins/common/tga.c:1035
 #: ../plug-ins/common/tiff.c:1830 ../plug-ins/common/xbm.c:1001
 #: ../plug-ins/common/xpm.c:628 ../plug-ins/common/xwd.c:582
@@ -1297,11 +1298,11 @@ msgstr "Nemohu pracovat s neznámými typy obrázků."
 msgid "Saving '%s'..."
 msgstr "Ukládám '%s' ..."
 
-#: ../plug-ins/bmp/bmpwrite.c:554
+#: ../plug-ins/bmp/bmpwrite.c:556
 msgid "Save as BMP"
 msgstr "Zapsat jako BMP"
 
-#: ../plug-ins/bmp/bmpwrite.c:568
+#: ../plug-ins/bmp/bmpwrite.c:570
 msgid "_RLE encoded"
 msgstr "_RLE kódované"
 
@@ -1627,7 +1628,7 @@ msgid "Hue"
 msgstr "Odstín"
 
 #: ../plug-ins/common/CML_explorer.c:303 ../plug-ins/common/CML_explorer.c:311
-#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:548
+#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:559
 msgid "Saturation"
 msgstr "Sytost"
 
@@ -1666,7 +1667,7 @@ msgstr "Upravit hnízdo"
 msgid "Random seed"
 msgstr "Náhodné hnízdo"
 
-#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:655
+#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:699
 #: ../plug-ins/common/lic.c:669
 msgid "_Hue"
 msgstr "_Odstín"
@@ -1675,7 +1676,7 @@ msgstr "_Odstín"
 msgid "Sat_uration"
 msgstr "S_ytost"
 
-#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:663
+#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:707
 msgid "_Value"
 msgstr "_Jas:"
 
@@ -1872,8 +1873,7 @@ msgstr "Varování: '%s' je soubor ve starém formátu."
 #: ../plug-ins/common/CML_explorer.c:2248
 #, c-format
 msgid "Warning: '%s' is a parameter file for newer CML_explorer than me."
-msgstr ""
-"Varování: '%s' je soubor parametrů pro novější CML badatel, než jsem já."
+msgstr "Varování: '%s' je soubor parametrů pro novější CML badatel, než jsem já."
 
 #: ../plug-ins/common/CML_explorer.c:2311
 msgid "Error: failed to load parameters"
@@ -2003,7 +2003,7 @@ msgstr "Převinout"
 msgid "Step"
 msgstr "Krok"
 
-#: ../plug-ins/common/animationplay.c:1138
+#: ../plug-ins/common/animationplay.c:1127
 #, c-format
 msgid "Frame %d of %d"
 msgstr "Políčko %d z %d"
@@ -2144,7 +2144,7 @@ msgstr "Počet segme_ntů:"
 msgid "_Blur"
 msgstr "_Rozostřit"
 
-#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:432
+#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:433
 msgid "Blurring..."
 msgstr "Rozostřuji..."
 
@@ -2223,8 +2223,7 @@ 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/bumpmap.c:1007 ../plug-ins/common/postscript.c:3155
 msgid "_Y offset:"
@@ -2473,13 +2472,13 @@ msgid "HSV"
 msgstr "HSV"
 
 #. Gray: Circle: Spinbutton 1
-#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:459
+#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:470
 msgid "Hue:"
 msgstr "Odstín:"
 
 #. Gray: Circle: Spinbutton 2
 #: ../plug-ins/common/compose.c:149 ../plug-ins/print/gimp_color_window.c:364
-#: ../plug-ins/rcm/rcm_dialog.c:486
+#: ../plug-ins/rcm/rcm_dialog.c:497
 msgid "Saturation:"
 msgstr "Sytost:"
 
@@ -2492,17 +2491,17 @@ msgid "CMY"
 msgstr "CMY"
 
 #: ../plug-ins/common/compose.c:155 ../plug-ins/common/compose.c:162
-#: ../plug-ins/common/fp.c:220 ../plug-ins/print/gimp_color_window.c:307
+#: ../plug-ins/common/fp.c:231 ../plug-ins/print/gimp_color_window.c:307
 msgid "Cyan:"
 msgstr "Azurová:"
 
 #: ../plug-ins/common/compose.c:156 ../plug-ins/common/compose.c:163
-#: ../plug-ins/common/fp.c:222 ../plug-ins/print/gimp_color_window.c:326
+#: ../plug-ins/common/fp.c:233 ../plug-ins/print/gimp_color_window.c:326
 msgid "Magenta:"
 msgstr "Purpurová:"
 
 #: ../plug-ins/common/compose.c:157 ../plug-ins/common/compose.c:164
-#: ../plug-ins/common/fp.c:221 ../plug-ins/print/gimp_color_window.c:345
+#: ../plug-ins/common/fp.c:232 ../plug-ins/print/gimp_color_window.c:345
 msgid "Yellow:"
 msgstr "Žlutá:"
 
@@ -2627,8 +2626,7 @@ msgstr "Žádná rozumná přípona, ukládám jako gzipovaný XCF."
 
 #: ../plug-ins/common/compressor.c:508
 msgid "No sensible extension, attempting to load with file magic."
-msgstr ""
-"Žádná rozumná přípona, pokouším se načíst pomocí souborů magických čísel."
+msgstr "Žádná rozumná přípona, pokouším se načíst pomocí souborů magických čísel."
 
 #: ../plug-ins/common/convmatrix.c:87
 msgid "Gr_ey"
@@ -2840,7 +2838,7 @@ msgid "Smoo_thing"
 msgstr "_Vyhlazování"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:823
+#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:821
 #: ../plug-ins/common/mosaic.c:535 ../plug-ins/common/ripple.c:510
 msgid "_Antialiasing"
 msgstr "_Vyhlazování"
@@ -3173,7 +3171,7 @@ msgstr "_Rekurzivní"
 
 #: ../plug-ins/common/despeckle.c:494 ../plug-ins/common/neon.c:727
 #: ../plug-ins/common/nlfilt.c:1083 ../plug-ins/common/nova.c:359
-#: ../plug-ins/common/unsharp.c:665 ../plug-ins/common/whirlpinch.c:588
+#: ../plug-ins/common/unsharp.c:666 ../plug-ins/common/whirlpinch.c:588
 #: ../plug-ins/gflare/gflare.c:2686 ../plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
 msgstr "_Poloměr:"
@@ -3480,7 +3478,7 @@ msgid "Composing Images..."
 msgstr "Spojuji obrázky..."
 
 #: ../plug-ins/common/film.c:438 ../plug-ins/common/guillotine.c:183
-#: ../plug-ins/helpbrowser/dialog.c:525
+#: ../plug-ins/helpbrowser/dialog.c:534
 msgid "Untitled"
 msgstr "Bez názvu"
 
@@ -3499,7 +3497,7 @@ msgstr "Na filmu:"
 
 #. Create selection
 #: ../plug-ins/common/film.c:1166 ../plug-ins/imagemap/imap_selection.c:400
-#: ../plug-ins/rcm/rcm_dialog.c:165
+#: ../plug-ins/rcm/rcm_dialog.c:176
 msgid "Selection"
 msgstr "Výběr"
 
@@ -3610,147 +3608,151 @@ msgstr "Střed efektu odlesku"
 msgid "_Show cursor"
 msgstr "_Zobrazit kurzor"
 
-#: ../plug-ins/common/fp.c:224
+#: ../plug-ins/common/fp.c:235
 msgid "Darker:"
 msgstr "Tmavší:"
 
-#: ../plug-ins/common/fp.c:225
+#: ../plug-ins/common/fp.c:236
 msgid "Lighter:"
 msgstr "Světlejší:"
 
-#: ../plug-ins/common/fp.c:227
+#: ../plug-ins/common/fp.c:238
 msgid "More Sat:"
 msgstr "Sytější:"
 
-#: ../plug-ins/common/fp.c:228
+#: ../plug-ins/common/fp.c:239
 msgid "Less Sat:"
 msgstr "Méně syté:"
 
-#: ../plug-ins/common/fp.c:230 ../plug-ins/common/fp.c:488
+#: ../plug-ins/common/fp.c:241 ../plug-ins/common/fp.c:532
 msgid "Current:"
 msgstr "Aktuální:"
 
-#: ../plug-ins/common/fp.c:321
+#: ../plug-ins/common/fp.c:330
 msgid "_Filter Pack..."
 msgstr "_Sada filtrů..."
 
-#: ../plug-ins/common/fp.c:361
-msgid "Convert the image to RGB first!"
-msgstr "Převeďte nejdříve obrázek do RGB!"
+#: ../plug-ins/common/fp.c:376
+msgid "FP can only be used on RGB images."
+msgstr "SF lze použít jen na obrázky v RGB."
 
-#: ../plug-ins/common/fp.c:366
-msgid "Applying the Filter Pack..."
-msgstr "Probíhá užití sady filtrů..."
+#: ../plug-ins/common/fp.c:386
+msgid "FP can only be run interactively."
+msgstr "SF lze spustit jen interaktivně."
 
-#: ../plug-ins/common/fp.c:480
+#: ../plug-ins/common/fp.c:404
+msgid "Applying Filter Pack..."
+msgstr "Aplikuje se Sada filtrů..."
+
+#: ../plug-ins/common/fp.c:524
 msgid "Original:"
 msgstr "Původní:"
 
-#: ../plug-ins/common/fp.c:532
+#: ../plug-ins/common/fp.c:576
 msgid "Hue Variations"
 msgstr "Změny odstínu"
 
-#: ../plug-ins/common/fp.c:586
+#: ../plug-ins/common/fp.c:630
 msgid "Roughness"
 msgstr "Výraznost"
 
-#: ../plug-ins/common/fp.c:629
+#: ../plug-ins/common/fp.c:673
 msgid "Affected Range"
 msgstr "Dotčený rozsah"
 
-#: ../plug-ins/common/fp.c:633
+#: ../plug-ins/common/fp.c:677
 msgid "Sha_dows"
 msgstr "S_tíny"
 
-#: ../plug-ins/common/fp.c:634
+#: ../plug-ins/common/fp.c:678
 msgid "_Midtones"
 msgstr "_Střední tóny"
 
-#: ../plug-ins/common/fp.c:635
+#: ../plug-ins/common/fp.c:679
 msgid "H_ighlights"
 msgstr "S_větla"
 
-#: ../plug-ins/common/fp.c:649
+#: ../plug-ins/common/fp.c:693
 msgid "Windows"
 msgstr "Okna"
 
-#: ../plug-ins/common/fp.c:659 ../plug-ins/common/lic.c:670
+#: ../plug-ins/common/fp.c:703 ../plug-ins/common/lic.c:670
 msgid "_Saturation"
 msgstr "_Sytost:"
 
-#: ../plug-ins/common/fp.c:667
+#: ../plug-ins/common/fp.c:711
 msgid "A_dvanced"
 msgstr "_Rozšířené"
 
-#: ../plug-ins/common/fp.c:687
+#: ../plug-ins/common/fp.c:731
 msgid "Value Variations"
 msgstr "Změny jasu"
 
-#: ../plug-ins/common/fp.c:731
+#: ../plug-ins/common/fp.c:775
 msgid "Saturation Variations"
 msgstr "Změny sytosti"
 
-#: ../plug-ins/common/fp.c:783
+#: ../plug-ins/common/fp.c:827
 msgid "Select Pixels by"
 msgstr "Kritérium volby pixelů"
 
-#: ../plug-ins/common/fp.c:788
+#: ../plug-ins/common/fp.c:832
 msgid "H_ue"
 msgstr "O_dstín:"
 
-#: ../plug-ins/common/fp.c:789
+#: ../plug-ins/common/fp.c:833
 msgid "Satu_ration"
 msgstr "S_ytost"
 
-#: ../plug-ins/common/fp.c:790
+#: ../plug-ins/common/fp.c:834
 msgid "V_alue"
 msgstr "J_as"
 
-#: ../plug-ins/common/fp.c:816
+#: ../plug-ins/common/fp.c:860
 msgid "Show"
 msgstr "Ukázat"
 
-#: ../plug-ins/common/fp.c:821
+#: ../plug-ins/common/fp.c:865
 msgid "_Entire Image"
 msgstr "_Celý obrázek"
 
-#: ../plug-ins/common/fp.c:822
+#: ../plug-ins/common/fp.c:866
 msgid "Se_lection Only"
 msgstr "Pouze _výběr"
 
-#: ../plug-ins/common/fp.c:823
+#: ../plug-ins/common/fp.c:867
 msgid "Selec_tion In Context"
 msgstr "Výběr v _kontextu"
 
-#: ../plug-ins/common/fp.c:1135
+#: ../plug-ins/common/fp.c:1182
 msgid "Filter Pack Simulation"
 msgstr "Simulace sady filtrů"
 
-#: ../plug-ins/common/fp.c:1245
+#: ../plug-ins/common/fp.c:1292
 msgid "Shadows:"
 msgstr "Stíny:"
 
-#: ../plug-ins/common/fp.c:1246
+#: ../plug-ins/common/fp.c:1293
 msgid "Midtones:"
 msgstr "Střední tóny:"
 
-#: ../plug-ins/common/fp.c:1247
+#: ../plug-ins/common/fp.c:1294
 msgid "Highlights:"
 msgstr "Světla:"
 
-#: ../plug-ins/common/fp.c:1259
+#: ../plug-ins/common/fp.c:1306
 msgid "Advanced Filter Pack Options"
 msgstr "Rozšířené nastavení sady filtrů"
 
-#: ../plug-ins/common/fp.c:1270
+#: ../plug-ins/common/fp.c:1317
 msgid "Smoothness of Aliasing"
 msgstr "Plynulost a schodovitost"
 
-#: ../plug-ins/common/fp.c:1370
+#: ../plug-ins/common/fp.c:1417
 msgid "Preview as You Drag"
 msgstr "Náhled při potáhnutí"
 
-#: ../plug-ins/common/fp.c:1374
+#: ../plug-ins/common/fp.c:1421
 msgid "Preview Size"
 msgstr "Velikost náhledu"
 
@@ -3866,7 +3868,7 @@ msgid "Save as Brush"
 msgstr "Zapsat jako stopu"
 
 #. attach labels
-#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:769
+#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:783
 msgid "Spacing:"
 msgstr "Rozestup:"
 
@@ -3907,8 +3909,7 @@ msgstr "HELE, LUPA"
 msgid ""
 "An obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / "
 "1998-2000"
-msgstr ""
-"Zastaralý výtvor Adama D. Mosse / adam@gimp.org / adam@foxbox.org / 1998-2000"
+msgstr "Zastaralý výtvor Adama D. Mosse / adam@gimp.org / adam@foxbox.org / 1998-2000"
 
 #: ../plug-ins/common/gif.c:402 ../plug-ins/common/gifload.c:143
 msgid "GIF image"
@@ -3927,8 +3928,7 @@ msgstr ""
 "nebyl uložen."
 
 #: ../plug-ins/common/gif.c:970
-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í."
@@ -4149,23 +4149,23 @@ msgstr "Šíř_ka dlaždice:"
 msgid "Tile _height:"
 msgstr "_Výška dlaždice:"
 
-#: ../plug-ins/common/gqbist.c:415
+#: ../plug-ins/common/gqbist.c:409
 msgid "_Qbist..."
 msgstr "_Qbist..."
 
-#: ../plug-ins/common/gqbist.c:514
+#: ../plug-ins/common/gqbist.c:510
 msgid "Qbist ..."
 msgstr "Qbist ..."
 
-#: ../plug-ins/common/gqbist.c:695
+#: ../plug-ins/common/gqbist.c:693
 msgid "Load QBE file"
 msgstr "Načíst soubor QBE..."
 
-#: ../plug-ins/common/gqbist.c:733
+#: ../plug-ins/common/gqbist.c:731
 msgid "Save (middle transform) as QBE file"
 msgstr "Uložit (střední převod) jako soubor QBE"
 
-#: ../plug-ins/common/gqbist.c:781
+#: ../plug-ins/common/gqbist.c:779
 msgid "G-Qbist"
 msgstr "G-Qbist"
 
@@ -4185,47 +4185,47 @@ msgstr "_Mřížka..."
 msgid "Drawing Grid..."
 msgstr "Kreslím mřížku..."
 
-#: ../plug-ins/common/grid.c:621 ../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:385 ../plug-ins/imagemap/imap_popup.c:153
 #: ../plug-ins/imagemap/imap_toolbar.c:163
 msgid "Grid"
 msgstr "Mřížka"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:696
+#: ../plug-ins/common/grid.c:710
 msgid "Horizontal"
 msgstr "Vodorovně"
 
-#: ../plug-ins/common/grid.c:698
+#: ../plug-ins/common/grid.c:712
 msgid "Vertical"
 msgstr "Svisle"
 
-#: ../plug-ins/common/grid.c:700
+#: ../plug-ins/common/grid.c:714
 msgid "Intersection"
 msgstr "Průnik"
 
 #. Width and Height
-#: ../plug-ins/common/grid.c:703 ../plug-ins/common/svg.c:761
+#: ../plug-ins/common/grid.c:717 ../plug-ins/common/svg.c:779
 #: ../plug-ins/common/wmf.c:548 ../plug-ins/print/gimp_main_window.c:992
 #: ../plug-ins/print/gimp_main_window.c:1199
 msgid "Width:"
 msgstr "Šířka:"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:836
+#: ../plug-ins/common/grid.c:850
 msgid "Offset:"
 msgstr "Posun:"
 
 #. attach color selectors
-#: ../plug-ins/common/grid.c:875
+#: ../plug-ins/common/grid.c:889
 msgid "Horizontal Color"
 msgstr "Vodorovná barva"
 
-#: ../plug-ins/common/grid.c:893
+#: ../plug-ins/common/grid.c:907
 msgid "Vertical Color"
 msgstr "Svislá barva"
 
-#: ../plug-ins/common/grid.c:911
+#: ../plug-ins/common/grid.c:925
 msgid "Intersection Color"
 msgstr "Barva průsečíků"
 
@@ -4608,89 +4608,89 @@ msgstr "JPEG náhled"
 msgid "File size: %02.01f kB"
 msgstr "Velikost souboru: %02.01f kB"
 
-#: ../plug-ins/common/jpeg.c:1861 ../plug-ins/common/jpeg.c:1961
+#: ../plug-ins/common/jpeg.c:1864 ../plug-ins/common/jpeg.c:1964
 msgid "File size: unknown"
 msgstr "Velikost souboru: neznámá"
 
-#: ../plug-ins/common/jpeg.c:1926
+#: ../plug-ins/common/jpeg.c:1929
 msgid "Save as JPEG"
 msgstr "Zapsat jako JPEG"
 
-#: ../plug-ins/common/jpeg.c:1947
+#: ../plug-ins/common/jpeg.c:1950
 msgid "_Quality:"
 msgstr "_Kvalita:"
 
-#: ../plug-ins/common/jpeg.c:1951
+#: ../plug-ins/common/jpeg.c:1954
 msgid "JPEG quality parameter"
 msgstr "Parametr kvality JPEG"
 
-#: ../plug-ins/common/jpeg.c:1970
+#: ../plug-ins/common/jpeg.c:1973
 msgid "Show _Preview in image window"
 msgstr "Zobrazit _náhled v okně obrázku"
 
-#: ../plug-ins/common/jpeg.c:1983
+#: ../plug-ins/common/jpeg.c:1986
 msgid "_Advanced Options"
 msgstr "_Pokročilá nastavení"
 
-#: ../plug-ins/common/jpeg.c:2011
+#: ../plug-ins/common/jpeg.c:2014
 msgid "_Smoothing:"
 msgstr "_Vyhlazování:"
 
-#: ../plug-ins/common/jpeg.c:2024
+#: ../plug-ins/common/jpeg.c:2027
 msgid "Frequency (rows):"
 msgstr "Frekvence (řádky):"
 
-#: ../plug-ins/common/jpeg.c:2038
+#: ../plug-ins/common/jpeg.c:2041
 msgid "Use restart markers"
 msgstr "Používat restartovací značky"
 
-#: ../plug-ins/common/jpeg.c:2053 ../plug-ins/xjt/xjt.c:860
+#: ../plug-ins/common/jpeg.c:2058 ../plug-ins/xjt/xjt.c:860
 msgid "Optimize"
 msgstr "Optimalizovat"
 
-#: ../plug-ins/common/jpeg.c:2067
+#: ../plug-ins/common/jpeg.c:2072
 msgid "Progressive"
 msgstr "Progresivní"
 
-#: ../plug-ins/common/jpeg.c:2086
+#: ../plug-ins/common/jpeg.c:2091
 msgid "Force baseline JPEG"
 msgstr "Vnutit základní JPEG"
 
-#: ../plug-ins/common/jpeg.c:2102
+#: ../plug-ins/common/jpeg.c:2107
 msgid "Save EXIF data"
 msgstr "Uložit data EXIF"
 
-#: ../plug-ins/common/jpeg.c:2119
+#: ../plug-ins/common/jpeg.c:2124
 msgid "Save thumbnail"
 msgstr "Uložit miniaturu"
 
 #. Subsampling
-#: ../plug-ins/common/jpeg.c:2136
+#: ../plug-ins/common/jpeg.c:2141
 msgid "Subsampling:"
 msgstr "Podvzorkování:"
 
 #. DCT method
-#: ../plug-ins/common/jpeg.c:2163
+#: ../plug-ins/common/jpeg.c:2168
 msgid "DCT method:"
 msgstr "Metoda DCT:"
 
-#: ../plug-ins/common/jpeg.c:2169
+#: ../plug-ins/common/jpeg.c:2174
 msgid "Fast Integer"
 msgstr "Rychlé celočíselné"
 
-#: ../plug-ins/common/jpeg.c:2170
+#: ../plug-ins/common/jpeg.c:2175
 msgid "Integer"
 msgstr "Celočíselné"
 
-#: ../plug-ins/common/jpeg.c:2171
+#: ../plug-ins/common/jpeg.c:2176
 msgid "Floating-Point"
 msgstr "V plovoucí řádové čárce"
 
-#: ../plug-ins/common/jpeg.c:2185
+#: ../plug-ins/common/jpeg.c:2190
 msgid "Comment"
 msgstr "Komentář"
 
-#: ../plug-ins/common/jpeg.c:2338
+#: ../plug-ins/common/jpeg.c:2343
 #, c-format
 msgid "Opening thumbnail for '%s'..."
 msgstr "Otevírám miniaturu pro '%s'..."
@@ -4939,10 +4939,9 @@ msgstr "Střed rozmáznutí"
 
 #. Inform the user that we couldn't losslessly save the
 #. * transparency & just use the full palette
-#: ../plug-ins/common/mng.c:495 ../plug-ins/common/png.c:1562
+#: ../plug-ins/common/mng.c:495 ../plug-ins/common/png.c:1571
 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/mng.c:1314
 msgid "Save as MNG"
@@ -5016,7 +5015,7 @@ msgstr "Implicitní dispozice políčka:"
 msgid "PNG compression level:"
 msgstr "Úroveň komprese PNG:"
 
-#: ../plug-ins/common/mng.c:1450 ../plug-ins/common/png.c:1703
+#: ../plug-ins/common/mng.c:1450 ../plug-ins/common/png.c:1712
 msgid "Choose a high compression level for small file size"
 msgstr "Zvolte vysokou úroveň komprese pro malou velikost souboru"
 
@@ -5136,7 +5135,7 @@ msgstr "Neon..."
 msgid "Neon Detection"
 msgstr "Detekce neonu"
 
-#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:678
+#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:679
 msgid "_Amount:"
 msgstr "_Míra:"
 
@@ -5493,7 +5492,7 @@ msgstr "Neobvyklá verze PCX, vzdávám to"
 
 #: ../plug-ins/common/photocopy.c:158
 msgid "_Photocopy..."
-msgstr "_FOotokopie..."
+msgstr "_Fotokopie..."
 
 #: ../plug-ins/common/photocopy.c:837
 msgid "Photocopy"
@@ -5580,60 +5579,60 @@ msgstr ""
 "Soubor PNG určuje posunutí, které způsobilo, že vrstva je umístěna mimo  "
 "obrázek."
 
-#: ../plug-ins/common/png.c:1163
+#: ../plug-ins/common/png.c:1167
 #, c-format
 msgid "Error while saving '%s'. Could not save image."
 msgstr "Chyba při ukládání '%s'. Nemohu uložit obrázek."
 
-#: ../plug-ins/common/png.c:1591
+#: ../plug-ins/common/png.c:1600
 msgid "Save as PNG"
 msgstr "Zapsat jako PNG"
 
-#: ../plug-ins/common/png.c:1595
+#: ../plug-ins/common/png.c:1604
 msgid "_Load defaults"
 msgstr "_Načíst implicitní nastavení"
 
-#: ../plug-ins/common/png.c:1596
+#: ../plug-ins/common/png.c:1605
 msgid "_Save defaults"
 msgstr "_Uložit implicitní nastavení"
 
-#: ../plug-ins/common/png.c:1617
+#: ../plug-ins/common/png.c:1626
 msgid "_Interlacing (Adam7)"
 msgstr "_Prokládání (Adam7)"
 
-#: ../plug-ins/common/png.c:1628
+#: ../plug-ins/common/png.c:1637
 msgid "Save _background color"
 msgstr "Uložit barvu _pozadí"
 
-#: ../plug-ins/common/png.c:1636
+#: ../plug-ins/common/png.c:1645
 msgid "Save _gamma"
 msgstr "Uložit _gamu"
 
-#: ../plug-ins/common/png.c:1645
+#: ../plug-ins/common/png.c:1654
 msgid "Save layer o_ffset"
 msgstr "Uložit posun _vrstvy"
 
-#: ../plug-ins/common/png.c:1654
+#: ../plug-ins/common/png.c:1663
 msgid "Save _resolution"
 msgstr "Uložit _rozlišení"
 
-#: ../plug-ins/common/png.c:1663
+#: ../plug-ins/common/png.c:1672
 msgid "Save creation _time"
 msgstr "Uložit _čas vytvoření"
 
-#: ../plug-ins/common/png.c:1671
+#: ../plug-ins/common/png.c:1680
 msgid "Save comme_nt"
 msgstr "Uložit _komentář"
 
-#: ../plug-ins/common/png.c:1686
+#: ../plug-ins/common/png.c:1695
 msgid "Save color _values from transparent pixels"
 msgstr "Uložit _hodnoty barvy průhledných pixelů"
 
-#: ../plug-ins/common/png.c:1699
+#: ../plug-ins/common/png.c:1708
 msgid "Co_mpression level:"
 msgstr "Úroveň ko_mprese:"
 
-#: ../plug-ins/common/png.c:1819
+#: ../plug-ins/common/png.c:1828
 msgid "Could not load PNG defaults"
 msgstr "Nemohu načíst implicitní nastavení PNG"
 
@@ -5806,7 +5805,7 @@ msgid "Rendering"
 msgstr "Vyobrazení"
 
 #. Resolution
-#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:882
+#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:900
 #: ../plug-ins/common/wmf.c:669 ../plug-ins/print/gimp_main_window.c:1087
 msgid "Resolution:"
 msgstr "Rozlišení:"
@@ -5832,7 +5831,7 @@ msgstr "Barevnost"
 msgid "B/W"
 msgstr "Č/B"
 
-#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:411
+#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:422
 msgid "Gray"
 msgstr "Šedá"
 
@@ -5919,15 +5918,15 @@ msgstr "_Náhled"
 msgid "Preview _size:"
 msgstr "_Velikost náhledu:"
 
-#: ../plug-ins/common/psd.c:489
+#: ../plug-ins/common/psd.c:490
 msgid "Invalid UTF-8 string in PSD file"
 msgstr "Neplatný řetězec UTF-8 v souboru PSD"
 
-#: ../plug-ins/common/psd_save.c:192
+#: ../plug-ins/common/psd_save.c:196
 msgid "Photoshop image"
 msgstr "Obrázek Photoshopu"
 
-#: ../plug-ins/common/psd_save.c:1312
+#: ../plug-ins/common/psd_save.c:1354
 #, c-format
 msgid ""
 "Unable to save '%s'.  The psd file format does not support images that are "
@@ -5936,7 +5935,7 @@ msgstr ""
 "Nemohu uložit '%s'. Formát souborů psd nepodporuje obrázky, které jsou širší "
 "nebo vyšší než 30000 pixelů."
 
-#: ../plug-ins/common/psd_save.c:1324
+#: ../plug-ins/common/psd_save.c:1366
 #, c-format
 msgid ""
 "Unable to save '%s'.  The psd file format does not support images with "
@@ -6399,19 +6398,19 @@ msgstr "_Posunout..."
 msgid "Shifting..."
 msgstr "Posunuji..."
 
-#: ../plug-ins/common/shift.c:349
+#: ../plug-ins/common/shift.c:360
 msgid "Shift"
 msgstr "Posun"
 
-#: ../plug-ins/common/shift.c:373
+#: ../plug-ins/common/shift.c:384
 msgid "Shift _horizontally"
 msgstr "Posunout _vodorovně"
 
-#: ../plug-ins/common/shift.c:374
+#: ../plug-ins/common/shift.c:387
 msgid "Shift _vertically"
 msgstr "Posunout _svisle"
 
-#: ../plug-ins/common/shift.c:404
+#: ../plug-ins/common/shift.c:418
 msgid "Shift _amount:"
 msgstr "_Míra posunu:"
 
@@ -7004,23 +7003,23 @@ msgstr "Formátování dat"
 msgid "RunLength Encoded"
 msgstr "Kódované RunLength"
 
-#: ../plug-ins/common/svg.c:136
+#: ../plug-ins/common/svg.c:137
 msgid "Scalable SVG image"
 msgstr "Škálovatelný obrázek SVG"
 
-#: ../plug-ins/common/svg.c:313 ../plug-ins/common/svg.c:696
+#: ../plug-ins/common/svg.c:314 ../plug-ins/common/svg.c:714
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
-#: ../plug-ins/common/svg.c:317
+#: ../plug-ins/common/svg.c:318
 msgid "Rendering SVG..."
 msgstr "Vykresluji SVG..."
 
-#: ../plug-ins/common/svg.c:327
+#: ../plug-ins/common/svg.c:328
 msgid "Rendered SVG"
 msgstr "Vykreslené SVG"
 
-#: ../plug-ins/common/svg.c:492
+#: ../plug-ins/common/svg.c:511
 msgid ""
 "SVG file does not\n"
 "specify a size!"
@@ -7028,52 +7027,51 @@ msgstr ""
 "Soubor SVG neurčuje\n"
 "velikost!"
 
-#: ../plug-ins/common/svg.c:498 ../plug-ins/common/wmf.c:342
+#: ../plug-ins/common/svg.c:517 ../plug-ins/common/wmf.c:342
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/svg.c:703
+#: ../plug-ins/common/svg.c:721
 msgid "Render Scalable Vector Graphics"
 msgstr "Vykreslit Scalable Vector Graphics"
 
-#: ../plug-ins/common/svg.c:767 ../plug-ins/common/wmf.c:554
+#: ../plug-ins/common/svg.c:785 ../plug-ins/common/wmf.c:554
 #: ../plug-ins/print/gimp_main_window.c:1009
 #: ../plug-ins/print/gimp_main_window.c:1212
 msgid "Height:"
 msgstr "Výška:"
 
-#: ../plug-ins/common/svg.c:841 ../plug-ins/common/wmf.c:628
+#: ../plug-ins/common/svg.c:859 ../plug-ins/common/wmf.c:628
 msgid "_X ratio:"
 msgstr "Poměr _X:"
 
-#: ../plug-ins/common/svg.c:863 ../plug-ins/common/wmf.c:650
+#: ../plug-ins/common/svg.c:881 ../plug-ins/common/wmf.c:650
 msgid "_Y ratio:"
 msgstr "Poměr _Y:"
 
-#: ../plug-ins/common/svg.c:877 ../plug-ins/common/wmf.c:664
+#: ../plug-ins/common/svg.c:895 ../plug-ins/common/wmf.c:664
 msgid "Constrain aspect ratio"
 msgstr "Omezit poměr stran:"
 
-#: ../plug-ins/common/svg.c:888 ../plug-ins/common/wmf.c:675
+#: ../plug-ins/common/svg.c:906 ../plug-ins/common/wmf.c:675
 #, c-format
 msgid "pixels/%a"
 msgstr "pixely/%a"
 
 #. Path Import
-#: ../plug-ins/common/svg.c:908
+#: ../plug-ins/common/svg.c:926
 msgid "Import _paths"
 msgstr "Importovat _cesty"
 
-#: ../plug-ins/common/svg.c:914
-msgid ""
-"Import path elements of the SVG so they can be used with the GIMP path tool"
+#: ../plug-ins/common/svg.c:932
+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/svg.c:927
+#: ../plug-ins/common/svg.c:945
 msgid "Merge imported paths"
 msgstr "Sloučit importované cesty"
 
@@ -7289,8 +7287,7 @@ 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."
+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."
@@ -7411,15 +7408,15 @@ msgstr "Editor jednotek"
 
 #: ../plug-ins/common/unsharp.c:143
 msgid "_Unsharp Mask..."
-msgstr "_Rozostřit masku..."
+msgstr "_Maskování neostrosti..."
 
-#: ../plug-ins/common/unsharp.c:468
+#: ../plug-ins/common/unsharp.c:469
 msgid "Merging..."
 msgstr "Spojuji..."
 
-#: ../plug-ins/common/unsharp.c:635
+#: ../plug-ins/common/unsharp.c:636
 msgid "Unsharp Mask"
-msgstr "Rozostřit masku"
+msgstr "Maskování neostrosti"
 
 #: ../plug-ins/common/url.c:85 ../plug-ins/imagemap/imap_selection.c:421
 msgid "URL"
@@ -8659,8 +8656,7 @@ 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:1304
 msgid "Background:"
@@ -8782,10 +8778,10 @@ msgstr ""
 "Chyba při pokusu uložit obrázek jako parazita: nemohu připojit parazita k "
 "drawable.\n"
 
-#: ../plug-ins/gfig/gfig.c:747
+#: ../plug-ins/gfig/gfig.c:752
 #, c-format
-msgid "Error trying to open temp file '%s'for parasite loading.\n"
-msgstr "Chyba při pokusu otevřít dočasný soubor '%s' pro načtení parazita.\n"
+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"
 
 #: ../plug-ins/gflare/gflare.c:560
 msgid "Addition"
@@ -9209,8 +9205,7 @@ msgid "Shadow depth:"
 msgstr "Hloubka stínu:"
 
 #: ../plug-ins/gimpressionist/general.c:243
-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:248
@@ -9592,13 +9587,11 @@ msgid "Size:"
 msgstr "Velikost:"
 
 #: ../plug-ins/gimpressionist/size.c:142
-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:146
-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:150
@@ -10724,15 +10717,15 @@ msgstr ""
 
 #: ../plug-ins/pagecurl/pagecurl.c:224
 msgid "_Pagecurl..."
-msgstr "_Rozčeření stránky..."
+msgstr "_Zkroucení stránky..."
 
 #: ../plug-ins/pagecurl/pagecurl.c:443
 msgid "Pagecurl Effect"
-msgstr "Efekt rozčeření stránky"
+msgstr "Efekt zkroucení stránky"
 
 #: ../plug-ins/pagecurl/pagecurl.c:458
 msgid "Curl Location"
-msgstr "Místo rozčeření"
+msgstr "Místo zkroucení"
 
 #: ../plug-ins/pagecurl/pagecurl.c:477
 msgid "Lower right"
@@ -10752,11 +10745,11 @@ msgstr "Zprava shora"
 
 #: ../plug-ins/pagecurl/pagecurl.c:520
 msgid "Curl Orientation"
-msgstr "Orientace rozčeření"
+msgstr "Orientace zkroucení"
 
 #: ../plug-ins/pagecurl/pagecurl.c:564
 msgid "_Shade under curl"
-msgstr "Z_tmavit pod rozčeřením"
+msgstr "_Stín pod zkroucením"
 
 #: ../plug-ins/pagecurl/pagecurl.c:577
 msgid "Current gradient (reversed)"
@@ -10776,11 +10769,11 @@ msgstr "_Krytí:"
 
 #: ../plug-ins/pagecurl/pagecurl.c:730
 msgid "Curl Layer"
-msgstr "Rozčeření vrstvy"
+msgstr "Zkroucení vrstvy"
 
 #: ../plug-ins/pagecurl/pagecurl.c:1018
 msgid "Page Curl..."
-msgstr "Rozčeření stránky..."
+msgstr "Zkroucení stránky..."
 
 #: ../plug-ins/print/gimp_color_window.c:208
 msgid "Print Color Adjust"
@@ -11373,10 +11366,8 @@ msgid "Adjust output..."
 msgstr "Upravit výstup..."
 
 #: ../plug-ins/print/gimp_main_window.c:1449
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr ""
-"Úprava barevného vyvážení, jasu, kontrastu, sytosti a algoritmu rozptylu"
+msgid "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr "Úprava barevného vyvážení, jasu, kontrastu, sytosti a algoritmu rozptylu"
 
 #: ../plug-ins/print/gimp_main_window.c:1483
 msgid "Print to File"
@@ -11399,87 +11390,87 @@ msgstr "_Rotace barevná mapy..."
 msgid "Rotating the colormap..."
 msgstr "Rotuje se barevné mapa..."
 
-#: ../plug-ins/rcm/rcm_dialog.c:119
+#: ../plug-ins/rcm/rcm_dialog.c:122
 msgid "Original"
 msgstr "Původní"
 
-#: ../plug-ins/rcm/rcm_dialog.c:133
+#: ../plug-ins/rcm/rcm_dialog.c:140
 msgid "Rotated"
 msgstr "Rotovaný"
 
-#: ../plug-ins/rcm/rcm_dialog.c:147
+#: ../plug-ins/rcm/rcm_dialog.c:158
 msgid "Continuous update"
 msgstr "Plynulá aktualizace"
 
-#: ../plug-ins/rcm/rcm_dialog.c:160
+#: ../plug-ins/rcm/rcm_dialog.c:171
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../plug-ins/rcm/rcm_dialog.c:164
+#: ../plug-ins/rcm/rcm_dialog.c:175
 msgid "Entire Layer"
 msgstr "Celá vrstva"
 
-#: ../plug-ins/rcm/rcm_dialog.c:166
+#: ../plug-ins/rcm/rcm_dialog.c:177
 msgid "Context"
 msgstr "Kontext"
 
 #. spinbutton 1
-#: ../plug-ins/rcm/rcm_dialog.c:291 ../plug-ins/rcm/rcm_dialog.c:369
+#: ../plug-ins/rcm/rcm_dialog.c:302 ../plug-ins/rcm/rcm_dialog.c:380
 msgid "From"
 msgstr "Z"
 
 #. spinbutton 2
-#: ../plug-ins/rcm/rcm_dialog.c:317 ../plug-ins/rcm/rcm_dialog.c:370
+#: ../plug-ins/rcm/rcm_dialog.c:328 ../plug-ins/rcm/rcm_dialog.c:381
 msgid "To"
 msgstr "Do"
 
 #. * Gray: Operation-Mode *
-#: ../plug-ins/rcm/rcm_dialog.c:506
+#: ../plug-ins/rcm/rcm_dialog.c:517
 msgid "Gray Mode"
 msgstr "Šedý režim"
 
 #. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:515
+#: ../plug-ins/rcm/rcm_dialog.c:526
 msgid "Treat as this"
 msgstr "Zpracovat jako toto"
 
-#: ../plug-ins/rcm/rcm_dialog.c:527
+#: ../plug-ins/rcm/rcm_dialog.c:538
 msgid "Change to this"
 msgstr "Změnit do tohoto"
 
 #. * Gray: What is gray? *
-#: ../plug-ins/rcm/rcm_dialog.c:540
+#: ../plug-ins/rcm/rcm_dialog.c:551
 msgid "Gray Threshold"
 msgstr "Práh šedé"
 
 #. * Misc: Used unit selection *
-#: ../plug-ins/rcm/rcm_dialog.c:579 ../plug-ins/rcm/rcm_dialog.c:683
+#: ../plug-ins/rcm/rcm_dialog.c:590 ../plug-ins/rcm/rcm_dialog.c:694
 msgid "Units"
 msgstr "Jednotky"
 
 #. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:588
+#: ../plug-ins/rcm/rcm_dialog.c:599
 msgid "Radians"
 msgstr "Radiány"
 
-#: ../plug-ins/rcm/rcm_dialog.c:600
+#: ../plug-ins/rcm/rcm_dialog.c:611
 msgid "Radians/Pi"
 msgstr "Radiány/pí"
 
-#: ../plug-ins/rcm/rcm_dialog.c:612
+#: ../plug-ins/rcm/rcm_dialog.c:623
 msgid "Degrees"
 msgstr "Stupně"
 
 #. Create dialog
-#: ../plug-ins/rcm/rcm_dialog.c:645
+#: ../plug-ins/rcm/rcm_dialog.c:656
 msgid "Colormap Rotation"
 msgstr "Rotace barevná mapy"
 
-#: ../plug-ins/rcm/rcm_dialog.c:677
+#: ../plug-ins/rcm/rcm_dialog.c:688
 msgid "Main Options"
 msgstr "Hlavní volby"
 
-#: ../plug-ins/rcm/rcm_dialog.c:680
+#: ../plug-ins/rcm/rcm_dialog.c:691
 msgid "Gray Options"
 msgstr "Možnosti šedé"
 
@@ -11687,3 +11678,4 @@ msgstr "Chyba: Nemohu načíst soubor XJT vlastností '%s'."
 #, c-format
 msgid "Error: XJT property file '%s' is empty."
 msgstr "Chyba: Soubor XJT vlastností '%s' je prázdný."
+
diff --git a/po-plug-ins/de.gmo b/po-plug-ins/de.gmo
index 631a0fecd06cd7fec08390fe01e7e0bcfaba5d38..ea761306f95963c222527969a69647bcd85ae06a 100644
GIT binary patch
delta 16704
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
F`F}uVCoTX0

diff --git a/po-plug-ins/de.po b/po-plug-ins/de.po
index 10b7ce72d0..366156de90 100644
--- a/po-plug-ins/de.po
+++ b/po-plug-ins/de.po
@@ -3233,9 +3233,7 @@ msgstr "DICOM-Bild"
 
 #: ../plug-ins/common/dicom.c:159
 msgid "Digital Imaging and Communications in Medicine image"
-msgstr ""
-"Bild des Standards »Digitale Bilderzeugung und Kommunikation in der "
-"Medizin« (DICOM)"
+msgstr "»Digitale Bilderzeugung und Kommunikation in der Medizin«"
 
 #: ../plug-ins/common/dicom.c:318
 #, c-format
diff --git a/po-plug-ins/es.gmo b/po-plug-ins/es.gmo
index 01f476f440fcee6566cec15b456c44515110c5e3..47b5fd37a97cef9bc31bd05dbdf28baef59bf27e 100644
GIT binary patch
delta 56764
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	FQ5VCy*aFPN%R$58QlY2um<+Q%J?{X+Frkz
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
{!>YAAutf~3dj}7LulBJzhPi!
zaIxYlB>7ARf5M+4xE{_gu=+9(UyOJfG^(K6j{GW~g5DpTdyvP702YJpMEUPOoZ=kB
zQt6}atx-tl5E2_h-5VZs!!EoO$xY6C5jn{D4&t$3@5%GSeFnY~tRkGk46V8Mqa
zvsy_o(@F-MU|=(Yz9|3FNkRii5W<_Xkcm8q3k>3hz9F#-not
zodWchxD#SmK
zXV4*1%ggx-S_ROJB8oL8_r|l5cT$Zp^7p^k90qn%qMX+;s68TSz?yOHM?)V5B!Jan
z=zjA1aKx68Ki1*-c@o3Pi}7E}M!02(gBe@hs~+`k9k>!Mfn^#?Lr2Ae0?0WFIq9=TC3vty0Wu$bT|
zW21ne?(xZAdnVR<-OMRzpMzbs>>d$O0a0z;Mt9d}cVm}`C}U(mR6ulSOt3L5
zBA|0-%VCbU;@Se&<^#{V*6
zqk}s`H#VtR#TeQnAS5{2J1I{dyUOwDN_iFY_44sG7BB5r!Y85o20Q1Bwvex9F`uOA
z8|)ID5@L?pIVDs)YUi0W=BQnKuB0jt?2w2`==j&Jb~5vBtNz-Zv@go&=!1!25yr^a
n;LgFu;BLV|u`vNr(ZM!52J{GKU-Oy?gU;BwCB@p?AK&sHgkTj(

delta 56680
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

diff --git a/po-plug-ins/es.po b/po-plug-ins/es.po
index 14032d82a2..e3de0ca747 100644
--- a/po-plug-ins/es.po
+++ b/po-plug-ins/es.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-08 12:28+0200\n"
-"PO-Revision-Date: 2005-02-06 16:03+0100\n"
+"POT-Creation-Date: 2006-04-24 17:32+0200\n"
+"PO-Revision-Date: 2006-04-24 17:34+0200\n"
 "Last-Translator: Francisco Javier F. Serrador \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
@@ -240,7 +240,7 @@ msgstr "Densidad de color"
 #. to figure out which button the user pushed, etc.
 #. Not my design, please don't blame me -- njl
 #: ../plug-ins/FractalExplorer/Dialogs.c:928 ../plug-ins/common/compose.c:128
-#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:217
+#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:228
 msgid "Red:"
 msgstr "Rojo:"
 
@@ -249,7 +249,7 @@ msgid "Change the intensity of the red channel"
 msgstr "Cambiar la intensidad del canal rojo"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:938 ../plug-ins/common/compose.c:129
-#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:218
+#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:229
 msgid "Green:"
 msgstr "Verde:"
 
@@ -258,7 +258,7 @@ msgid "Change the intensity of the green channel"
 msgstr "Cambiar la intensidad del canal verde"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:948 ../plug-ins/common/compose.c:130
-#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:219
+#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:230
 msgid "Blue:"
 msgstr "Azul:"
 
@@ -390,17 +390,17 @@ msgstr "_Fractales"
 #: ../plug-ins/common/compressor.c:535 ../plug-ins/common/curve_bend.c:861
 #: ../plug-ins/common/dicom.c:647 ../plug-ins/common/gbr.c:586
 #: ../plug-ins/common/gif.c:994 ../plug-ins/common/gih.c:1254
-#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1498
+#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1499
 #: ../plug-ins/common/mng.c:558 ../plug-ins/common/mng.c:946
 #: ../plug-ins/common/pat.c:433 ../plug-ins/common/pcx.c:585
-#: ../plug-ins/common/pix.c:515 ../plug-ins/common/png.c:1178
+#: ../plug-ins/common/pix.c:515 ../plug-ins/common/png.c:1182
 #: ../plug-ins/common/pnm.c:809 ../plug-ins/common/postscript.c:1123
-#: ../plug-ins/common/psd_save.c:1336 ../plug-ins/common/raw.c:517
+#: ../plug-ins/common/psd_save.c:1378 ../plug-ins/common/raw.c:517
 #: ../plug-ins/common/raw.c:544 ../plug-ins/common/spheredesigner.c:2088
 #: ../plug-ins/common/sunras.c:513 ../plug-ins/common/tga.c:1030
 #: ../plug-ins/common/tiff.c:1825 ../plug-ins/common/xbm.c:996
 #: ../plug-ins/common/xwd.c:577 ../plug-ins/fits/fits.c:450
-#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:783
+#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:788
 #: ../plug-ins/gfli/gfli.c:715 ../plug-ins/ifscompose/ifscompose.c:2395
 #: ../plug-ins/winicon/icosave.c:243 ../plug-ins/xjt/xjt.c:1263
 #: ../plug-ins/xjt/xjt.c:1702
@@ -429,15 +429,15 @@ msgstr "Guardar parámetros de fractal"
 #: ../plug-ins/common/channel_mixer.c:966 ../plug-ins/common/curve_bend.c:913
 #: ../plug-ins/common/dicom.c:290 ../plug-ins/common/gbr.c:327
 #: ../plug-ins/common/gifload.c:296 ../plug-ins/common/gih.c:648
-#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2607
+#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2612
 #: ../plug-ins/common/mng.c:1117 ../plug-ins/common/pat.c:300
 #: ../plug-ins/common/pcx.c:302 ../plug-ins/common/pix.c:332
 #: ../plug-ins/common/png.c:674 ../plug-ins/common/pnm.c:432
-#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1759
+#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1780
 #: ../plug-ins/common/psp.c:1457 ../plug-ins/common/raw.c:230
 #: ../plug-ins/common/raw.c:635 ../plug-ins/common/spheredesigner.c:1990
-#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:311
-#: ../plug-ins/common/svg.c:694 ../plug-ins/common/tga.c:415
+#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:312
+#: ../plug-ins/common/svg.c:712 ../plug-ins/common/tga.c:415
 #: ../plug-ins/common/tiff.c:510 ../plug-ins/common/xbm.c:719
 #: ../plug-ins/common/xwd.c:422 ../plug-ins/faxg3/faxg3.c:220
 #: ../plug-ins/fits/fits.c:337 ../plug-ins/flame/flame.c:412
@@ -999,7 +999,7 @@ msgstr "P_rofundidad:"
 msgid "Antialiasing quality. Higher is better, but slower"
 msgstr "Calidad del suavizado. A mayor calidad, mejor, pero más lento"
 
-#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:691
+#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:692
 #: ../plug-ins/common/wind.c:993 ../plug-ins/imagemap/imap_preferences.c:539
 msgid "_Threshold:"
 msgstr "_Umbral:"
@@ -1227,7 +1227,7 @@ msgstr "Mapa de colores malo"
 #: ../plug-ins/common/jpeg.c:953 ../plug-ins/common/pat.c:305
 #: ../plug-ins/common/pcx.c:307 ../plug-ins/common/pix.c:338
 #: ../plug-ins/common/png.c:681 ../plug-ins/common/pnm.c:437
-#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1764
+#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1785
 #: ../plug-ins/common/raw.c:640 ../plug-ins/common/sunras.c:436
 #: ../plug-ins/common/tga.c:420 ../plug-ins/common/tiff.c:515
 #: ../plug-ins/common/wmf.c:952 ../plug-ins/common/xbm.c:724
@@ -1267,10 +1267,10 @@ msgstr "Formato de compresión BMP no reconocido o inválido."
 #: ../plug-ins/common/compose.c:625 ../plug-ins/common/decompose.c:595
 #: ../plug-ins/common/dicom.c:442 ../plug-ins/common/film.c:946
 #: ../plug-ins/common/gifload.c:864 ../plug-ins/common/jpeg.c:1113
-#: ../plug-ins/common/jpeg.c:2474 ../plug-ins/common/pcx.c:334
+#: ../plug-ins/common/jpeg.c:2479 ../plug-ins/common/pcx.c:334
 #: ../plug-ins/common/pcx.c:340 ../plug-ins/common/pix.c:374
 #: ../plug-ins/common/png.c:808 ../plug-ins/common/pnm.c:517
-#: ../plug-ins/common/psd.c:2174 ../plug-ins/common/raw.c:677
+#: ../plug-ins/common/psd.c:2204 ../plug-ins/common/raw.c:677
 #: ../plug-ins/common/smooth_palette.c:257 ../plug-ins/common/sunras.c:925
 #: ../plug-ins/common/tga.c:929 ../plug-ins/common/tiff.c:848
 #: ../plug-ins/common/tile.c:266 ../plug-ins/common/winclipboard.c:579
@@ -1298,10 +1298,10 @@ msgstr "No puede operar sobre tipos de imagen desconocidos."
 #: ../plug-ins/bmp/bmpwrite.c:209 ../plug-ins/common/CEL.c:582
 #: ../plug-ins/common/gbr.c:591 ../plug-ins/common/gif.c:1001
 #: ../plug-ins/common/gih.c:1259 ../plug-ins/common/gtm.c:245
-#: ../plug-ins/common/jpeg.c:1453 ../plug-ins/common/pat.c:438
+#: ../plug-ins/common/jpeg.c:1454 ../plug-ins/common/pat.c:438
 #: ../plug-ins/common/pcx.c:545 ../plug-ins/common/pix.c:521
-#: ../plug-ins/common/png.c:1185 ../plug-ins/common/pnm.c:814
-#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1341
+#: ../plug-ins/common/png.c:1189 ../plug-ins/common/pnm.c:814
+#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1383
 #: ../plug-ins/common/sunras.c:518 ../plug-ins/common/tga.c:1035
 #: ../plug-ins/common/tiff.c:1830 ../plug-ins/common/xbm.c:1001
 #: ../plug-ins/common/xpm.c:628 ../plug-ins/common/xwd.c:582
@@ -1312,11 +1312,11 @@ msgstr "No puede operar sobre tipos de imagen desconocidos."
 msgid "Saving '%s'..."
 msgstr "Guardando «%s» ..."
 
-#: ../plug-ins/bmp/bmpwrite.c:554
+#: ../plug-ins/bmp/bmpwrite.c:556
 msgid "Save as BMP"
 msgstr "Guardar como BMP"
 
-#: ../plug-ins/bmp/bmpwrite.c:568
+#: ../plug-ins/bmp/bmpwrite.c:570
 msgid "_RLE encoded"
 msgstr "Codificado _RLE"
 
@@ -1644,7 +1644,7 @@ msgid "Hue"
 msgstr "Tono"
 
 #: ../plug-ins/common/CML_explorer.c:303 ../plug-ins/common/CML_explorer.c:311
-#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:548
+#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:559
 msgid "Saturation"
 msgstr "Saturación"
 
@@ -1684,7 +1684,7 @@ msgstr "Fijar semilla"
 msgid "Random seed"
 msgstr "Semilla aleatoria"
 
-#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:655
+#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:699
 #: ../plug-ins/common/lic.c:669
 msgid "_Hue"
 msgstr "T_ono"
@@ -1693,7 +1693,7 @@ msgstr "T_ono"
 msgid "Sat_uration"
 msgstr "Sat_uración"
 
-#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:663
+#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:707
 msgid "_Value"
 msgstr "_Valor:"
 
@@ -2025,7 +2025,7 @@ msgstr "Rebobinar"
 msgid "Step"
 msgstr "Paso"
 
-#: ../plug-ins/common/animationplay.c:1138
+#: ../plug-ins/common/animationplay.c:1127
 #, c-format
 msgid "Frame %d of %d"
 msgstr "Fotograma %d de %d"
@@ -2166,7 +2166,7 @@ msgstr "_Nº de segmentos:"
 msgid "_Blur"
 msgstr "_Desenfoque (Blur)"
 
-#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:432
+#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:433
 msgid "Blurring..."
 msgstr "Desenfocando..."
 
@@ -2498,13 +2498,13 @@ msgid "HSV"
 msgstr "HSV"
 
 #. Gray: Circle: Spinbutton 1
-#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:459
+#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:470
 msgid "Hue:"
 msgstr "Tono:"
 
 #. Gray: Circle: Spinbutton 2
 #: ../plug-ins/common/compose.c:149 ../plug-ins/print/gimp_color_window.c:364
-#: ../plug-ins/rcm/rcm_dialog.c:486
+#: ../plug-ins/rcm/rcm_dialog.c:497
 msgid "Saturation:"
 msgstr "Saturación:"
 
@@ -2517,17 +2517,17 @@ msgid "CMY"
 msgstr "CMY"
 
 #: ../plug-ins/common/compose.c:155 ../plug-ins/common/compose.c:162
-#: ../plug-ins/common/fp.c:220 ../plug-ins/print/gimp_color_window.c:307
+#: ../plug-ins/common/fp.c:231 ../plug-ins/print/gimp_color_window.c:307
 msgid "Cyan:"
 msgstr "Cían:"
 
 #: ../plug-ins/common/compose.c:156 ../plug-ins/common/compose.c:163
-#: ../plug-ins/common/fp.c:222 ../plug-ins/print/gimp_color_window.c:326
+#: ../plug-ins/common/fp.c:233 ../plug-ins/print/gimp_color_window.c:326
 msgid "Magenta:"
 msgstr "Magenta:"
 
 #: ../plug-ins/common/compose.c:157 ../plug-ins/common/compose.c:164
-#: ../plug-ins/common/fp.c:221 ../plug-ins/print/gimp_color_window.c:345
+#: ../plug-ins/common/fp.c:232 ../plug-ins/print/gimp_color_window.c:345
 msgid "Yellow:"
 msgstr "Amarillo:"
 
@@ -2865,7 +2865,7 @@ msgid "Smoo_thing"
 msgstr "Suavizad_o"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:823
+#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:821
 #: ../plug-ins/common/mosaic.c:535 ../plug-ins/common/ripple.c:510
 msgid "_Antialiasing"
 msgstr "_Antialias"
@@ -3199,7 +3199,7 @@ msgstr "R_ecursivo"
 
 #: ../plug-ins/common/despeckle.c:494 ../plug-ins/common/neon.c:727
 #: ../plug-ins/common/nlfilt.c:1083 ../plug-ins/common/nova.c:359
-#: ../plug-ins/common/unsharp.c:665 ../plug-ins/common/whirlpinch.c:588
+#: ../plug-ins/common/unsharp.c:666 ../plug-ins/common/whirlpinch.c:588
 #: ../plug-ins/gflare/gflare.c:2686 ../plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
 msgstr "_Radio:"
@@ -3509,7 +3509,7 @@ msgid "Composing Images..."
 msgstr "Componiendo imágenes..."
 
 #: ../plug-ins/common/film.c:438 ../plug-ins/common/guillotine.c:183
-#: ../plug-ins/helpbrowser/dialog.c:525
+#: ../plug-ins/helpbrowser/dialog.c:534
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -3528,7 +3528,7 @@ msgstr "En la película:"
 
 #. Create selection
 #: ../plug-ins/common/film.c:1166 ../plug-ins/imagemap/imap_selection.c:400
-#: ../plug-ins/rcm/rcm_dialog.c:165
+#: ../plug-ins/rcm/rcm_dialog.c:176
 msgid "Selection"
 msgstr "Selección"
 
@@ -3639,147 +3639,151 @@ msgstr "Centro del destello FX"
 msgid "_Show cursor"
 msgstr "Mo_strar el cursor"
 
-#: ../plug-ins/common/fp.c:224
+#: ../plug-ins/common/fp.c:235
 msgid "Darker:"
 msgstr "Más oscuro:"
 
-#: ../plug-ins/common/fp.c:225
+#: ../plug-ins/common/fp.c:236
 msgid "Lighter:"
 msgstr "Más claro:"
 
-#: ../plug-ins/common/fp.c:227
+#: ../plug-ins/common/fp.c:238
 msgid "More Sat:"
 msgstr "Más satur:"
 
-#: ../plug-ins/common/fp.c:228
+#: ../plug-ins/common/fp.c:239
 msgid "Less Sat:"
 msgstr "Menos satur:"
 
-#: ../plug-ins/common/fp.c:230 ../plug-ins/common/fp.c:488
+#: ../plug-ins/common/fp.c:241 ../plug-ins/common/fp.c:532
 msgid "Current:"
 msgstr "Actual:"
 
-#: ../plug-ins/common/fp.c:321
+#: ../plug-ins/common/fp.c:330
 msgid "_Filter Pack..."
 msgstr "Paquete de _filtros..."
 
-#: ../plug-ins/common/fp.c:361
-msgid "Convert the image to RGB first!"
-msgstr "¡Convierta la imagen a RGB primero!"
+#: ../plug-ins/common/fp.c:376
+msgid "FP can only be used on RGB images."
+msgstr "FP ólo puede trabajar en imágenes RGB."
 
-#: ../plug-ins/common/fp.c:366
-msgid "Applying the Filter Pack..."
+#: ../plug-ins/common/fp.c:386
+msgid "FP can only be run interactively."
+msgstr "FP sólo puede ejecutarse interactivamente."
+
+#: ../plug-ins/common/fp.c:404
+msgid "Applying Filter Pack..."
 msgstr "Aplicando paquete de filtros..."
 
-#: ../plug-ins/common/fp.c:480
+#: ../plug-ins/common/fp.c:524
 msgid "Original:"
 msgstr "Original:"
 
-#: ../plug-ins/common/fp.c:532
+#: ../plug-ins/common/fp.c:576
 msgid "Hue Variations"
 msgstr "Variaciones de tono"
 
-#: ../plug-ins/common/fp.c:586
+#: ../plug-ins/common/fp.c:630
 msgid "Roughness"
 msgstr "Rugosidad"
 
-#: ../plug-ins/common/fp.c:629
+#: ../plug-ins/common/fp.c:673
 msgid "Affected Range"
 msgstr "Rango afectado"
 
-#: ../plug-ins/common/fp.c:633
+#: ../plug-ins/common/fp.c:677
 msgid "Sha_dows"
 msgstr "Somb_ras"
 
-#: ../plug-ins/common/fp.c:634
+#: ../plug-ins/common/fp.c:678
 msgid "_Midtones"
 msgstr "Tonos _medios"
 
-#: ../plug-ins/common/fp.c:635
+#: ../plug-ins/common/fp.c:679
 msgid "H_ighlights"
 msgstr "P_untos de luz"
 
-#: ../plug-ins/common/fp.c:649
+#: ../plug-ins/common/fp.c:693
 msgid "Windows"
 msgstr "Ventanas"
 
-#: ../plug-ins/common/fp.c:659 ../plug-ins/common/lic.c:670
+#: ../plug-ins/common/fp.c:703 ../plug-ins/common/lic.c:670
 msgid "_Saturation"
 msgstr "_Saturación:"
 
-#: ../plug-ins/common/fp.c:667
+#: ../plug-ins/common/fp.c:711
 msgid "A_dvanced"
 msgstr "A_vanzado"
 
-#: ../plug-ins/common/fp.c:687
+#: ../plug-ins/common/fp.c:731
 msgid "Value Variations"
 msgstr "Variaciones de valor"
 
-#: ../plug-ins/common/fp.c:731
+#: ../plug-ins/common/fp.c:775
 msgid "Saturation Variations"
 msgstr "Variaciones de saturación"
 
-#: ../plug-ins/common/fp.c:783
+#: ../plug-ins/common/fp.c:827
 msgid "Select Pixels by"
 msgstr "Seleccionar píxeles por"
 
-#: ../plug-ins/common/fp.c:788
+#: ../plug-ins/common/fp.c:832
 msgid "H_ue"
 msgstr "T_ono"
 
-#: ../plug-ins/common/fp.c:789
+#: ../plug-ins/common/fp.c:833
 msgid "Satu_ration"
 msgstr "Satu_ración"
 
-#: ../plug-ins/common/fp.c:790
+#: ../plug-ins/common/fp.c:834
 msgid "V_alue"
 msgstr "V_alor"
 
-#: ../plug-ins/common/fp.c:816
+#: ../plug-ins/common/fp.c:860
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../plug-ins/common/fp.c:821
+#: ../plug-ins/common/fp.c:865
 msgid "_Entire Image"
 msgstr "Imagen c_ompleta"
 
-#: ../plug-ins/common/fp.c:822
+#: ../plug-ins/common/fp.c:866
 msgid "Se_lection Only"
 msgstr "Só_lo la selección"
 
-#: ../plug-ins/common/fp.c:823
+#: ../plug-ins/common/fp.c:867
 msgid "Selec_tion In Context"
 msgstr "Selecc_ión en su contexto"
 
-#: ../plug-ins/common/fp.c:1135
+#: ../plug-ins/common/fp.c:1182
 msgid "Filter Pack Simulation"
 msgstr "Simulación de paquete de filtros"
 
-#: ../plug-ins/common/fp.c:1245
+#: ../plug-ins/common/fp.c:1292
 msgid "Shadows:"
 msgstr "Sombras:"
 
-#: ../plug-ins/common/fp.c:1246
+#: ../plug-ins/common/fp.c:1293
 msgid "Midtones:"
 msgstr "Tonos medios:"
 
-#: ../plug-ins/common/fp.c:1247
+#: ../plug-ins/common/fp.c:1294
 msgid "Highlights:"
 msgstr "Puntos de luz:"
 
-#: ../plug-ins/common/fp.c:1259
+#: ../plug-ins/common/fp.c:1306
 msgid "Advanced Filter Pack Options"
 msgstr "Opciones avanzadas del paquete de filtros"
 
-#: ../plug-ins/common/fp.c:1270
+#: ../plug-ins/common/fp.c:1317
 msgid "Smoothness of Aliasing"
 msgstr "Suavidad del efecto escalera"
 
-#: ../plug-ins/common/fp.c:1370
+#: ../plug-ins/common/fp.c:1417
 msgid "Preview as You Drag"
 msgstr "Previsualizar mientras arrastra"
 
-#: ../plug-ins/common/fp.c:1374
+#: ../plug-ins/common/fp.c:1421
 msgid "Preview Size"
 msgstr "Tamaño de vista previa"
 
@@ -3896,7 +3900,7 @@ msgid "Save as Brush"
 msgstr "Guardar como brocha"
 
 #. attach labels
-#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:769
+#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:783
 msgid "Spacing:"
 msgstr "Espaciado:"
 
@@ -4183,23 +4187,23 @@ msgstr "A_nchura del mosaico:"
 msgid "Tile _height:"
 msgstr "A_ltura del mosaico:"
 
-#: ../plug-ins/common/gqbist.c:415
+#: ../plug-ins/common/gqbist.c:409
 msgid "_Qbist..."
 msgstr "_Qbista ..."
 
-#: ../plug-ins/common/gqbist.c:514
+#: ../plug-ins/common/gqbist.c:510
 msgid "Qbist ..."
 msgstr "Qbista ..."
 
-#: ../plug-ins/common/gqbist.c:695
+#: ../plug-ins/common/gqbist.c:693
 msgid "Load QBE file"
 msgstr "Cargar archivo QBE"
 
-#: ../plug-ins/common/gqbist.c:733
+#: ../plug-ins/common/gqbist.c:731
 msgid "Save (middle transform) as QBE file"
 msgstr "Guardar (transformación del medio) como archivo QBE"
 
-#: ../plug-ins/common/gqbist.c:781
+#: ../plug-ins/common/gqbist.c:779
 msgid "G-Qbist"
 msgstr "G-Qbist"
 
@@ -4219,47 +4223,47 @@ msgstr "_Rejilla..."
 msgid "Drawing Grid..."
 msgstr "Rejilla de dibujo..."
 
-#: ../plug-ins/common/grid.c:621 ../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:385 ../plug-ins/imagemap/imap_popup.c:153
 #: ../plug-ins/imagemap/imap_toolbar.c:163
 msgid "Grid"
 msgstr "Rejilla"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:696
+#: ../plug-ins/common/grid.c:710
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../plug-ins/common/grid.c:698
+#: ../plug-ins/common/grid.c:712
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../plug-ins/common/grid.c:700
+#: ../plug-ins/common/grid.c:714
 msgid "Intersection"
 msgstr "Intersección"
 
 #. Width and Height
-#: ../plug-ins/common/grid.c:703 ../plug-ins/common/svg.c:761
+#: ../plug-ins/common/grid.c:717 ../plug-ins/common/svg.c:779
 #: ../plug-ins/common/wmf.c:548 ../plug-ins/print/gimp_main_window.c:992
 #: ../plug-ins/print/gimp_main_window.c:1199
 msgid "Width:"
 msgstr "Anchura:"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:836
+#: ../plug-ins/common/grid.c:850
 msgid "Offset:"
 msgstr "Desplazamiento:"
 
 #. attach color selectors
-#: ../plug-ins/common/grid.c:875
+#: ../plug-ins/common/grid.c:889
 msgid "Horizontal Color"
 msgstr "Color horizontal"
 
-#: ../plug-ins/common/grid.c:893
+#: ../plug-ins/common/grid.c:907
 msgid "Vertical Color"
 msgstr "Color vertical"
 
-#: ../plug-ins/common/grid.c:911
+#: ../plug-ins/common/grid.c:925
 msgid "Intersection Color"
 msgstr "Color de intersección"
 
@@ -4644,89 +4648,89 @@ msgstr "Vista previa JPEG"
 msgid "File size: %02.01f kB"
 msgstr "Tamaño del archivo: %02.01f Kib"
 
-#: ../plug-ins/common/jpeg.c:1861 ../plug-ins/common/jpeg.c:1961
+#: ../plug-ins/common/jpeg.c:1864 ../plug-ins/common/jpeg.c:1964
 msgid "File size: unknown"
 msgstr "Tamaño de archivo: desconocido"
 
-#: ../plug-ins/common/jpeg.c:1926
+#: ../plug-ins/common/jpeg.c:1929
 msgid "Save as JPEG"
 msgstr "Guardar como JPEG"
 
-#: ../plug-ins/common/jpeg.c:1947
+#: ../plug-ins/common/jpeg.c:1950
 msgid "_Quality:"
 msgstr "_Calidad:"
 
-#: ../plug-ins/common/jpeg.c:1951
+#: ../plug-ins/common/jpeg.c:1954
 msgid "JPEG quality parameter"
 msgstr "Parámetro de calidad JPEG"
 
-#: ../plug-ins/common/jpeg.c:1970
+#: ../plug-ins/common/jpeg.c:1973
 msgid "Show _Preview in image window"
 msgstr "Mostrar _vista previa en la ventana de la imagen"
 
-#: ../plug-ins/common/jpeg.c:1983
+#: ../plug-ins/common/jpeg.c:1986
 msgid "_Advanced Options"
 msgstr "Opciones _avanzadas"
 
-#: ../plug-ins/common/jpeg.c:2011
+#: ../plug-ins/common/jpeg.c:2014
 msgid "_Smoothing:"
 msgstr "_Suavizado:"
 
-#: ../plug-ins/common/jpeg.c:2024
+#: ../plug-ins/common/jpeg.c:2027
 msgid "Frequency (rows):"
 msgstr "Frecuencia (filas:)"
 
-#: ../plug-ins/common/jpeg.c:2038
+#: ../plug-ins/common/jpeg.c:2041
 msgid "Use restart markers"
 msgstr "Usar marcadores de reinicio"
 
-#: ../plug-ins/common/jpeg.c:2053 ../plug-ins/xjt/xjt.c:860
+#: ../plug-ins/common/jpeg.c:2058 ../plug-ins/xjt/xjt.c:860
 msgid "Optimize"
 msgstr "Optimizar"
 
-#: ../plug-ins/common/jpeg.c:2067
+#: ../plug-ins/common/jpeg.c:2072
 msgid "Progressive"
 msgstr "Progresivo"
 
-#: ../plug-ins/common/jpeg.c:2086
+#: ../plug-ins/common/jpeg.c:2091
 msgid "Force baseline JPEG"
 msgstr "Forzar una línea base JPEG"
 
-#: ../plug-ins/common/jpeg.c:2102
+#: ../plug-ins/common/jpeg.c:2107
 msgid "Save EXIF data"
 msgstr "Guardar los datos EXIF"
 
-#: ../plug-ins/common/jpeg.c:2119
+#: ../plug-ins/common/jpeg.c:2124
 msgid "Save thumbnail"
 msgstr "Guardar miniatura"
 
 #. Subsampling
-#: ../plug-ins/common/jpeg.c:2136
+#: ../plug-ins/common/jpeg.c:2141
 msgid "Subsampling:"
 msgstr "Submuestreo:"
 
 #. DCT method
-#: ../plug-ins/common/jpeg.c:2163
+#: ../plug-ins/common/jpeg.c:2168
 msgid "DCT method:"
 msgstr "Método DCT:"
 
-#: ../plug-ins/common/jpeg.c:2169
+#: ../plug-ins/common/jpeg.c:2174
 msgid "Fast Integer"
 msgstr "Entero rápido"
 
-#: ../plug-ins/common/jpeg.c:2170
+#: ../plug-ins/common/jpeg.c:2175
 msgid "Integer"
 msgstr "Entero"
 
-#: ../plug-ins/common/jpeg.c:2171
+#: ../plug-ins/common/jpeg.c:2176
 msgid "Floating-Point"
 msgstr "Coma flotante"
 
-#: ../plug-ins/common/jpeg.c:2185
+#: ../plug-ins/common/jpeg.c:2190
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../plug-ins/common/jpeg.c:2338
+#: ../plug-ins/common/jpeg.c:2343
 #, c-format
 msgid "Opening thumbnail for '%s'..."
 msgstr "Abriendo miniatura de «%s»..."
@@ -4975,7 +4979,7 @@ msgstr "Desenfoque central [Blur]"
 
 #. Inform the user that we couldn't losslessly save the
 #. * transparency & just use the full palette
-#: ../plug-ins/common/mng.c:495 ../plug-ins/common/png.c:1562
+#: ../plug-ins/common/mng.c:495 ../plug-ins/common/png.c:1571
 msgid "Couldn't losslessly save transparency, saving opacity instead."
 msgstr ""
 "No se ha podido guardar a pérdida la transparencia, guardando la opacidad en "
@@ -5053,7 +5057,7 @@ msgstr "Disposición predeterminada del cuadro:"
 msgid "PNG compression level:"
 msgstr "Nivel de compresión de PNG:"
 
-#: ../plug-ins/common/mng.c:1450 ../plug-ins/common/png.c:1703
+#: ../plug-ins/common/mng.c:1450 ../plug-ins/common/png.c:1712
 msgid "Choose a high compression level for small file size"
 msgstr ""
 "Seleccione un nivel de compresión alto para achicar el tamaño del archivo"
@@ -5174,7 +5178,7 @@ msgstr "Neón..."
 msgid "Neon Detection"
 msgstr "Detección de neón"
 
-#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:678
+#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:679
 msgid "_Amount:"
 msgstr "C_antidad:"
 
@@ -5619,60 +5623,60 @@ msgstr ""
 "El archivo PNG especifica un desplazamiento que ha causado que la capa sea "
 "posicionada fuera de la imagen."
 
-#: ../plug-ins/common/png.c:1163
+#: ../plug-ins/common/png.c:1167
 #, c-format
 msgid "Error while saving '%s'. Could not save image."
 msgstr "Ocurrió un error al guardar «%s». No se pudo guardar la imagen."
 
-#: ../plug-ins/common/png.c:1591
+#: ../plug-ins/common/png.c:1600
 msgid "Save as PNG"
 msgstr "Guardar como PNG"
 
-#: ../plug-ins/common/png.c:1595
+#: ../plug-ins/common/png.c:1604
 msgid "_Load defaults"
 msgstr "_Cargar los valores predeterminados"
 
-#: ../plug-ins/common/png.c:1596
+#: ../plug-ins/common/png.c:1605
 msgid "_Save defaults"
 msgstr "_Guardar los valores predeterminados"
 
-#: ../plug-ins/common/png.c:1617
+#: ../plug-ins/common/png.c:1626
 msgid "_Interlacing (Adam7)"
 msgstr "_Entrelazado (Adam7)"
 
-#: ../plug-ins/common/png.c:1628
+#: ../plug-ins/common/png.c:1637
 msgid "Save _background color"
 msgstr "Guardar el color de _fondo"
 
-#: ../plug-ins/common/png.c:1636
+#: ../plug-ins/common/png.c:1645
 msgid "Save _gamma"
 msgstr "Guardar _gamma"
 
-#: ../plug-ins/common/png.c:1645
+#: ../plug-ins/common/png.c:1654
 msgid "Save layer o_ffset"
 msgstr "Guardar el desp_lazamiento de la capa"
 
-#: ../plug-ins/common/png.c:1654
+#: ../plug-ins/common/png.c:1663
 msgid "Save _resolution"
 msgstr "Guardar _resolución"
 
-#: ../plug-ins/common/png.c:1663
+#: ../plug-ins/common/png.c:1672
 msgid "Save creation _time"
 msgstr "Guardar la _hora de creación"
 
-#: ../plug-ins/common/png.c:1671
+#: ../plug-ins/common/png.c:1680
 msgid "Save comme_nt"
 msgstr "Guardar come_ntario"
 
-#: ../plug-ins/common/png.c:1686
+#: ../plug-ins/common/png.c:1695
 msgid "Save color _values from transparent pixels"
 msgstr "Guardar los valores de los _colores de los píxeles transparentes"
 
-#: ../plug-ins/common/png.c:1699
+#: ../plug-ins/common/png.c:1708
 msgid "Co_mpression level:"
 msgstr "Nivel de co_mpresión:"
 
-#: ../plug-ins/common/png.c:1819
+#: ../plug-ins/common/png.c:1828
 msgid "Could not load PNG defaults"
 msgstr "No se ha podido cargar los valores predeterminados de PNG"
 
@@ -5847,7 +5851,7 @@ msgid "Rendering"
 msgstr "Renderizado"
 
 #. Resolution
-#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:882
+#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:900
 #: ../plug-ins/common/wmf.c:669 ../plug-ins/print/gimp_main_window.c:1087
 msgid "Resolution:"
 msgstr "Resolución:"
@@ -5874,7 +5878,7 @@ msgstr "Coloreado"
 msgid "B/W"
 msgstr "B/N"
 
-#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:411
+#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:422
 msgid "Gray"
 msgstr "Gris"
 
@@ -5961,15 +5965,15 @@ msgstr "Vista p_revia"
 msgid "Preview _size:"
 msgstr "Tamaño de la vi_sta previa:"
 
-#: ../plug-ins/common/psd.c:489
+#: ../plug-ins/common/psd.c:490
 msgid "Invalid UTF-8 string in PSD file"
 msgstr "Cadena UTF-8 inválida en el archivo PSD"
 
-#: ../plug-ins/common/psd_save.c:192
+#: ../plug-ins/common/psd_save.c:196
 msgid "Photoshop image"
 msgstr "Imagen de Photoshop"
 
-#: ../plug-ins/common/psd_save.c:1312
+#: ../plug-ins/common/psd_save.c:1354
 #, c-format
 msgid ""
 "Unable to save '%s'.  The psd file format does not support images that are "
@@ -5978,7 +5982,7 @@ msgstr ""
 "Imposible guardar «%s». El formato de archivo psd no soporta imágenes que "
 "tengan más de 30000 píxeles de ancho o alto."
 
-#: ../plug-ins/common/psd_save.c:1324
+#: ../plug-ins/common/psd_save.c:1366
 #, c-format
 msgid ""
 "Unable to save '%s'.  The psd file format does not support images with "
@@ -6441,19 +6445,19 @@ msgstr "_Desplazamiento..."
 msgid "Shifting..."
 msgstr "Desplazando..."
 
-#: ../plug-ins/common/shift.c:349
+#: ../plug-ins/common/shift.c:360
 msgid "Shift"
 msgstr "Desplazar"
 
-#: ../plug-ins/common/shift.c:373
+#: ../plug-ins/common/shift.c:384
 msgid "Shift _horizontally"
 msgstr "Desplazar _horizontalmente"
 
-#: ../plug-ins/common/shift.c:374
+#: ../plug-ins/common/shift.c:387
 msgid "Shift _vertically"
 msgstr "Desplazar _verticalmente"
 
-#: ../plug-ins/common/shift.c:404
+#: ../plug-ins/common/shift.c:418
 msgid "Shift _amount:"
 msgstr "C_antidad de desplazamiento:"
 
@@ -7051,23 +7055,23 @@ msgstr "Formateado de datos"
 msgid "RunLength Encoded"
 msgstr "Codificación RunLenght"
 
-#: ../plug-ins/common/svg.c:136
+#: ../plug-ins/common/svg.c:137
 msgid "Scalable SVG image"
 msgstr "Imagen escalable SVG"
 
-#: ../plug-ins/common/svg.c:313 ../plug-ins/common/svg.c:696
+#: ../plug-ins/common/svg.c:314 ../plug-ins/common/svg.c:714
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../plug-ins/common/svg.c:317
+#: ../plug-ins/common/svg.c:318
 msgid "Rendering SVG..."
 msgstr "Renderizando SVG..."
 
-#: ../plug-ins/common/svg.c:327
+#: ../plug-ins/common/svg.c:328
 msgid "Rendered SVG"
 msgstr "SVG renderizado"
 
-#: ../plug-ins/common/svg.c:492
+#: ../plug-ins/common/svg.c:511
 msgid ""
 "SVG file does not\n"
 "specify a size!"
@@ -7075,52 +7079,52 @@ msgstr ""
 "¡El archivo SVG no especifica\n"
 "un tamaño!"
 
-#: ../plug-ins/common/svg.c:498 ../plug-ins/common/wmf.c:342
+#: ../plug-ins/common/svg.c:517 ../plug-ins/common/wmf.c:342
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/svg.c:703
+#: ../plug-ins/common/svg.c:721
 msgid "Render Scalable Vector Graphics"
 msgstr "Renderizar gráfico vectorial escalable"
 
-#: ../plug-ins/common/svg.c:767 ../plug-ins/common/wmf.c:554
+#: ../plug-ins/common/svg.c:785 ../plug-ins/common/wmf.c:554
 #: ../plug-ins/print/gimp_main_window.c:1009
 #: ../plug-ins/print/gimp_main_window.c:1212
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../plug-ins/common/svg.c:841 ../plug-ins/common/wmf.c:628
+#: ../plug-ins/common/svg.c:859 ../plug-ins/common/wmf.c:628
 msgid "_X ratio:"
 msgstr "Ratio _X:"
 
-#: ../plug-ins/common/svg.c:863 ../plug-ins/common/wmf.c:650
+#: ../plug-ins/common/svg.c:881 ../plug-ins/common/wmf.c:650
 msgid "_Y ratio:"
 msgstr "Ratio _Y:"
 
-#: ../plug-ins/common/svg.c:877 ../plug-ins/common/wmf.c:664
+#: ../plug-ins/common/svg.c:895 ../plug-ins/common/wmf.c:664
 msgid "Constrain aspect ratio"
 msgstr "Restringir la proporción"
 
-#: ../plug-ins/common/svg.c:888 ../plug-ins/common/wmf.c:675
+#: ../plug-ins/common/svg.c:906 ../plug-ins/common/wmf.c:675
 #, c-format
 msgid "pixels/%a"
 msgstr "píxeles/%a"
 
 #. Path Import
-#: ../plug-ins/common/svg.c:908
+#: ../plug-ins/common/svg.c:926
 msgid "Import _paths"
 msgstr "Importar _rutas"
 
-#: ../plug-ins/common/svg.c:914
+#: ../plug-ins/common/svg.c:932
 msgid ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Importar los elementos de la ruta del SVG para que puedan ser utilizados con "
 "la herramienta de ruta de El GIMP"
 
-#: ../plug-ins/common/svg.c:927
+#: ../plug-ins/common/svg.c:945
 msgid "Merge imported paths"
 msgstr "Combinar las rutas importadas"
 
@@ -7464,11 +7468,11 @@ msgstr "Editor de unidades"
 msgid "_Unsharp Mask..."
 msgstr "Máscara de _desenfoque...[Unsharp]"
 
-#: ../plug-ins/common/unsharp.c:468
+#: ../plug-ins/common/unsharp.c:469
 msgid "Merging..."
 msgstr "Mezclando..."
 
-#: ../plug-ins/common/unsharp.c:635
+#: ../plug-ins/common/unsharp.c:636
 msgid "Unsharp Mask"
 msgstr "Máscara de desenfoque"
 
@@ -8839,11 +8843,10 @@ msgstr ""
 "Se produjo un error al intentar guardar la figura como un parásito: no se "
 "puede adjuntar un parásito a un dibujable.\n"
 
-#: ../plug-ins/gfig/gfig.c:747
+#: ../plug-ins/gfig/gfig.c:752
 #, c-format
-msgid "Error trying to open temp file '%s'for parasite loading.\n"
-msgstr ""
-"Erro al intentar abrir el archivo temporal «%s» para la carga de parásitos.\n"
+msgid "Error trying to open temporary file '%s' for parasite loading: %s"
+msgstr "Error al intentar abrir el archivo temporal «%s» para la carga de parásitos: %s"
 
 #: ../plug-ins/gflare/gflare.c:560
 msgid "Addition"
@@ -11497,87 +11500,87 @@ msgstr "_Rotación de mapa de color"
 msgid "Rotating the colormap..."
 msgstr "Rotando el mapa de color..."
 
-#: ../plug-ins/rcm/rcm_dialog.c:119
+#: ../plug-ins/rcm/rcm_dialog.c:122
 msgid "Original"
 msgstr "Original"
 
-#: ../plug-ins/rcm/rcm_dialog.c:133
+#: ../plug-ins/rcm/rcm_dialog.c:140
 msgid "Rotated"
 msgstr "Rotado"
 
-#: ../plug-ins/rcm/rcm_dialog.c:147
+#: ../plug-ins/rcm/rcm_dialog.c:158
 msgid "Continuous update"
 msgstr "Actualización continua"
 
-#: ../plug-ins/rcm/rcm_dialog.c:160
+#: ../plug-ins/rcm/rcm_dialog.c:171
 msgid "Area:"
 msgstr "Área:"
 
-#: ../plug-ins/rcm/rcm_dialog.c:164
+#: ../plug-ins/rcm/rcm_dialog.c:175
 msgid "Entire Layer"
 msgstr "Capa completa"
 
-#: ../plug-ins/rcm/rcm_dialog.c:166
+#: ../plug-ins/rcm/rcm_dialog.c:177
 msgid "Context"
 msgstr "Contexto"
 
 #. spinbutton 1
-#: ../plug-ins/rcm/rcm_dialog.c:291 ../plug-ins/rcm/rcm_dialog.c:369
+#: ../plug-ins/rcm/rcm_dialog.c:302 ../plug-ins/rcm/rcm_dialog.c:380
 msgid "From"
 msgstr "Desde"
 
 #. spinbutton 2
-#: ../plug-ins/rcm/rcm_dialog.c:317 ../plug-ins/rcm/rcm_dialog.c:370
+#: ../plug-ins/rcm/rcm_dialog.c:328 ../plug-ins/rcm/rcm_dialog.c:381
 msgid "To"
 msgstr "a"
 
 #. * Gray: Operation-Mode *
-#: ../plug-ins/rcm/rcm_dialog.c:506
+#: ../plug-ins/rcm/rcm_dialog.c:517
 msgid "Gray Mode"
 msgstr "Modo de gris"
 
 #. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:515
+#: ../plug-ins/rcm/rcm_dialog.c:526
 msgid "Treat as this"
 msgstr "Tratar como éste"
 
-#: ../plug-ins/rcm/rcm_dialog.c:527
+#: ../plug-ins/rcm/rcm_dialog.c:538
 msgid "Change to this"
 msgstr "Cambiar a éste"
 
 #. * Gray: What is gray? *
-#: ../plug-ins/rcm/rcm_dialog.c:540
+#: ../plug-ins/rcm/rcm_dialog.c:551
 msgid "Gray Threshold"
 msgstr "Umbral de gris"
 
 #. * Misc: Used unit selection *
-#: ../plug-ins/rcm/rcm_dialog.c:579 ../plug-ins/rcm/rcm_dialog.c:683
+#: ../plug-ins/rcm/rcm_dialog.c:590 ../plug-ins/rcm/rcm_dialog.c:694
 msgid "Units"
 msgstr "Unidades"
 
 #. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:588
+#: ../plug-ins/rcm/rcm_dialog.c:599
 msgid "Radians"
 msgstr "Radianes"
 
-#: ../plug-ins/rcm/rcm_dialog.c:600
+#: ../plug-ins/rcm/rcm_dialog.c:611
 msgid "Radians/Pi"
 msgstr "Radiantes/PI"
 
-#: ../plug-ins/rcm/rcm_dialog.c:612
+#: ../plug-ins/rcm/rcm_dialog.c:623
 msgid "Degrees"
 msgstr "Grados"
 
 #. Create dialog
-#: ../plug-ins/rcm/rcm_dialog.c:645
+#: ../plug-ins/rcm/rcm_dialog.c:656
 msgid "Colormap Rotation"
 msgstr "Rotación de mapa de color"
 
-#: ../plug-ins/rcm/rcm_dialog.c:677
+#: ../plug-ins/rcm/rcm_dialog.c:688
 msgid "Main Options"
 msgstr "Opciones principales"
 
-#: ../plug-ins/rcm/rcm_dialog.c:680
+#: ../plug-ins/rcm/rcm_dialog.c:691
 msgid "Gray Options"
 msgstr "Opciones de gris"
 
@@ -11787,6 +11790,9 @@ msgstr "Error: No se pudo leer el archivo de propiedades XJT «%s»."
 msgid "Error: XJT property file '%s' is empty."
 msgstr "Error: El archivo de propiedades XJT «%s» está vacío."
 
+#~ msgid "Convert the image to RGB first!"
+#~ msgstr "¡Convierta la imagen a RGB primero!"
+
 #~ msgid "Before and After"
 #~ msgstr "Antes y después"
 
diff --git a/po-plug-ins/eu.gmo b/po-plug-ins/eu.gmo
index a7ad6ad68f48a964e61287585e3ef24c9e9fca58..46db6cb6890dd88978a1f08f94f32757065cec76 100644
GIT binary patch
literal 174470
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

delta 46556
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, 2004.
-# Iñaki Larrañaga Murgoitio , 2004.
+# Iñaki Larrañaga Murgoitio , 2005, 2006.
+# Iñaki Larrañaga Murgoitio , 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: eu3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-08 12:28+0200\n"
-"PO-Revision-Date: 2004-04-06 19:23+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio \n"
+"POT-Creation-Date: 2006-04-20 16:26+0000\n"
+"PO-Revision-Date: 2006-04-20 16:58+0000\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.0.2\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:523
 #: ../plug-ins/gfig/gfig-dialog.c:283 ../plug-ins/gflare/gflare.c:891
@@ -45,8 +49,7 @@ msgstr "Aurrebista denbora errealean"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:615
 msgid "If you enable this option the preview will be redrawn automatically"
-msgstr ""
-"Aukera hau gaitzen baduzu, aurrebista automatikoki berriro marraztuko da"
+msgstr "Aukera hau gaitzen baduzu, aurrebista automatikoki berriro marraztuko da"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:618
 msgid "Redraw"
@@ -234,7 +237,7 @@ msgstr "Kolorearen dentsitatea"
 #. to figure out which button the user pushed, etc.
 #. Not my design, please don't blame me -- njl
 #: ../plug-ins/FractalExplorer/Dialogs.c:928 ../plug-ins/common/compose.c:128
-#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:217
+#: ../plug-ins/common/compose.c:138 ../plug-ins/common/fp.c:228
 msgid "Red:"
 msgstr "Gorria:"
 
@@ -243,7 +246,7 @@ msgid "Change the intensity of the red channel"
 msgstr "Aldatu kanal gorriaren intentsitatea"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:938 ../plug-ins/common/compose.c:129
-#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:218
+#: ../plug-ins/common/compose.c:139 ../plug-ins/common/fp.c:229
 msgid "Green:"
 msgstr "Berdea:"
 
@@ -252,7 +255,7 @@ msgid "Change the intensity of the green channel"
 msgstr "Aldatu kanal berdearen intentsitatea"
 
 #: ../plug-ins/FractalExplorer/Dialogs.c:948 ../plug-ins/common/compose.c:130
-#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:219
+#: ../plug-ins/common/compose.c:140 ../plug-ins/common/fp.c:230
 msgid "Blue:"
 msgstr "Urdina:"
 
@@ -384,17 +387,17 @@ msgstr "_Fraktalak"
 #: ../plug-ins/common/compressor.c:535 ../plug-ins/common/curve_bend.c:861
 #: ../plug-ins/common/dicom.c:647 ../plug-ins/common/gbr.c:586
 #: ../plug-ins/common/gif.c:994 ../plug-ins/common/gih.c:1254
-#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1498
+#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/jpeg.c:1499
 #: ../plug-ins/common/mng.c:558 ../plug-ins/common/mng.c:946
 #: ../plug-ins/common/pat.c:433 ../plug-ins/common/pcx.c:585
 #: ../plug-ins/common/pix.c:515 ../plug-ins/common/png.c:1178
 #: ../plug-ins/common/pnm.c:809 ../plug-ins/common/postscript.c:1123
-#: ../plug-ins/common/psd_save.c:1336 ../plug-ins/common/raw.c:517
+#: ../plug-ins/common/psd_save.c:1378 ../plug-ins/common/raw.c:517
 #: ../plug-ins/common/raw.c:544 ../plug-ins/common/spheredesigner.c:2088
 #: ../plug-ins/common/sunras.c:513 ../plug-ins/common/tga.c:1030
 #: ../plug-ins/common/tiff.c:1825 ../plug-ins/common/xbm.c:996
 #: ../plug-ins/common/xwd.c:577 ../plug-ins/fits/fits.c:450
-#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:783
+#: ../plug-ins/flame/flame.c:443 ../plug-ins/gfig/gfig.c:788
 #: ../plug-ins/gfli/gfli.c:715 ../plug-ins/ifscompose/ifscompose.c:2395
 #: ../plug-ins/winicon/icosave.c:243 ../plug-ins/xjt/xjt.c:1263
 #: ../plug-ins/xjt/xjt.c:1702
@@ -423,15 +426,15 @@ msgstr "Gorde parametro fraktalak"
 #: ../plug-ins/common/channel_mixer.c:966 ../plug-ins/common/curve_bend.c:913
 #: ../plug-ins/common/dicom.c:290 ../plug-ins/common/gbr.c:327
 #: ../plug-ins/common/gifload.c:296 ../plug-ins/common/gih.c:648
-#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2607
+#: ../plug-ins/common/jpeg.c:946 ../plug-ins/common/jpeg.c:2612
 #: ../plug-ins/common/mng.c:1117 ../plug-ins/common/pat.c:300
 #: ../plug-ins/common/pcx.c:302 ../plug-ins/common/pix.c:332
 #: ../plug-ins/common/png.c:674 ../plug-ins/common/pnm.c:432
-#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1759
+#: ../plug-ins/common/postscript.c:990 ../plug-ins/common/psd.c:1780
 #: ../plug-ins/common/psp.c:1457 ../plug-ins/common/raw.c:230
 #: ../plug-ins/common/raw.c:635 ../plug-ins/common/spheredesigner.c:1990
-#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:311
-#: ../plug-ins/common/svg.c:694 ../plug-ins/common/tga.c:415
+#: ../plug-ins/common/sunras.c:382 ../plug-ins/common/svg.c:312
+#: ../plug-ins/common/svg.c:712 ../plug-ins/common/tga.c:415
 #: ../plug-ins/common/tiff.c:510 ../plug-ins/common/xbm.c:719
 #: ../plug-ins/common/xwd.c:422 ../plug-ins/faxg3/faxg3.c:220
 #: ../plug-ins/fits/fits.c:337 ../plug-ins/flame/flame.c:412
@@ -454,9 +457,8 @@ msgid "'%s' is corrupt. Line %d Option section incorrect"
 msgstr "'%s' hondatuta dago. %d lerroko Aukera sekzioa okerra da"
 
 #: ../plug-ins/FractalExplorer/FractalExplorer.c:269
-#, fuzzy
 msgid "_Fractal Explorer..."
-msgstr "Gehitu FractalExplorer-en bide-izena"
+msgstr "_Fraktal-arakatzailea..."
 
 #: ../plug-ins/FractalExplorer/FractalExplorer.c:400
 msgid "Rendering Fractal..."
@@ -528,9 +530,8 @@ msgid "Lighting Effects..."
 msgstr "Argiztatze-efektuak..."
 
 #: ../plug-ins/Lighting/lighting_main.c:197
-#, fuzzy
 msgid "_Lighting Effects..."
-msgstr "Argiztatze-efektuak..."
+msgstr "_Argiztatze-efektuak..."
 
 #. General options
 #: ../plug-ins/Lighting/lighting_ui.c:261
@@ -538,7 +539,6 @@ msgid "General Options"
 msgstr "Aukera orokorrak"
 
 #: ../plug-ins/Lighting/lighting_ui.c:269
-#, fuzzy
 msgid "T_ransparent background"
 msgstr "Atzeko plano ga_rdena"
 
@@ -547,7 +547,6 @@ msgid "Make destination image transparent where bump height is zero"
 msgstr "Helburuko irudia garden bihurtu erliebearen altuera zero den lekuetan"
 
 #: ../plug-ins/Lighting/lighting_ui.c:282
-#, fuzzy
 msgid "Cre_ate new image"
 msgstr "Sortu irudi berri_a"
 
@@ -557,7 +556,6 @@ msgid "Create a new image when applying filter"
 msgstr "Sortu irudi berria iragazkia aplikatzean"
 
 #: ../plug-ins/Lighting/lighting_ui.c:294
-#, fuzzy
 msgid "High _Quality preview"
 msgstr "_Kalitate handiko aurrebista"
 
@@ -571,34 +569,28 @@ msgid "Light Settings"
 msgstr "Argi-ezarpenak"
 
 #: ../plug-ins/Lighting/lighting_ui.c:344
-#, fuzzy
 msgid "Light 1"
-msgstr "Zuria"
+msgstr "1. argia"
 
 #: ../plug-ins/Lighting/lighting_ui.c:345
-#, fuzzy
 msgid "Light 2"
-msgstr "Zuria"
+msgstr "2. argia"
 
 #: ../plug-ins/Lighting/lighting_ui.c:346
-#, fuzzy
 msgid "Light 3"
-msgstr "Zuria"
+msgstr "3. argia"
 
 #: ../plug-ins/Lighting/lighting_ui.c:347
-#, fuzzy
 msgid "Light 4"
-msgstr "Zuria"
+msgstr "4. argia"
 
 #: ../plug-ins/Lighting/lighting_ui.c:348
-#, fuzzy
 msgid "Light 5"
-msgstr "Zuria"
+msgstr "5. argia"
 
 #: ../plug-ins/Lighting/lighting_ui.c:349
-#, fuzzy
 msgid "Light 6"
-msgstr "Zuria"
+msgstr "6. argia"
 
 #. row labels
 #: ../plug-ins/Lighting/lighting_ui.c:358
@@ -607,9 +599,8 @@ msgid "Type:"
 msgstr "Mota:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:363
-#, fuzzy
 msgid "Color:"
-msgstr "Ko_lorea:"
+msgstr "Kolorea:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:370
 msgid "Directional"
@@ -626,7 +617,6 @@ msgstr "Aplikatu beharreko argi-iturriaren mota"
 
 #: ../plug-ins/Lighting/lighting_ui.c:388
 #: ../plug-ins/MapObject/mapobject_ui.c:679
-#, fuzzy
 msgid "Select lightsource color"
 msgstr "Hautatu argi-iturriaren kolorea"
 
@@ -636,14 +626,12 @@ msgid "Set light source color"
 msgstr "Ezarri argi-iturriaren kolorea"
 
 #: ../plug-ins/Lighting/lighting_ui.c:408
-#, fuzzy
 msgid "_Intensity:"
-msgstr "Intentsitatea"
+msgstr "_Intentsitatea:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:414
-#, fuzzy
 msgid "Light intensity"
-msgstr "Jatorrizko intentsitatea"
+msgstr "Argiaren intentsitatea"
 
 #: ../plug-ins/Lighting/lighting_ui.c:417
 #: ../plug-ins/MapObject/mapobject_ui.c:694
@@ -739,24 +727,20 @@ msgid "Light source Z direction in XYZ space"
 msgstr "Argi-iturriaren Z noranzkoa XYZ espazioan"
 
 #: ../plug-ins/Lighting/lighting_ui.c:502
-#, fuzzy
 msgid "I_solate"
-msgstr "_Hustu"
+msgstr "I_solatu"
 
 #: ../plug-ins/Lighting/lighting_ui.c:512
-#, fuzzy
 msgid "Lighting preset:"
-msgstr "Argiztatze-efektuak"
+msgstr "Argiztatze-aurrezarpena:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:558
-#, fuzzy
 msgid "Material properties"
-msgstr "Testuraren propietateak"
+msgstr "Materialaren propietateak"
 
 #: ../plug-ins/Lighting/lighting_ui.c:576
-#, fuzzy
 msgid "_Glowing:"
-msgstr "Fluxua"
+msgstr "_Dirdira:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:592
 #: ../plug-ins/MapObject/mapobject_ui.c:859
@@ -766,20 +750,17 @@ msgstr ""
 "kantitatea"
 
 #: ../plug-ins/Lighting/lighting_ui.c:605
-#, fuzzy
 msgid "_Bright:"
 msgstr "_Distira:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:621
 #: ../plug-ins/MapObject/mapobject_ui.c:888
 msgid "Intensity of original color when lit by a light source"
-msgstr ""
-"Jatorrizko kolorearen intentsitatea, argi-iturri batek argiztatzen duenean"
+msgstr "Jatorrizko kolorearen intentsitatea, argi-iturri batek argiztatzen duenean"
 
 #: ../plug-ins/Lighting/lighting_ui.c:634
-#, fuzzy
 msgid "_Shiny:"
-msgstr "_Sinua"
+msgstr "_Distiratsua:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:650
 #: ../plug-ins/MapObject/mapobject_ui.c:960
@@ -788,7 +769,7 @@ msgstr "Islek zein intentsitate izango duten kontrolatzen du"
 
 #: ../plug-ins/Lighting/lighting_ui.c:662
 msgid "_Polished:"
-msgstr ""
+msgstr "_Leunduta:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:678
 #: ../plug-ins/MapObject/mapobject_ui.c:989
@@ -798,10 +779,9 @@ msgstr "Balio handiekin islak enfokatuago egongo dira"
 #. Metallic
 #: ../plug-ins/Lighting/lighting_ui.c:687
 msgid "_Metallic"
-msgstr ""
+msgstr "_Metalikoa"
 
 #: ../plug-ins/Lighting/lighting_ui.c:723
-#, fuzzy
 msgid "E_nable bump mapping"
 msgstr "_Gaitu erliebe-mapatzea"
 
@@ -810,7 +790,6 @@ msgid "Enable/disable bump-mapping (image depth)"
 msgstr "Gaitu/Desgaitu erliebe-mapatzea (irudi-sakonera)"
 
 #: ../plug-ins/Lighting/lighting_ui.c:755
-#, fuzzy
 msgid "Bumpm_ap image:"
 msgstr "Er_liebe-mapatzearen irudia:"
 
@@ -839,7 +818,6 @@ msgid "Cu_rve:"
 msgstr "Ku_rba:"
 
 #: ../plug-ins/Lighting/lighting_ui.c:776
-#, fuzzy
 msgid "Ma_ximum height:"
 msgstr "Ge_hienezko altuera:"
 
@@ -848,7 +826,6 @@ msgid "Maximum height for bumps"
 msgstr "Erliebeen gehienezko altuera"
 
 #: ../plug-ins/Lighting/lighting_ui.c:811
-#, fuzzy
 msgid "E_nable environment mapping"
 msgstr "Gai_tu ingurune-mapatzea"
 
@@ -857,7 +834,6 @@ msgid "Enable/disable environment-mapping (reflection)"
 msgstr "Gaitu/Desgaitu ingurune-mapatzea (islatzea)"
 
 #: ../plug-ins/Lighting/lighting_ui.c:847
-#, fuzzy
 msgid "En_vironment image:"
 msgstr "Ing_urune-irudia:"
 
@@ -911,38 +887,32 @@ msgid "Enable/disable real time preview of changes"
 msgstr "Gaitu/Desgaitu aldaketen aurrebista denbora errealean"
 
 #: ../plug-ins/Lighting/lighting_ui.c:1044
-#, fuzzy
 msgid "Save Lighting Preset"
-msgstr "Argiztatze-efektuak"
+msgstr "Gorde argiztatze-aurrezarpena"
 
 #: ../plug-ins/Lighting/lighting_ui.c:1177
-#, fuzzy
 msgid "Load Lighting Preset"
-msgstr "Argiztatze-efektuak"
+msgstr "Kargatu argiztatze-aurrezarpena"
 
 #: ../plug-ins/MapObject/mapobject_apply.c:273
-#, fuzzy
 msgid "Map to Plane..."
-msgstr "Laplace..."
+msgstr "Mapa planora..."
 
 #: ../plug-ins/MapObject/mapobject_apply.c:276
 msgid "Map to Sphere..."
-msgstr ""
+msgstr "Mapa esferara..."
 
 #: ../plug-ins/MapObject/mapobject_apply.c:279
-#, fuzzy
 msgid "Map to Box..."
-msgstr "Geh RGB..."
+msgstr "Mapa kutxara..."
 
 #: ../plug-ins/MapObject/mapobject_apply.c:282
-#, fuzzy
 msgid "Map to Cylinder..."
-msgstr "Zilindroa"
+msgstr "Mapa zilindrora..."
 
 #: ../plug-ins/MapObject/mapobject_main.c:199
-#, fuzzy
 msgid "Map _Object..."
-msgstr "Mapatu objektuari"
+msgstr "Mapatu _objektua..."
 
 #: ../plug-ins/MapObject/mapobject_ui.c:248
 #: ../plug-ins/MapObject/mapobject_ui.c:1340
@@ -956,7 +926,6 @@ msgstr "_Zilindroa"
 
 #. General options
 #: ../plug-ins/MapObject/mapobject_ui.c:496
-#, fuzzy
 msgid "General options"
 msgstr "Aukera orokorrak"
 
@@ -985,7 +954,6 @@ msgid "Type of object to map to"
 msgstr "Zein objektu-motatara mapatu behar den"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:532
-#, fuzzy
 msgid "Transparent background"
 msgstr "Atzeko plano gardena"
 
@@ -994,7 +962,6 @@ msgid "Make image transparent outside object"
 msgstr "Irudia garden bihurtu objektutik kanpo"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:545
-#, fuzzy
 msgid "Tile source image"
 msgstr "Mosaikoa sorburuko irudiarekin "
 
@@ -1003,12 +970,10 @@ msgid "Tile source image: useful for infinite planes"
 msgstr "Mosaikoa sorburuko irudiarekin: erabilgarria plano infinituetarako"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:559
-#, fuzzy
 msgid "Create new image"
 msgstr "Sortu irudi berria"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:578
-#, fuzzy
 msgid "Enable _antialiasing"
 msgstr "Gaitu _antialiasing-a"
 
@@ -1024,10 +989,9 @@ msgstr "_Sakonera:"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:605
 msgid "Antialiasing quality. Higher is better, but slower"
-msgstr ""
-"Antialiasing kalitatea. Kalitate handia hobea da, baina mantsoagoa ere bai"
+msgstr "Antialiasing kalitatea. Kalitate handia hobea da, baina mantsoagoa ere bai"
 
-#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:691
+#: ../plug-ins/MapObject/mapobject_ui.c:614 ../plug-ins/common/unsharp.c:692
 #: ../plug-ins/common/wind.c:993 ../plug-ins/imagemap/imap_preferences.c:539
 msgid "_Threshold:"
 msgstr "_Muga:"
@@ -1037,27 +1001,22 @@ msgid "Stop when pixel differences are smaller than this value"
 msgstr "Gelditu pixel-desberdintasunak balio hau baino txikiagoak direnean"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:658
-#, fuzzy
 msgid "Point light"
 msgstr "Puntu-argia"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:659
-#, fuzzy
 msgid "Directional light"
 msgstr "Direkziozko argia"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:660
-#, fuzzy
 msgid "No light"
 msgstr "Argirik ez"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:674
-#, fuzzy
 msgid "Lightsource type:"
 msgstr "Argi-iturriaren mota:"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:684
-#, fuzzy
 msgid "Lightsource color:"
 msgstr "Argi-iturriaren kolorea:"
 
@@ -1084,8 +1043,7 @@ msgstr "Islagarritasuna"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:931
 msgid "Higher values makes the object reflect more light (appear lighter)"
-msgstr ""
-"Balio handiekin objektuak argi gehiago islatzen du (argiago ikusten da)"
+msgstr "Balio handiekin objektuak argi gehiago islatzen du (argiago ikusten da)"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:945
 msgid "Specular:"
@@ -1233,7 +1191,6 @@ msgid "Zoom in (make image bigger)"
 msgstr "Zoom-a handiagotu (irudi handiagoa)"
 
 #: ../plug-ins/MapObject/mapobject_ui.c:1455
-#, fuzzy
 msgid "Show preview _wireframe"
 msgstr "Erakutsi aurrebista _burdin-hariz"
 
@@ -1243,7 +1200,7 @@ msgstr "Erakutsi/Ezkutatu aurrebistaren burdin-haria"
 
 #: ../plug-ins/bmp/bmp.c:120 ../plug-ins/bmp/bmp.c:139
 msgid "Windows BMP image"
-msgstr ""
+msgstr "Windows-eko BMP irudia"
 
 #: ../plug-ins/bmp/bmpread.c:86
 msgid "Bad colormap"
@@ -1261,7 +1218,7 @@ msgstr "Kolore-mapa okerra"
 #: ../plug-ins/common/jpeg.c:953 ../plug-ins/common/pat.c:305
 #: ../plug-ins/common/pcx.c:307 ../plug-ins/common/pix.c:338
 #: ../plug-ins/common/png.c:681 ../plug-ins/common/pnm.c:437
-#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1764
+#: ../plug-ins/common/postscript.c:996 ../plug-ins/common/psd.c:1785
 #: ../plug-ins/common/raw.c:640 ../plug-ins/common/sunras.c:436
 #: ../plug-ins/common/tga.c:420 ../plug-ins/common/tiff.c:515
 #: ../plug-ins/common/wmf.c:952 ../plug-ins/common/xbm.c:724
@@ -1291,7 +1248,7 @@ msgstr "Errorea BMP fitxategi-goiburua '%s'tik irakurtzean"
 
 #: ../plug-ins/bmp/bmpread.c:450 ../plug-ins/bmp/bmpread.c:485
 msgid "Unrecognized or invalid BMP compression format."
-msgstr ""
+msgstr "BMP konpresio-formatu ezezagune edo baliogabea."
 
 #.
 #. * Create the "background" layer to hold the image...
@@ -1301,10 +1258,10 @@ msgstr ""
 #: ../plug-ins/common/compose.c:625 ../plug-ins/common/decompose.c:595
 #: ../plug-ins/common/dicom.c:442 ../plug-ins/common/film.c:946
 #: ../plug-ins/common/gifload.c:864 ../plug-ins/common/jpeg.c:1113
-#: ../plug-ins/common/jpeg.c:2474 ../plug-ins/common/pcx.c:334
+#: ../plug-ins/common/jpeg.c:2479 ../plug-ins/common/pcx.c:334
 #: ../plug-ins/common/pcx.c:340 ../plug-ins/common/pix.c:374
 #: ../plug-ins/common/png.c:808 ../plug-ins/common/pnm.c:517
-#: ../plug-ins/common/psd.c:2174 ../plug-ins/common/raw.c:677
+#: ../plug-ins/common/psd.c:2204 ../plug-ins/common/raw.c:677
 #: ../plug-ins/common/smooth_palette.c:257 ../plug-ins/common/sunras.c:925
 #: ../plug-ins/common/tga.c:929 ../plug-ins/common/tiff.c:848
 #: ../plug-ins/common/tile.c:266 ../plug-ins/common/winclipboard.c:579
@@ -1332,10 +1289,10 @@ msgstr "Ezin izan da irudi-mota ezezagunekin lan egin"
 #: ../plug-ins/bmp/bmpwrite.c:209 ../plug-ins/common/CEL.c:582
 #: ../plug-ins/common/gbr.c:591 ../plug-ins/common/gif.c:1001
 #: ../plug-ins/common/gih.c:1259 ../plug-ins/common/gtm.c:245
-#: ../plug-ins/common/jpeg.c:1453 ../plug-ins/common/pat.c:438
+#: ../plug-ins/common/jpeg.c:1454 ../plug-ins/common/pat.c:438
 #: ../plug-ins/common/pcx.c:545 ../plug-ins/common/pix.c:521
 #: ../plug-ins/common/png.c:1185 ../plug-ins/common/pnm.c:814
-#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1341
+#: ../plug-ins/common/postscript.c:1128 ../plug-ins/common/psd_save.c:1383
 #: ../plug-ins/common/sunras.c:518 ../plug-ins/common/tga.c:1035
 #: ../plug-ins/common/tiff.c:1830 ../plug-ins/common/xbm.c:1001
 #: ../plug-ins/common/xpm.c:628 ../plug-ins/common/xwd.c:582
@@ -1346,108 +1303,89 @@ msgstr "Ezin izan da irudi-mota ezezagunekin lan egin"
 msgid "Saving '%s'..."
 msgstr "'%s' fitxategia gordetzen..."
 
-#: ../plug-ins/bmp/bmpwrite.c:554
+#: ../plug-ins/bmp/bmpwrite.c:556
 msgid "Save as BMP"
 msgstr "Gorde BMP gisa"
 
-#: ../plug-ins/bmp/bmpwrite.c:568
+#: ../plug-ins/bmp/bmpwrite.c:570
 msgid "_RLE encoded"
 msgstr "_RLE kodetzea"
 
 #: ../plug-ins/common/AlienMap2.c:145
-#, fuzzy
 msgid "_Modify red channel"
-msgstr "_Aldatu kanal gorria/�bardura"
+msgstr "_Aldatu kanal gorria"
 
 #: ../plug-ins/common/AlienMap2.c:145
-#, fuzzy
 msgid "_Modify hue channel"
-msgstr "_Aldatu kanal gorria/�bardura"
+msgstr "_Aldatu ñabardura-kanala"
 
 #: ../plug-ins/common/AlienMap2.c:146
-#, fuzzy
 msgid "Mo_dify green channel"
-msgstr "A_ldatu kanal berdea/saturazioa"
+msgstr "A_ldatu kanal berdea"
 
 #: ../plug-ins/common/AlienMap2.c:146
-#, fuzzy
 msgid "Mo_dify saturation channel"
-msgstr "A_ldatu kanal berdea/saturazioa"
+msgstr "A_ldatu saturazio-kanala"
 
 #: ../plug-ins/common/AlienMap2.c:147
-#, fuzzy
 msgid "Mod_ify blue channel"
-msgstr "Al_datu urdina/luminantzia kanala"
+msgstr "Al_datu kanal urdina"
 
 #: ../plug-ins/common/AlienMap2.c:147
-#, fuzzy
 msgid "Mod_ify luminosity channel"
-msgstr "Al_datu urdina/luminantzia kanala"
+msgstr "Al_datu luminantzia kanala"
 
 #: ../plug-ins/common/AlienMap2.c:152
-#, fuzzy
 msgid "Red _frequency:"
-msgstr "G/T _maiztasuna:"
+msgstr "Gorriaren _maiztasuna:"
 
 #: ../plug-ins/common/AlienMap2.c:152
-#, fuzzy
 msgid "Hue _frequency:"
-msgstr "G/T _maiztasuna:"
+msgstr "Ñabarduraren _maiztasuna:"
 
 #: ../plug-ins/common/AlienMap2.c:153
-#, fuzzy
 msgid "Green fr_equency:"
-msgstr "B/S maizta_suna:"
+msgstr "Berdearen maizta_suna:"
 
 #: ../plug-ins/common/AlienMap2.c:153
-#, fuzzy
 msgid "Saturation fr_equency:"
-msgstr "Saturazioa:"
+msgstr "Saturazioaren maizta_suna:"
 
 #: ../plug-ins/common/AlienMap2.c:154
-#, fuzzy
 msgid "Blue freq_uency:"
-msgstr "U/D mai_ztasuna:"
+msgstr "Urdinaren mai_ztasuna:"
 
 #: ../plug-ins/common/AlienMap2.c:154
-#, fuzzy
 msgid "Luminosity freq_uency:"
-msgstr "U/D mai_ztasuna:"
+msgstr "Luminantzia-mai_ztasuna:"
 
 #: ../plug-ins/common/AlienMap2.c:156
-#, fuzzy
 msgid "Red _phaseshift:"
-msgstr "G/T _desfasea:"
+msgstr "Gorriaren _desfasea:"
 
 #: ../plug-ins/common/AlienMap2.c:156
-#, fuzzy
 msgid "Hue _phaseshift:"
-msgstr "G/T _desfasea:"
+msgstr "Ñabarduraren _desfasea:"
 
 #: ../plug-ins/common/AlienMap2.c:157
-#, fuzzy
 msgid "Green ph_aseshift:"
-msgstr "B/S des_fasea:"
+msgstr "Berdearen des_fasea:"
 
 #: ../plug-ins/common/AlienMap2.c:157
-#, fuzzy
 msgid "Saturation ph_aseshift:"
-msgstr "B/S des_fasea:"
+msgstr "Saturazioaren des_fasea:"
 
 #: ../plug-ins/common/AlienMap2.c:158
-#, fuzzy
 msgid "Blue pha_seshift:"
-msgstr "U/D d_esfasea:"
+msgstr "Urdinaren d_esfasea:"
 
 #: ../plug-ins/common/AlienMap2.c:158
-#, fuzzy
 msgid "Luminosity pha_seshift:"
-msgstr "Argitasunaren _muga:"
+msgstr "Argitasunaren de_sfasea:"
 
 #: ../plug-ins/common/AlienMap2.c:193
-#, fuzzy
 msgid "Alien Map _2..."
-msgstr "AlienMap2"
+msgstr "Alien _2. mapa..."
 
 #: ../plug-ins/common/AlienMap2.c:325
 msgid "AlienMap2: Transforming..."
@@ -1460,12 +1398,12 @@ msgstr "AlienMap2"
 #: ../plug-ins/common/AlienMap2.c:438 ../plug-ins/common/AlienMap2.c:462
 #: ../plug-ins/common/AlienMap2.c:486
 msgid "Number of cycles covering full value range"
-msgstr ""
+msgstr "Ziklo-kopurua balioen barruti osoa erabiliz"
 
 #: ../plug-ins/common/AlienMap2.c:450 ../plug-ins/common/AlienMap2.c:474
 #: ../plug-ins/common/AlienMap2.c:498
 msgid "Phase angle, range 0-360"
-msgstr ""
+msgstr "Anguluaren fasea, 0-360 barrutia"
 
 #. Propagate Mode
 #: ../plug-ins/common/AlienMap2.c:512 ../plug-ins/common/hot.c:588
@@ -1474,18 +1412,16 @@ msgid "Mode"
 msgstr "Modua"
 
 #: ../plug-ins/common/AlienMap2.c:516
-#, fuzzy
 msgid "_RGB color model"
-msgstr "_RGB kolore-eredua"
+msgstr "_GBU kolore-eredua"
 
 #: ../plug-ins/common/AlienMap2.c:517
-#, fuzzy
 msgid "_HSL color model"
 msgstr "_HSL kolore-eredua"
 
 #: ../plug-ins/common/CEL.c:112 ../plug-ins/common/CEL.c:130
 msgid "KISS CEL"
-msgstr ""
+msgstr "KISS CEL"
 
 #: ../plug-ins/common/CEL.c:191
 msgid "Load KISS Palette"
@@ -1694,10 +1630,10 @@ msgstr "Ausazkoak hazitik (partekatuak)"
 #: ../plug-ins/gimpressionist/orientation.c:162
 #: ../plug-ins/gimpressionist/size.c:165
 msgid "Hue"
-msgstr "�bardura"
+msgstr "Ñabardura"
 
 #: ../plug-ins/common/CML_explorer.c:303 ../plug-ins/common/CML_explorer.c:311
-#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:548
+#: ../plug-ins/common/decompose.c:144 ../plug-ins/rcm/rcm_dialog.c:559
 msgid "Saturation"
 msgstr "Saturazioa"
 
@@ -1713,43 +1649,39 @@ msgid "(None)"
 msgstr "(bat ere ez)"
 
 #: ../plug-ins/common/CML_explorer.c:470
-#, fuzzy
 msgid "CML _Explorer..."
-msgstr "_CML esploradorea: eboluzionatzen..."
+msgstr "_CML arakatzailea..."
 
 #: ../plug-ins/common/CML_explorer.c:760
 msgid "CML_explorer: evoluting..."
-msgstr "_CML esploradorea: eboluzionatzen..."
+msgstr "_CML arakatzailea: eboluzionatzen..."
 
 #: ../plug-ins/common/CML_explorer.c:1186
 msgid "Coupled-Map-Lattice Explorer"
-msgstr "Coupled-Map-Lattice esploradorea"
+msgstr "Coupled-Map-Lattice arakatzailea"
 
 #: ../plug-ins/common/CML_explorer.c:1225
-#, fuzzy
 msgid "New seed"
 msgstr "Hazi berria"
 
 #: ../plug-ins/common/CML_explorer.c:1236
-#, fuzzy
 msgid "Fix seed"
 msgstr "Hazi finkoa"
 
 #: ../plug-ins/common/CML_explorer.c:1247
-#, fuzzy
 msgid "Random seed"
-msgstr "Ausazko _hazia:"
+msgstr "Ausazko hazia"
 
-#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:655
+#: ../plug-ins/common/CML_explorer.c:1289 ../plug-ins/common/fp.c:699
 #: ../plug-ins/common/lic.c:669
 msgid "_Hue"
-msgstr "_�bardura"
+msgstr "_Ñabardura"
 
 #: ../plug-ins/common/CML_explorer.c:1293
 msgid "Sat_uration"
 msgstr "Sat_urazioa"
 
-#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:663
+#: ../plug-ins/common/CML_explorer.c:1297 ../plug-ins/common/fp.c:707
 msgid "_Value"
 msgstr "_Balioa"
 
@@ -1758,22 +1690,18 @@ msgid "_Advanced"
 msgstr "_Aurreratua"
 
 #: ../plug-ins/common/CML_explorer.c:1316
-#, fuzzy
 msgid "Channel Independent Parameters"
 msgstr "Kanal independenteen parametroak"
 
 #: ../plug-ins/common/CML_explorer.c:1338
-#, fuzzy
 msgid "Initial value:"
 msgstr "Hasierako balioa:"
 
 #: ../plug-ins/common/CML_explorer.c:1344
-#, fuzzy
 msgid "Zoom scale:"
 msgstr "Zoom-eskala:"
 
 #: ../plug-ins/common/CML_explorer.c:1353
-#, fuzzy
 msgid "Start offset:"
 msgstr "Hasierako desplazamendua:"
 
@@ -1786,7 +1714,6 @@ msgid "Seed:"
 msgstr "Hazia:"
 
 #: ../plug-ins/common/CML_explorer.c:1386
-#, fuzzy
 msgid "Switch to \"From seed\" with the last seed"
 msgstr "Aldatu \"Hazitik\" modura azken haziarekin"
 
@@ -1811,18 +1738,15 @@ msgid "Copy Settings"
 msgstr "Kopiatu ezarpenak"
 
 #: ../plug-ins/common/CML_explorer.c:1440
-#, fuzzy
 msgid "Source channel:"
 msgstr "Sorburu-kanala:"
 
 #: ../plug-ins/common/CML_explorer.c:1455
 #: ../plug-ins/common/CML_explorer.c:1503
-#, fuzzy
 msgid "Destination channel:"
 msgstr "Helburuko kanala:"
 
 #: ../plug-ins/common/CML_explorer.c:1459
-#, fuzzy
 msgid "Copy parameters"
 msgstr "Kopiatu parametroak"
 
@@ -1831,7 +1755,6 @@ msgid "Selective Load Settings"
 msgstr "Kargatze selektiboaren ezarpenak"
 
 #: ../plug-ins/common/CML_explorer.c:1488
-#, fuzzy
 msgid "Source channel in file:"
 msgstr "Sorburu-kanala fitxategi honetan:"
 
@@ -1840,7 +1763,6 @@ msgid "_Misc Ops."
 msgstr "_Hainb auk."
 
 #: ../plug-ins/common/CML_explorer.c:1558
-#, fuzzy
 msgid "Function type:"
 msgstr "Funtzio-mota:"
 
@@ -1849,37 +1771,30 @@ msgid "Composition:"
 msgstr "Konposizioa:"
 
 #: ../plug-ins/common/CML_explorer.c:1588
-#, fuzzy
 msgid "Misc arrange:"
 msgstr "Hainb antolaera:"
 
 #: ../plug-ins/common/CML_explorer.c:1592
-#, fuzzy
 msgid "Use cyclic range"
 msgstr "Erabili barruti ziklikoa"
 
 #: ../plug-ins/common/CML_explorer.c:1602
-#, fuzzy
 msgid "Mod. rate:"
 msgstr "Ald. tasa:"
 
 #: ../plug-ins/common/CML_explorer.c:1611
-#, fuzzy
 msgid "Env. sensitivity:"
-msgstr "Ingurunearen sentikortasuna:"
+msgstr "Ing. sentikortasuna:"
 
 #: ../plug-ins/common/CML_explorer.c:1620
-#, fuzzy
 msgid "Diffusion dist.:"
 msgstr "Barreiatze-distantzia:"
 
 #: ../plug-ins/common/CML_explorer.c:1629
-#, fuzzy
 msgid "# of subranges:"
-msgstr "Azpibarruti-kopurua:"
+msgstr "Azpibarrutiena:"
 
 #: ../plug-ins/common/CML_explorer.c:1638
-#, fuzzy
 msgid "P(ower factor):"
 msgstr "P (potentzia-faktorea):"
 
@@ -1888,32 +1803,26 @@ msgid "Parameter k:"
 msgstr "k parametroa:"
 
 #: ../plug-ins/common/CML_explorer.c:1656
-#, fuzzy
 msgid "Range low:"
 msgstr "Behe-barrutia:"
 
 #: ../plug-ins/common/CML_explorer.c:1665
-#, fuzzy
 msgid "Range high:"
 msgstr "Goi-barrutia:"
 
 #: ../plug-ins/common/CML_explorer.c:1677
-#, fuzzy
 msgid "Plot a graph of the settings"
 msgstr "Marraztu ezarpenen grafikoa"
 
 #: ../plug-ins/common/CML_explorer.c:1722
-#, fuzzy
 msgid "Ch. sensitivity:"
 msgstr "Kanalaren sentikortasuna:"
 
 #: ../plug-ins/common/CML_explorer.c:1732
-#, fuzzy
 msgid "Mutation rate:"
 msgstr "Mutazio-tasa:"
 
 #: ../plug-ins/common/CML_explorer.c:1742
-#, fuzzy
 msgid "Mutation dist.:"
 msgstr "Mutazio-distantzia:"
 
@@ -1931,13 +1840,13 @@ msgstr "Gorde parametroak hemen:"
 
 #: ../plug-ins/common/CML_explorer.c:2056
 #: ../plug-ins/common/channel_mixer.c:1052
-#, fuzzy, c-format
+#, c-format
 msgid "Parameters were saved to '%s'"
 msgstr "Parametroak hemen gorde dira: '%s'"
 
 #: ../plug-ins/common/CML_explorer.c:2077
 msgid "CML Explorer: Overwrite File?"
-msgstr ""
+msgstr "CML arakatzailea: gainidatzi fitxategia?"
 
 #: ../plug-ins/common/CML_explorer.c:2091
 #: ../plug-ins/common/channel_mixer.c:1083
@@ -1945,7 +1854,9 @@ msgstr ""
 msgid ""
 "File '%s' exists.\n"
 "Overwrite it?"
-msgstr "%s badago, gainidatzi?"
+msgstr ""
+"%s fitxategia badago.\n"
+"Gainidatzi?"
 
 #: ../plug-ins/common/CML_explorer.c:2140
 msgid "Load Parameters from"
@@ -1967,8 +1878,7 @@ msgstr "Abisua: '%s' ez da formatu zaharreko fitxategia."
 #: ../plug-ins/common/CML_explorer.c:2248
 #, c-format
 msgid "Warning: '%s' is a parameter file for newer CML_explorer than me."
-msgstr ""
-"Abisua: '%s' ni baino CML _esploradore berriagorako parametro-fitxategia da."
+msgstr "Abisua: '%s' ni baino CML _esploradore berriagorako parametro-fitxategia da."
 
 #: ../plug-ins/common/CML_explorer.c:2311
 msgid "Error: failed to load parameters"
@@ -1976,7 +1886,7 @@ msgstr "Errorea: ezin izan dira parametroak kargatu"
 
 #: ../plug-ins/common/aa.c:94
 msgid "ASCII art"
-msgstr ""
+msgstr "ASCII artea"
 
 #. Create the actual window.
 #: ../plug-ins/common/aa.c:345
@@ -1984,14 +1894,12 @@ msgid "Save as Text"
 msgstr "Gorde testu gisa"
 
 #: ../plug-ins/common/aa.c:360
-#, fuzzy
 msgid "_Format:"
-msgstr "Letra-ti_poa:"
+msgstr "_Formatua:"
 
 #: ../plug-ins/common/align_layers.c:135
-#, fuzzy
 msgid "Align _Visible Layers..."
-msgstr "Lerrokatu geruza ikusgaiak"
+msgstr "Lerrokatu geruza _ikusgaiak..."
 
 #: ../plug-ins/common/align_layers.c:173
 msgid "There are not enough layers to align."
@@ -2016,17 +1924,14 @@ msgstr "Bete (eskuinetik ezkerrera)"
 #. "snap to grid" checkbutton at bottom of style frame
 #: ../plug-ins/common/align_layers.c:420 ../plug-ins/common/align_layers.c:451
 #: ../plug-ins/gfig/gfig-dialog.c:495
-#, fuzzy
 msgid "Snap to grid"
 msgstr "Atxiki saretari"
 
 #: ../plug-ins/common/align_layers.c:429
-#, fuzzy
 msgid "_Horizontal style:"
-msgstr "_Estilo horizontala:"
+msgstr "Estilo _horizontala:"
 
 #: ../plug-ins/common/align_layers.c:433
-#, fuzzy
 msgid "Left edge"
 msgstr "Ezkerreko ertza"
 
@@ -2036,12 +1941,10 @@ msgid "Center"
 msgstr "Erdikoa"
 
 #: ../plug-ins/common/align_layers.c:435
-#, fuzzy
 msgid "Right edge"
 msgstr "Eskuineko ertza"
 
 #: ../plug-ins/common/align_layers.c:444
-#, fuzzy
 msgid "Ho_rizontal base:"
 msgstr "_Oinarri horizontala:"
 
@@ -2054,54 +1957,44 @@ msgid "Fill (bottom to top)"
 msgstr "Bete (behetik gora)"
 
 #: ../plug-ins/common/align_layers.c:460
-#, fuzzy
 msgid "_Vertical style:"
-msgstr "E_stilo bertikala:"
+msgstr "Estilo _bertikala:"
 
 #: ../plug-ins/common/align_layers.c:463
-#, fuzzy
 msgid "Top edge"
 msgstr "Goiko ertza"
 
 #: ../plug-ins/common/align_layers.c:465
-#, fuzzy
 msgid "Bottom edge"
 msgstr "Beheko ertza"
 
 #: ../plug-ins/common/align_layers.c:474
-#, fuzzy
 msgid "Ver_tical base:"
-msgstr "Oi_narri bertikala:"
+msgstr "Oinarri be_rtikala:"
 
 #: ../plug-ins/common/align_layers.c:478
-#, fuzzy
 msgid "_Grid size:"
 msgstr "_Saretaren tamaina:"
 
 #: ../plug-ins/common/align_layers.c:487
-#, fuzzy
 msgid "_Ignore the bottom layer even if visible"
 msgstr "_Ez ikusi egin beheko geruzari, baita ikusgai badago ere"
 
 #: ../plug-ins/common/align_layers.c:497
-#, fuzzy
 msgid "_Use the (invisible) bottom layer as the base"
 msgstr "_Erabili beheko geruza (ikusezina) oinarri gisa"
 
 #: ../plug-ins/common/animationplay.c:181
-#, fuzzy
 msgid "_Playback..."
-msgstr "Erreproduzitu: "
+msgstr "_Erreproduzitu..."
 
 #: ../plug-ins/common/animationplay.c:413
-#, fuzzy
 msgid "Animation Playback:"
-msgstr "Erreproduzitu animazioa: "
+msgstr "Erreproduzitu animazioa:"
 
 #: ../plug-ins/common/animationplay.c:431
-#, fuzzy
 msgid "Playback:"
-msgstr "Erreproduzitu: "
+msgstr "Erreproduzitu:"
 
 #: ../plug-ins/common/animationplay.c:457
 msgid "Play/Stop"
@@ -2115,33 +2008,30 @@ msgstr "Atzera eraman"
 msgid "Step"
 msgstr "Urratsa"
 
-#: ../plug-ins/common/animationplay.c:1138
+#: ../plug-ins/common/animationplay.c:1127
 #, c-format
 msgid "Frame %d of %d"
 msgstr "%d / %d markoa"
 
 #: ../plug-ins/common/animoptimize.c:140
 msgid "Optimize (for _GIF)"
-msgstr ""
+msgstr "Optimizatu (_GIF)"
 
 #: ../plug-ins/common/animoptimize.c:158
-#, fuzzy
 msgid "_Optimize (Difference)"
-msgstr "/Iragazkiak/Animazioa/_Optimizatu (Ezberdintasuna)"
+msgstr "_Optimizatu (Ezberdintasuna)"
 
 #: ../plug-ins/common/animoptimize.c:175
-#, fuzzy
 msgid "_UnOptimize"
-msgstr "Optimizatu"
+msgstr "_Desoptimizatu"
 
 #: ../plug-ins/common/animoptimize.c:198
-#, fuzzy
 msgid "_Remove Backdrop"
-msgstr "_Kendu"
+msgstr "_Kendu atzekoa"
 
 #: ../plug-ins/common/animoptimize.c:214
 msgid "_Find Backdrop"
-msgstr ""
+msgstr "_Aurkitu atzekoa"
 
 #: ../plug-ins/common/animoptimize.c:429
 msgid "UnOptimizing Animation..."
@@ -2160,9 +2050,8 @@ msgid "Optimizing Animation..."
 msgstr "Animazioa optimizatzen..."
 
 #: ../plug-ins/common/apply_lens.c:112
-#, fuzzy
 msgid "Apply _Lens..."
-msgstr "Aplikatu lentea..."
+msgstr "Aplikatu _lentea..."
 
 #: ../plug-ins/common/apply_lens.c:179
 msgid "Applying lens..."
@@ -2173,61 +2062,52 @@ msgid "Lens Effect"
 msgstr "Lentearen efektua"
 
 #: ../plug-ins/common/apply_lens.c:417
-#, fuzzy
 msgid "_Keep original surroundings"
 msgstr "_Gorde jatorrizko inguruak"
 
 #: ../plug-ins/common/apply_lens.c:432
-#, fuzzy
 msgid "_Set surroundings to index 0"
 msgstr "_Ezarri inguruak 0 indizean"
 
 #: ../plug-ins/common/apply_lens.c:433
-#, fuzzy
 msgid "_Set surroundings to background color"
 msgstr "_Ezarri inguruak atzeko planoaren kolorean"
 
 #: ../plug-ins/common/apply_lens.c:448
-#, fuzzy
 msgid "_Make surroundings transparent"
 msgstr "_Bihurtu inguruak garden"
 
 #: ../plug-ins/common/apply_lens.c:465
-#, fuzzy
 msgid "_Lens refraction index:"
 msgstr "_Lentearen errefrakzio-indizea:"
 
 #: ../plug-ins/common/autocrop.c:85
-#, fuzzy
 msgid "_Autocrop Image"
-msgstr "_Irudi osoa"
+msgstr "Moztu _irudia automatikoki"
 
 #: ../plug-ins/common/autocrop.c:99
-#, fuzzy
 msgid "_Autocrop Layer"
-msgstr "Kiribilaren geruza"
+msgstr "Moztu g_eruza automatikoki"
 
 #: ../plug-ins/common/autocrop.c:146
 msgid "Cropping..."
 msgstr "Mozten..."
 
 #: ../plug-ins/common/autostretch_hsv.c:80
-#, fuzzy
 msgid "Stretch _HSV"
-msgstr "Tiratu"
+msgstr "Tiratu _ÑSB"
 
 #: ../plug-ins/common/autostretch_hsv.c:116
 msgid "Auto-Stretching HSV..."
-msgstr "HSV automatikoki tiratzen..."
+msgstr "ÑSB automatikoki tiratzen..."
 
 #: ../plug-ins/common/autostretch_hsv.c:192
 msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
-msgstr ""
+msgstr "autostretch_ñsb: cmap NULL da! Irteten...\n"
 
 #: ../plug-ins/common/blinds.c:124
-#, fuzzy
 msgid "_Blinds..."
-msgstr "Pertsianak"
+msgstr "_Pertsianak..."
 
 #: ../plug-ins/common/blinds.c:191
 msgid "Adding Blinds..."
@@ -2262,31 +2142,28 @@ msgid "_Displacement:"
 msgstr "_Desplazamendua:"
 
 #: ../plug-ins/common/blinds.c:315
-#, fuzzy
 msgid "_Number of segments:"
 msgstr "_Segmentu-kopurua:"
 
 #: ../plug-ins/common/blur.c:147
-#, fuzzy
 msgid "_Blur"
-msgstr "Lausotu"
+msgstr "_Lausotu"
 
-#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:432
+#: ../plug-ins/common/blur.c:191 ../plug-ins/common/unsharp.c:433
 msgid "Blurring..."
 msgstr "Lausotzen..."
 
 #: ../plug-ins/common/borderaverage.c:101
-#, fuzzy
 msgid "_Border Average..."
-msgstr "Ertzaren batezbestekoa..."
+msgstr "_Ertzaren batez bestekoa..."
 
 #: ../plug-ins/common/borderaverage.c:168
 msgid "Border Average..."
-msgstr "Ertzaren batezbestekoa..."
+msgstr "Ertzaren batez bestekoa..."
 
 #: ../plug-ins/common/borderaverage.c:348
 msgid "Borderaverage"
-msgstr "Ertzaren batezbestekoa"
+msgstr "Ertzaren batez bestekoa"
 
 #: ../plug-ins/common/borderaverage.c:362
 msgid "Border Size"
@@ -2297,14 +2174,12 @@ msgid "_Thickness:"
 msgstr "_Lodiera:"
 
 #: ../plug-ins/common/borderaverage.c:413
-#, fuzzy
 msgid "_Bucket size:"
 msgstr "_Baldearen tamaina:"
 
 #: ../plug-ins/common/bumpmap.c:343
-#, fuzzy
 msgid "_Bump Map..."
-msgstr "_Erliebe-mapa"
+msgstr "_Erliebe-mapa..."
 
 #: ../plug-ins/common/bumpmap.c:492
 msgid "Bump-mapping..."
@@ -2315,32 +2190,27 @@ msgid "Bump Map"
 msgstr "Erliebe-mapa"
 
 #: ../plug-ins/common/bumpmap.c:895
-#, fuzzy
 msgid "_Bump map:"
 msgstr "_Erliebe-mapa:"
 
 #: ../plug-ins/common/bumpmap.c:907
-#, fuzzy
 msgid "_Map type:"
-msgstr "Mapa-mota"
+msgstr "_Mapa-mota:"
 
 #. Compensate darkening
 #: ../plug-ins/common/bumpmap.c:912
-#, fuzzy
 msgid "Co_mpensate for darkening"
 msgstr "Ko_npentsatu iluntzea"
 
 #. Invert bumpmap
 #: ../plug-ins/common/bumpmap.c:926
-#, fuzzy
 msgid "I_nvert bumpmap"
 msgstr "Al_derantzikatu erliebe-mapa"
 
 #. Tile bumpmap
 #: ../plug-ins/common/bumpmap.c:940
-#, fuzzy
 msgid "_Tile bumpmap"
-msgstr "Erliebe-mapa mosaikoan"
+msgstr "Erliebe-mapa _mosaikoan"
 
 #: ../plug-ins/common/bumpmap.c:955 ../plug-ins/common/emboss.c:485
 msgid "_Azimuth:"
@@ -2351,7 +2221,6 @@ msgid "_Elevation:"
 msgstr "_Goratzea:"
 
 #: ../plug-ins/common/bumpmap.c:993 ../plug-ins/common/postscript.c:3146
-#, fuzzy
 msgid "_X offset:"
 msgstr "_X desplazamendua:"
 
@@ -2360,9 +2229,10 @@ msgid ""
 "The offset can be adjusted by dragging the preview using the middle mouse "
 "button."
 msgstr ""
+"Desplazamendua egokitu daiteke aurrebista arrastatuz saguaren erdiko botoia "
+"erabiliz."
 
 #: ../plug-ins/common/bumpmap.c:1007 ../plug-ins/common/postscript.c:3155
-#, fuzzy
 msgid "_Y offset:"
 msgstr "_Y desplazamendua:"
 
@@ -2375,9 +2245,8 @@ msgid "A_mbient:"
 msgstr "_Giroa:"
 
 #: ../plug-ins/common/c_astretch.c:78
-#, fuzzy
 msgid "_Stretch Contrast"
-msgstr "Kontrastea automatikoki tiratzen..."
+msgstr "_Tiratu kontrastea"
 
 #: ../plug-ins/common/c_astretch.c:112
 msgid "Auto-Stretching Contrast..."
@@ -2385,12 +2254,11 @@ msgstr "Kontrastea automatikoki tiratzen..."
 
 #: ../plug-ins/common/c_astretch.c:152
 msgid "c_astretch: cmap was NULL!  Quitting...\n"
-msgstr ""
+msgstr "c_astretch: cmap NULL da. Irteten...\n"
 
 #: ../plug-ins/common/cartoon.c:147
-#, fuzzy
 msgid "Ca_rtoon..."
-msgstr "Epigra_fea"
+msgstr "_Komikia..."
 
 #: ../plug-ins/common/cartoon.c:229 ../plug-ins/common/dog.c:247
 #: ../plug-ins/common/gauss.c:431 ../plug-ins/common/neon.c:221
@@ -2401,24 +2269,20 @@ msgid "Cannot operate on indexed color images."
 msgstr "Ezin da kolore-irudi indexatuekin erabili."
 
 #: ../plug-ins/common/cartoon.c:808
-#, fuzzy
 msgid "Cartoon"
-msgstr "Epigra_fea"
+msgstr "Komikia"
 
 #: ../plug-ins/common/cartoon.c:838 ../plug-ins/common/photocopy.c:867
-#, fuzzy
 msgid "_Mask radius:"
-msgstr "_Lausotu erradioa:"
+msgstr "_Maskara-erradioa:"
 
 #: ../plug-ins/common/cartoon.c:852
-#, fuzzy
 msgid "_Percent black:"
-msgstr "Ehunekoa"
+msgstr "Beltzaren _ehunekoa:"
 
 #: ../plug-ins/common/ccanalyze.c:110
-#, fuzzy
 msgid "Colorcube A_nalysis..."
-msgstr "Kolore-analisia..."
+msgstr "Kolore-_analisia..."
 
 #: ../plug-ins/common/ccanalyze.c:200
 msgid "Colorcube Analysis..."
@@ -2469,18 +2333,16 @@ msgid "Compression ratio (approx.): %d to 1"
 msgstr "Konprimatze-tasa (approx.): %d/1"
 
 #: ../plug-ins/common/channel_mixer.c:197
-#, fuzzy
 msgid "Channel Mi_xer..."
-msgstr "Kanal-nahastailea"
+msgstr "Kanal-_nahastailea..."
 
 #: ../plug-ins/common/channel_mixer.c:485
 msgid "Channel Mixer"
 msgstr "Kanal-nahastailea"
 
 #: ../plug-ins/common/channel_mixer.c:514
-#, fuzzy
 msgid "O_utput channel:"
-msgstr "_Kanporatu kanala:"
+msgstr "_Irteerako kanala:"
 
 #: ../plug-ins/common/channel_mixer.c:568 ../plug-ins/common/diffraction.c:498
 #: ../plug-ins/common/diffraction.c:536 ../plug-ins/common/diffraction.c:574
@@ -2494,7 +2356,7 @@ msgstr "_Gorria:"
 #: ../plug-ins/common/exchange.c:457 ../plug-ins/common/noisify.c:527
 #: ../plug-ins/common/noisify.c:534
 msgid "_Green:"
-msgstr "Be_rdea:"
+msgstr "_Berdea:"
 
 #: ../plug-ins/common/channel_mixer.c:605 ../plug-ins/common/diffraction.c:516
 #: ../plug-ins/common/diffraction.c:554 ../plug-ins/common/diffraction.c:592
@@ -2509,7 +2371,6 @@ msgid "_Monochrome"
 msgstr "_Monokromoa"
 
 #: ../plug-ins/common/channel_mixer.c:628
-#, fuzzy
 msgid "Preserve _luminosity"
 msgstr "_Mantendu argitasuna"
 
@@ -2526,9 +2387,8 @@ msgid "Channel Mixer File Operation Warning"
 msgstr "Kanal-nahastaile fitxategiaren jardunari buruzko abisua"
 
 #: ../plug-ins/common/checkerboard.c:93
-#, fuzzy
 msgid "_Checkerboard..."
-msgstr "Xake-taula"
+msgstr "_Xake-taula..."
 
 #: ../plug-ins/common/checkerboard.c:161
 msgid "Adding Checkerboard..."
@@ -2548,18 +2408,16 @@ msgid "_Size:"
 msgstr "Ta_maina:"
 
 #: ../plug-ins/common/color_enhance.c:80
-#, fuzzy
 msgid "_Color Enhance"
-msgstr "Kolore-hobekuntza..."
+msgstr "Kolore-_hobekuntza..."
 
 #: ../plug-ins/common/color_enhance.c:115
 msgid "Color Enhance..."
 msgstr "Kolore-hobekuntza..."
 
 #: ../plug-ins/common/colorify.c:110
-#, fuzzy
 msgid "_Colorify..."
-msgstr "Koloreztatzen..."
+msgstr "_Koloreztatzea..."
 
 #: ../plug-ins/common/colorify.c:171
 msgid "Colorifying..."
@@ -2578,9 +2436,8 @@ msgid "Colorify Custom Color"
 msgstr "Koloreztatu kolore pertsonalizatuaz"
 
 #: ../plug-ins/common/colortoalpha.c:104
-#, fuzzy
 msgid "Color to _Alpha..."
-msgstr "Kolorea alfara"
+msgstr "Kolorea _alfara..."
 
 #: ../plug-ins/common/colortoalpha.c:187
 msgid "Removing color..."
@@ -2600,19 +2457,18 @@ msgid "Color to Alpha Color Picker"
 msgstr "Kolorea alfara: kolore-hautatzailea"
 
 #: ../plug-ins/common/colortoalpha.c:423
-#, fuzzy
 msgid "to alpha"
 msgstr "alfara"
 
 #: ../plug-ins/common/compose.c:127 ../plug-ins/common/decompose.c:130
 #: ../plug-ins/common/raw.c:953
 msgid "RGB"
-msgstr "RGB"
+msgstr "GBU"
 
 #: ../plug-ins/common/compose.c:137 ../plug-ins/common/decompose.c:135
 #: ../plug-ins/common/raw.c:954
 msgid "RGBA"
-msgstr "RGBA"
+msgstr "GBUA"
 
 #: ../plug-ins/common/compose.c:141
 msgid "Alpha:"
@@ -2620,16 +2476,16 @@ msgstr "Alfa:"
 
 #: ../plug-ins/common/compose.c:147 ../plug-ins/common/decompose.c:140
 msgid "HSV"
-msgstr "HSV"
+msgstr "ÑSB"
 
 #. Gray: Circle: Spinbutton 1
-#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:459
+#: ../plug-ins/common/compose.c:148 ../plug-ins/rcm/rcm_dialog.c:470
 msgid "Hue:"
-msgstr "�bardura:"
+msgstr "Ñabardura:"
 
 #. Gray: Circle: Spinbutton 2
 #: ../plug-ins/common/compose.c:149 ../plug-ins/print/gimp_color_window.c:364
-#: ../plug-ins/rcm/rcm_dialog.c:486
+#: ../plug-ins/rcm/rcm_dialog.c:497
 msgid "Saturation:"
 msgstr "Saturazioa:"
 
@@ -2642,17 +2498,17 @@ msgid "CMY"
 msgstr "CMY"
 
 #: ../plug-ins/common/compose.c:155 ../plug-ins/common/compose.c:162
-#: ../plug-ins/common/fp.c:220 ../plug-ins/print/gimp_color_window.c:307
+#: ../plug-ins/common/fp.c:231 ../plug-ins/print/gimp_color_window.c:307
 msgid "Cyan:"
 msgstr "Cyana:"
 
 #: ../plug-ins/common/compose.c:156 ../plug-ins/common/compose.c:163
-#: ../plug-ins/common/fp.c:222 ../plug-ins/print/gimp_color_window.c:326
+#: ../plug-ins/common/fp.c:233 ../plug-ins/print/gimp_color_window.c:326
 msgid "Magenta:"
 msgstr "Magenta:"
 
 #: ../plug-ins/common/compose.c:157 ../plug-ins/common/compose.c:164
-#: ../plug-ins/common/fp.c:221 ../plug-ins/print/gimp_color_window.c:345
+#: ../plug-ins/common/fp.c:232 ../plug-ins/print/gimp_color_window.c:345
 msgid "Yellow:"
 msgstr "Horia:"
 
@@ -2717,9 +2573,8 @@ msgid "Redness_cr709f:"
 msgstr "Redness_cr709f:"
 
 #: ../plug-ins/common/compose.c:294
-#, fuzzy
 msgid "C_ompose..."
-msgstr "Konposatzen..."
+msgstr "Ko_nposatu..."
 
 #: ../plug-ins/common/compose.c:360
 #, c-format
@@ -2766,11 +2621,11 @@ msgstr "Kanal-adierazpenak"
 
 #: ../plug-ins/common/compressor.c:153
 msgid "gzip archive"
-msgstr ""
+msgstr "gzip artxiboa"
 
 #: ../plug-ins/common/compressor.c:174
 msgid "bzip archive"
-msgstr ""
+msgstr "bzip artxiboa"
 
 #: ../plug-ins/common/compressor.c:367
 msgid "No sensible extension, saving as compressed XCF."
@@ -2778,8 +2633,7 @@ msgstr "Ez dago luzapen argirik, XCF konprimitu gisa gordeko da."
 
 #: ../plug-ins/common/compressor.c:508
 msgid "No sensible extension, attempting to load with file magic."
-msgstr ""
-"Ez dago luzapen argirik, fitxategi magikoarekin kargatzen saiatuko naiz."
+msgstr "Ez dago luzapen argirik, fitxategi magikoarekin kargatzen saiatuko naiz."
 
 #: ../plug-ins/common/convmatrix.c:87
 msgid "Gr_ey"
@@ -2815,14 +2669,12 @@ msgid "Cro_p"
 msgstr "_Moztu"
 
 #: ../plug-ins/common/convmatrix.c:195
-#, fuzzy
 msgid "_Convolution Matrix..."
-msgstr "Konboluzio-matrizea"
+msgstr "_Konboluzio-matrizea..."
 
 #: ../plug-ins/common/convmatrix.c:229
 msgid "Convolution Matrix does not work on layers smaller than 3 pixels."
-msgstr ""
-"Konboluzio-matrizeak ez du 3 pixel baino txikiagoko geruzetan funtzionatzen."
+msgstr "Konboluzio-matrizeak ez du 3 pixel baino txikiagoko geruzetan funtzionatzen."
 
 #: ../plug-ins/common/convmatrix.c:302
 msgid "Applying convolution"
@@ -2862,18 +2714,16 @@ msgid "Channels"
 msgstr "Kanalak"
 
 #: ../plug-ins/common/csource.c:108
-#, fuzzy
 msgid "C source code"
-msgstr "Kolore-modua"
+msgstr "C iturburuko kodea"
 
 #: ../plug-ins/common/csource.c:635
 msgid "Save as C-Source"
 msgstr "Gorde C iturrikoa gisa"
 
 #: ../plug-ins/common/csource.c:659
-#, fuzzy
 msgid "_Prefixed name:"
-msgstr "_Izen prefijoduna:"
+msgstr "_Aurrefinkatutako izena:"
 
 #: ../plug-ins/common/csource.c:668
 msgid "Co_mment:"
@@ -2882,75 +2732,64 @@ msgstr "Iru_zkina:"
 #. Use Comment
 #.
 #: ../plug-ins/common/csource.c:675
-#, fuzzy
 msgid "_Save comment to file"
 msgstr "_Gorde iruzkina fitxategian"
 
 #. GLib types
 #.
 #: ../plug-ins/common/csource.c:687
-#, fuzzy
 msgid "_Use GLib types (guint8*)"
 msgstr "_Erabili GLib motak (guint8*)"
 
 #. Use Macros
 #.
 #: ../plug-ins/common/csource.c:699
-#, fuzzy
 msgid "Us_e macros instead of struct"
 msgstr "Erabi_li makroak egituraren ordez"
 
 #. Use RLE
 #.
 #: ../plug-ins/common/csource.c:711
-#, fuzzy
 msgid "Use _1 byte Run-Length-Encoding"
-msgstr "Eraabili byte _1eko Run-Length-Encoding"
+msgstr "Erabili byte _1eko Run-Length-Encoding"
 
 #. Alpha
 #.
 #: ../plug-ins/common/csource.c:723
-#, fuzzy
 msgid "Sa_ve alpha channel (RGBA/RGB)"
-msgstr "Gor_de alfa kanala (RGBA/RGB)"
+msgstr "Gor_de alfa kanala (GBUA/GBU)"
 
 #: ../plug-ins/common/csource.c:741 ../plug-ins/common/sparkle.c:427
 msgid "Op_acity:"
 msgstr "_Opakutasuna:"
 
 #: ../plug-ins/common/cubism.c:156
-#, fuzzy
 msgid "_Cubism..."
-msgstr "Kubismoa"
+msgstr "_Kubismoa..."
 
 #: ../plug-ins/common/cubism.c:269
 msgid "Cubism"
 msgstr "Kubismoa"
 
 #: ../plug-ins/common/cubism.c:298
-#, fuzzy
 msgid "_Tile size:"
-msgstr "_Mosaikoaren tamaina:"
+msgstr "_Mosaiko-tamaina:"
 
 #: ../plug-ins/common/cubism.c:311
-#, fuzzy
 msgid "T_ile saturation:"
 msgstr "M_osaikoaren saturazioa:"
 
 #: ../plug-ins/common/cubism.c:322
-#, fuzzy
 msgid "_Use background color"
 msgstr "_Erabili atzeko planoaren kolorea"
 
 #: ../plug-ins/common/cubism.c:412
-#, fuzzy
 msgid "Cubistic Transformation..."
-msgstr "Eraldatze kubista"
+msgstr "Eraldatze kubista..."
 
 #: ../plug-ins/common/curve_bend.c:567
-#, fuzzy
 msgid "_Curve Bend..."
-msgstr "Tolestu kurbaren arabera..."
+msgstr "Tolestu _kurba..."
 
 #: ../plug-ins/common/curve_bend.c:703
 msgid "Can operate on layers only (but was called on channel or mask)."
@@ -2959,9 +2798,8 @@ msgstr ""
 "zaio)"
 
 #: ../plug-ins/common/curve_bend.c:721
-#, fuzzy
 msgid "Cannot operate on layers with masks."
-msgstr "Ezin da kolore-irudi indexatuekin erabili."
+msgstr "Ezin da geruzak maskarekin lan egin."
 
 #: ../plug-ins/common/curve_bend.c:736
 msgid "Cannot operate on empty selections."
@@ -2982,13 +2820,11 @@ msgstr "Aurrebista"
 
 #. The preview button
 #: ../plug-ins/common/curve_bend.c:1297
-#, fuzzy
 msgid "_Preview once"
 msgstr "_Aurrebista behin"
 
 #. The preview toggle
 #: ../plug-ins/common/curve_bend.c:1306
-#, fuzzy
 msgid "Automatic pre_view"
 msgstr "Au_rrebista automatikoa"
 
@@ -3011,14 +2847,13 @@ msgid "Smoo_thing"
 msgstr "_Leuntzea"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:823
+#: ../plug-ins/common/curve_bend.c:1358 ../plug-ins/common/gqbist.c:821
 #: ../plug-ins/common/mosaic.c:535 ../plug-ins/common/ripple.c:510
 msgid "_Antialiasing"
 msgstr "_Antialiasing-a"
 
 #. The work_on_copy toggle
 #: ../plug-ins/common/curve_bend.c:1368
-#, fuzzy
 msgid "Work on cop_y"
 msgstr "_Kopian lan egin"
 
@@ -3123,7 +2958,7 @@ msgstr "alfa"
 
 #: ../plug-ins/common/decompose.c:140 ../plug-ins/common/decompose.c:143
 msgid "hue"
-msgstr "�bardura"
+msgstr "ñabardura"
 
 #: ../plug-ins/common/decompose.c:141 ../plug-ins/common/decompose.c:144
 msgid "saturation"
@@ -3238,9 +3073,8 @@ msgid "redness_cr709f"
 msgstr "redness_cr709f"
 
 #: ../plug-ins/common/decompose.c:245
-#, fuzzy
 msgid "_Decompose..."
-msgstr "Deskonposatu"
+msgstr "_Deskonposatu..."
 
 #: ../plug-ins/common/decompose.c:330
 msgid "Decomposing..."
@@ -3252,19 +3086,16 @@ msgstr "Deskonposatu"
 
 #. parameter settings
 #: ../plug-ins/common/decompose.c:1215
-#, fuzzy
 msgid "Extract Channels"
-msgstr "Erauzi kanalak:"
+msgstr "Erauzi kanalak"
 
 #: ../plug-ins/common/decompose.c:1243
-#, fuzzy
 msgid "Decompose to _layers"
 msgstr "Deskonposatu geru_zetara"
 
 #: ../plug-ins/common/deinterlace.c:99
-#, fuzzy
 msgid "_Deinterlace..."
-msgstr "Gurutzelarkatuak bereizi..."
+msgstr "_Gurutzelarkatuak bereizi..."
 
 #: ../plug-ins/common/deinterlace.c:156
 msgid "Deinterlace..."
@@ -3275,19 +3106,16 @@ msgid "Deinterlace"
 msgstr "Gurutzelarkatuak bereizi"
 
 #: ../plug-ins/common/deinterlace.c:349
-#, fuzzy
 msgid "Keep o_dd fields"
-msgstr "Mantendu eremu bakoitiak"
+msgstr "Mantendu eremu b_akoitiak"
 
 #: ../plug-ins/common/deinterlace.c:350
-#, fuzzy
 msgid "Keep _even fields"
-msgstr "Mantendu eremu _bikoitiak "
+msgstr "Mantendu eremu b_ikoitiak "
 
 #: ../plug-ins/common/depthmerge.c:192
-#, fuzzy
 msgid "_Depth Merge..."
-msgstr "Batze sakona egiten"
+msgstr "_Batze sakona..."
 
 #: ../plug-ins/common/depthmerge.c:382
 msgid "Depth-merging..."
@@ -3295,14 +3123,13 @@ msgstr "Batze sakona egiten..."
 
 #: ../plug-ins/common/depthmerge.c:631
 msgid "Depth Merge"
-msgstr "Batze sakona egiten"
+msgstr "Batze sakona"
 
 #: ../plug-ins/common/depthmerge.c:676
 msgid "Source 1:"
 msgstr "1 sorburua:"
 
 #: ../plug-ins/common/depthmerge.c:691 ../plug-ins/common/depthmerge.c:721
-#, fuzzy
 msgid "Depth map:"
 msgstr "Sakonera-mapa:"
 
@@ -3311,24 +3138,20 @@ msgid "Source 2:"
 msgstr "2 sorburua:"
 
 #: ../plug-ins/common/depthmerge.c:738
-#, fuzzy
 msgid "O_verlap:"
-msgstr "Teilakatu:"
+msgstr "_Teilakatu:"
 
 #: ../plug-ins/common/depthmerge.c:758
-#, fuzzy
 msgid "Sc_ale 1:"
 msgstr "1. eskala:"
 
 #: ../plug-ins/common/depthmerge.c:768
-#, fuzzy
 msgid "Sca_le 2:"
 msgstr "2. eskala:"
 
 #: ../plug-ins/common/despeckle.c:177
-#, fuzzy
 msgid "Des_peckle..."
-msgstr "Kendu parasitoak"
+msgstr "Kendu p_arasitoak..."
 
 #: ../plug-ins/common/despeckle.c:418 ../plug-ins/common/despeckle.c:640
 msgid "Despeckle"
@@ -3344,9 +3167,8 @@ msgstr "Mota"
 
 #. parameter settings
 #: ../plug-ins/common/despeckle.c:454
-#, fuzzy
 msgid "Median"
-msgstr "Radianak"
+msgstr "Mediana"
 
 #: ../plug-ins/common/despeckle.c:460
 msgid "_Adaptive"
@@ -3358,25 +3180,22 @@ msgstr "Er_rekurtsiboa"
 
 #: ../plug-ins/common/despeckle.c:494 ../plug-ins/common/neon.c:727
 #: ../plug-ins/common/nlfilt.c:1083 ../plug-ins/common/nova.c:359
-#: ../plug-ins/common/unsharp.c:665 ../plug-ins/common/whirlpinch.c:588
+#: ../plug-ins/common/unsharp.c:666 ../plug-ins/common/whirlpinch.c:588
 #: ../plug-ins/gflare/gflare.c:2686 ../plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
 msgstr "Err_adioa:"
 
 #: ../plug-ins/common/despeckle.c:510
-#, fuzzy
 msgid "_Black level:"
 msgstr "_Beltz-maila:"
 
 #: ../plug-ins/common/despeckle.c:526
-#, fuzzy
 msgid "_White level:"
 msgstr "_Zuri-maila:"
 
 #: ../plug-ins/common/destripe.c:113
-#, fuzzy
 msgid "Des_tripe..."
-msgstr "Marrak kentzen..."
+msgstr "Marrak kentzea..."
 
 #: ../plug-ins/common/destripe.c:276
 msgid "Destriping..."
@@ -3395,18 +3214,16 @@ msgid "_Width:"
 msgstr "_Zabalera:"
 
 #: ../plug-ins/common/destripe.c:480
-#, fuzzy
 msgid "Create _histogram"
 msgstr "Sortu _histograma"
 
 #: ../plug-ins/common/dicom.c:134
-#, fuzzy
 msgid "DICOM image"
-msgstr "Ir_udia"
+msgstr "DICOM irudia"
 
 #: ../plug-ins/common/dicom.c:159
 msgid "Digital Imaging and Communications in Medicine image"
-msgstr ""
+msgstr "'Digital Imaging and Communications in Medicine' irudia"
 
 #: ../plug-ins/common/dicom.c:318
 #, c-format
@@ -3414,9 +3231,8 @@ msgid "'%s' is not a DICOM file."
 msgstr "'%s' ez da DICOM fitxategia"
 
 #: ../plug-ins/common/diffraction.c:177
-#, fuzzy
 msgid "_Diffraction Patterns..."
-msgstr "Difrakzio-ereduak"
+msgstr "_Difrakzio-ereduak..."
 
 #: ../plug-ins/common/diffraction.c:334
 msgid "Creating diffraction pattern..."
@@ -3427,19 +3243,16 @@ msgid "Diffraction Patterns"
 msgstr "Difrakzio-ereduak"
 
 #: ../plug-ins/common/diffraction.c:524
-#, fuzzy
 msgid "Frequencies"
-msgstr "_Maiztasunak"
+msgstr "Maiztasunak"
 
 #: ../plug-ins/common/diffraction.c:562
-#, fuzzy
 msgid "Contours"
-msgstr "I_ngeradak"
+msgstr "Ingeradak"
 
 #: ../plug-ins/common/diffraction.c:600
-#, fuzzy
 msgid "Sharp edges"
-msgstr "_Ertz zorrotzak"
+msgstr "Ertz zorrotzak"
 
 #: ../plug-ins/common/diffraction.c:612 ../plug-ins/common/softglow.c:673
 #: ../plug-ins/flame/flame.c:1037
@@ -3451,19 +3264,16 @@ msgid "Sc_attering:"
 msgstr "Di_spertsioa:"
 
 #: ../plug-ins/common/diffraction.c:630
-#, fuzzy
 msgid "Po_larization:"
 msgstr "Po_larizazioa:"
 
 #: ../plug-ins/common/diffraction.c:638
-#, fuzzy
 msgid "Other options"
-msgstr "_Beste aukera batzuk"
+msgstr "Beste aukera batzuk"
 
 #: ../plug-ins/common/displace.c:154
-#, fuzzy
 msgid "_Displace..."
-msgstr "Desplazatzen..."
+msgstr "_Desplazatu..."
 
 #: ../plug-ins/common/displace.c:231
 msgid "Displacing..."
@@ -3475,13 +3285,11 @@ msgstr "Desplazatu"
 
 #. X options
 #: ../plug-ins/common/displace.c:297
-#, fuzzy
 msgid "_X displacement:"
 msgstr "_X desplazamendua:"
 
 #. Y Options
 #: ../plug-ins/common/displace.c:344
-#, fuzzy
 msgid "_Y displacement:"
 msgstr "_Y desplazamendua:"
 
@@ -3501,43 +3309,36 @@ msgid "_Black"
 msgstr "_Beltza"
 
 #: ../plug-ins/common/dog.c:139
-#, fuzzy
 msgid "Difference of Gaussians..."
-msgstr "Gauss-en lausotze selektiboa..."
+msgstr "Gauss-Diferentzia..."
 
 #: ../plug-ins/common/dog.c:227 ../plug-ins/common/dog.c:274
-#, fuzzy
 msgid "DoG Edge Detect"
-msgstr "Ertz-detekzioa"
+msgstr "GDren ertz-detekzioa"
 
 #: ../plug-ins/common/dog.c:295
-#, fuzzy
 msgid "Smoothing parameters"
-msgstr "Kopiatu parametroak"
+msgstr "Leuntze-parametroak"
 
 #: ../plug-ins/common/dog.c:309
-#, fuzzy
 msgid "_Radius 1:"
-msgstr "Err_adioa:"
+msgstr "1. _erradioa:"
 
 #: ../plug-ins/common/dog.c:313
-#, fuzzy
 msgid "R_adius 2:"
-msgstr "Err_adioa:"
+msgstr "2. err_adioa:"
 
 #: ../plug-ins/common/dog.c:325 ../plug-ins/common/normalize.c:88
-#, fuzzy
 msgid "_Normalize"
-msgstr "_Normala"
+msgstr "_Normalizatu"
 
 #: ../plug-ins/common/dog.c:336 ../plug-ins/gimpressionist/paper.c:149
 msgid "_Invert"
 msgstr "_Alderantzikatu"
 
 #: ../plug-ins/common/edge.c:162
-#, fuzzy
 msgid "_Edge..."
-msgstr "Ertzak"
+msgstr "_Ertza..."
 
 #: ../plug-ins/common/edge.c:234
 msgid "Edge Detection..."
@@ -3548,48 +3349,40 @@ msgid "Edge Detection"
 msgstr "Ertz-detekzioa"
 
 #: ../plug-ins/common/edge.c:675
-#, fuzzy
 msgid "Sobel"
-msgstr "_Sobel"
+msgstr "Sobel"
 
 #: ../plug-ins/common/edge.c:676
-#, fuzzy
 msgid "Prewitt"
-msgstr "_Prewitt"
+msgstr "Prewitt"
 
 #: ../plug-ins/common/edge.c:677 ../plug-ins/common/sinus.c:897
 msgid "Gradient"
 msgstr "Gradientea"
 
 #: ../plug-ins/common/edge.c:678
-#, fuzzy
 msgid "Roberts"
-msgstr "_Roberts"
+msgstr "Roberts"
 
 #: ../plug-ins/common/edge.c:679
-#, fuzzy
 msgid "Differential"
-msgstr "_Diferentziala"
+msgstr "Diferentziala"
 
 #: ../plug-ins/common/edge.c:680
-#, fuzzy
 msgid "Laplace"
-msgstr "_Laplace"
+msgstr "Laplace"
 
 #: ../plug-ins/common/edge.c:689
-#, fuzzy
 msgid "_Algorithm:"
-msgstr "Algoritmoa"
+msgstr "_Algoritmoa:"
 
 #: ../plug-ins/common/edge.c:697
-#, fuzzy
 msgid "A_mount:"
-msgstr "Kopurua:"
+msgstr "_Kopurua:"
 
 #: ../plug-ins/common/emboss.c:133
-#, fuzzy
 msgid "_Emboss..."
-msgstr "_Bozeldu"
+msgstr "_Bozeldu..."
 
 #: ../plug-ins/common/emboss.c:376 ../plug-ins/common/emboss.c:439
 msgid "Emboss"
@@ -3612,17 +3405,16 @@ msgid "E_levation:"
 msgstr "_Goratzea:"
 
 #: ../plug-ins/common/engrave.c:108
-#, fuzzy
 msgid "En_grave..."
-msgstr "Grabatzen..."
+msgstr "_Grabatua..."
 
 #: ../plug-ins/common/engrave.c:182
 msgid "Engraving..."
-msgstr "Grabatzen..."
+msgstr "Grabatua egiten..."
 
 #: ../plug-ins/common/engrave.c:211
 msgid "Engrave"
-msgstr "Grabatu"
+msgstr "Grabatua"
 
 #: ../plug-ins/common/engrave.c:238 ../plug-ins/common/film.c:1203
 #: ../plug-ins/common/gtm.c:594 ../plug-ins/common/postscript.c:2976
@@ -3634,14 +3426,12 @@ msgid "_Height:"
 msgstr "_Altuera:"
 
 #: ../plug-ins/common/engrave.c:249
-#, fuzzy
 msgid "_Limit line width"
 msgstr "_Mugatu lerro-zabalera"
 
 #: ../plug-ins/common/exchange.c:133
-#, fuzzy
 msgid "_Color Exchange..."
-msgstr "Kolore-trukatzea..."
+msgstr "_Kolore-trukatzea..."
 
 #: ../plug-ins/common/exchange.c:218
 msgid "Color Exchange..."
@@ -3653,9 +3443,8 @@ msgid "Color Exchange"
 msgstr "Kolore-trukatzea"
 
 #: ../plug-ins/common/exchange.c:308
-#, fuzzy
 msgid "Middle-click inside preview to pick \"From Color\""
-msgstr "Aurrebista: Egin klik barruan \"Koloretik\" hautatzeko"
+msgstr "Egin klik aurrebistaren  barruan \"Koloretik\" hautatzeko"
 
 #: ../plug-ins/common/exchange.c:346
 msgid "To Color"
@@ -3674,36 +3463,31 @@ msgid "Color Exchange: From Color"
 msgstr "Kolore-trukatzea: Koloretik"
 
 #: ../plug-ins/common/exchange.c:423
-#, fuzzy
 msgid "R_ed threshold:"
 msgstr "_Muga gorria:"
 
 #: ../plug-ins/common/exchange.c:484
-#, fuzzy
 msgid "G_reen threshold:"
 msgstr "Muga _berdea:"
 
 #: ../plug-ins/common/exchange.c:545
-#, fuzzy
 msgid "B_lue threshold:"
 msgstr "M_uga urdina:"
 
 #: ../plug-ins/common/exchange.c:573
-#, fuzzy
 msgid "Lock _thresholds"
 msgstr "B_lokeatu mugak"
 
 #: ../plug-ins/common/film.c:240
-#, fuzzy
 msgid "_Film..."
-msgstr "Filma"
+msgstr "_Filma..."
 
 #: ../plug-ins/common/film.c:325
 msgid "Composing Images..."
 msgstr "Irudiak konposatzen..."
 
 #: ../plug-ins/common/film.c:438 ../plug-ins/common/guillotine.c:183
-#: ../plug-ins/helpbrowser/dialog.c:525
+#: ../plug-ins/helpbrowser/dialog.c:534
 msgid "Untitled"
 msgstr "Izengabea"
 
@@ -3722,7 +3506,7 @@ msgstr "Filman:"
 
 #. Create selection
 #: ../plug-ins/common/film.c:1166 ../plug-ins/imagemap/imap_selection.c:400
-#: ../plug-ins/rcm/rcm_dialog.c:165
+#: ../plug-ins/rcm/rcm_dialog.c:176
 msgid "Selection"
 msgstr "Hautapena"
 
@@ -3733,7 +3517,6 @@ msgstr "Filma"
 
 #. Keep maximum image height
 #: ../plug-ins/common/film.c:1185
-#, fuzzy
 msgid "_Fit height to images"
 msgstr "_Doitu altuera irudiei"
 
@@ -3750,16 +3533,15 @@ msgstr "Ko_lorea:"
 #. Film numbering: Startindex/Font/colour
 #: ../plug-ins/common/film.c:1235
 msgid "Numbering"
-msgstr "Zenbaitzea"
+msgstr "Zenbatzea"
 
 #: ../plug-ins/common/film.c:1253
-#, fuzzy
 msgid "Start _index:"
 msgstr "Hasi _indizea:"
 
 #: ../plug-ins/common/film.c:1267
 msgid "_Font:"
-msgstr "Letra-ti_poa:"
+msgstr "Letra-_tipoa:"
 
 #. Numbering color
 #: ../plug-ins/common/film.c:1272
@@ -3767,12 +3549,10 @@ msgid "Select Number Color"
 msgstr "Hautatu zenbakiaren kolorea"
 
 #: ../plug-ins/common/film.c:1287
-#, fuzzy
 msgid "At _bottom"
 msgstr "_Behean"
 
 #: ../plug-ins/common/film.c:1288
-#, fuzzy
 msgid "At _top"
 msgstr "_Goian"
 
@@ -3782,7 +3562,6 @@ msgid "Image Selection"
 msgstr "Irudi-hautapena"
 
 #: ../plug-ins/common/film.c:1329
-#, fuzzy
 msgid "All Values are Fractions of the Film Height"
 msgstr "Balio guztiak film-altueraren frakzioak dira"
 
@@ -3791,42 +3570,34 @@ msgid "Ad_vanced"
 msgstr "Au_rreratua"
 
 #: ../plug-ins/common/film.c:1351
-#, fuzzy
 msgid "Image _height:"
 msgstr "Irudiaren a_ltuera:"
 
 #: ../plug-ins/common/film.c:1362
-#, fuzzy
 msgid "Image spac_ing:"
 msgstr "Irudiaren _tartea:"
 
 #: ../plug-ins/common/film.c:1373
-#, fuzzy
 msgid "_Hole offset:"
 msgstr "_Zuloaren desplazamendua:"
 
 #: ../plug-ins/common/film.c:1384
-#, fuzzy
 msgid "Ho_le width:"
 msgstr "Zu_loaren zabalera:"
 
 #: ../plug-ins/common/film.c:1395
-#, fuzzy
 msgid "Hol_e height:"
 msgstr "Zul_oaren altuera:"
 
 #: ../plug-ins/common/film.c:1406
-#, fuzzy
 msgid "Hole sp_acing:"
 msgstr "Zuloa_ren tartea:"
 
 #: ../plug-ins/common/film.c:1417
-#, fuzzy
 msgid "_Number height:"
 msgstr "_Zenbakien altuera:"
 
 #: ../plug-ins/common/flarefx.c:196
-#, fuzzy
 msgid "_FlareFX..."
 msgstr "Erlantz-efektua"
 
@@ -3839,164 +3610,164 @@ msgid "FlareFX"
 msgstr "Erlantz-efektua"
 
 #: ../plug-ins/common/flarefx.c:741
-#, fuzzy
 msgid "Center of Flare Effect"
 msgstr "Erlantz-efektuaren erdigunea"
 
 #: ../plug-ins/common/flarefx.c:777
-#, fuzzy
 msgid "_Show cursor"
 msgstr "_Erakutsi kurtsorea"
 
-#: ../plug-ins/common/fp.c:224
+#: ../plug-ins/common/fp.c:235
 msgid "Darker:"
 msgstr "Ilunago:"
 
-#: ../plug-ins/common/fp.c:225
+#: ../plug-ins/common/fp.c:236
 msgid "Lighter:"
 msgstr "Argiago:"
 
-#: ../plug-ins/common/fp.c:227
+#: ../plug-ins/common/fp.c:238
 msgid "More Sat:"
 msgstr "Sat. gehiago:"
 
-#: ../plug-ins/common/fp.c:228
+#: ../plug-ins/common/fp.c:239
 msgid "Less Sat:"
 msgstr "Sat. gutxiago:"
 
-#: ../plug-ins/common/fp.c:230 ../plug-ins/common/fp.c:488
+#: ../plug-ins/common/fp.c:241 ../plug-ins/common/fp.c:532
 msgid "Current:"
 msgstr "Unekoa:"
 
-#: ../plug-ins/common/fp.c:321
-#, fuzzy
+#: ../plug-ins/common/fp.c:330
 msgid "_Filter Pack..."
-msgstr "Aplikatu iragazki-paketea..."
+msgstr "_Iragazki-paketea..."
 
-#: ../plug-ins/common/fp.c:361
-msgid "Convert the image to RGB first!"
-msgstr "Bihurtu irudia RGB lehenik!"
+#: ../plug-ins/common/fp.c:376
+msgid "FP can only be used on RGB images."
+msgstr "Iragazki-paketeak GBU marrazgaietan bakarrik egin dezake lan."
 
-#: ../plug-ins/common/fp.c:366
-msgid "Applying the Filter Pack..."
-msgstr "Aplikatu iragazki-paketea..."
+#: ../plug-ins/common/fp.c:386
+msgid "FP can only be run interactively."
+msgstr "Iragazki-paketeak interaktiboki soilik exekuta daiteke"
 
-#: ../plug-ins/common/fp.c:480
+#: ../plug-ins/common/fp.c:404
+msgid "Applying Filter Pack..."
+msgstr "Aplikatu iragazki-paketea"
+
+#: ../plug-ins/common/fp.c:524
 msgid "Original:"
 msgstr "Originala:"
 
-#: ../plug-ins/common/fp.c:532
+#: ../plug-ins/common/fp.c:576
 msgid "Hue Variations"
-msgstr "�bardura-aldakuntzak"
+msgstr "Ñabardura-aldakuntzak"
 
-#: ../plug-ins/common/fp.c:586
+#: ../plug-ins/common/fp.c:630
 msgid "Roughness"
 msgstr "Zimurtasuna"
 
-#: ../plug-ins/common/fp.c:629
+#: ../plug-ins/common/fp.c:673
 msgid "Affected Range"
 msgstr "Eraginpeko barrutia"
 
-#: ../plug-ins/common/fp.c:633
+#: ../plug-ins/common/fp.c:677
 msgid "Sha_dows"
 msgstr "_Itzalak"
 
-#: ../plug-ins/common/fp.c:634
+#: ../plug-ins/common/fp.c:678
 msgid "_Midtones"
 msgstr "_Tarteko tonuak"
 
-#: ../plug-ins/common/fp.c:635
+#: ../plug-ins/common/fp.c:679
 msgid "H_ighlights"
 msgstr "T_onu argiak"
 
-#: ../plug-ins/common/fp.c:649
+#: ../plug-ins/common/fp.c:693
 msgid "Windows"
 msgstr "Leihoak"
 
-#: ../plug-ins/common/fp.c:659 ../plug-ins/common/lic.c:670
+#: ../plug-ins/common/fp.c:703 ../plug-ins/common/lic.c:670
 msgid "_Saturation"
 msgstr "_Saturazioa"
 
-#: ../plug-ins/common/fp.c:667
+#: ../plug-ins/common/fp.c:711
 msgid "A_dvanced"
 msgstr "A_urreratua"
 
-#: ../plug-ins/common/fp.c:687
+#: ../plug-ins/common/fp.c:731
 msgid "Value Variations"
 msgstr "Balio-aldakuntzak"
 
-#: ../plug-ins/common/fp.c:731
+#: ../plug-ins/common/fp.c:775
 msgid "Saturation Variations"
 msgstr "Saturazioaren aldakuntzak"
 
-#: ../plug-ins/common/fp.c:783
+#: ../plug-ins/common/fp.c:827
 msgid "Select Pixels by"
 msgstr "Hautatu pixelak honen arabera:"
 
-#: ../plug-ins/common/fp.c:788
+#: ../plug-ins/common/fp.c:832
 msgid "H_ue"
-msgstr "_�bardura"
+msgstr "_Ñabardura"
 
-#: ../plug-ins/common/fp.c:789
+#: ../plug-ins/common/fp.c:833
 msgid "Satu_ration"
 msgstr "Satu_razioa"
 
-#: ../plug-ins/common/fp.c:790
+#: ../plug-ins/common/fp.c:834
 msgid "V_alue"
 msgstr "_Balioa"
 
-#: ../plug-ins/common/fp.c:816
+#: ../plug-ins/common/fp.c:860
 msgid "Show"
 msgstr "Erakutsi"
 
-#: ../plug-ins/common/fp.c:821
+#: ../plug-ins/common/fp.c:865
 msgid "_Entire Image"
 msgstr "_Irudi osoa"
 
-#: ../plug-ins/common/fp.c:822
+#: ../plug-ins/common/fp.c:866
 msgid "Se_lection Only"
 msgstr "_Hautapena bakarrik"
 
-#: ../plug-ins/common/fp.c:823
+#: ../plug-ins/common/fp.c:867
 msgid "Selec_tion In Context"
 msgstr "Hau_tapena testuinguruan"
 
-#: ../plug-ins/common/fp.c:1135
+#: ../plug-ins/common/fp.c:1182
 msgid "Filter Pack Simulation"
 msgstr "Iragazki-paketearen simulazioa"
 
-#: ../plug-ins/common/fp.c:1245
+#: ../plug-ins/common/fp.c:1292
 msgid "Shadows:"
 msgstr "Itzalak:"
 
-#: ../plug-ins/common/fp.c:1246
+#: ../plug-ins/common/fp.c:1293
 msgid "Midtones:"
 msgstr "Tarteko tonuak:"
 
-#: ../plug-ins/common/fp.c:1247
+#: ../plug-ins/common/fp.c:1294
 msgid "Highlights:"
 msgstr "Tonu argiak:"
 
-#: ../plug-ins/common/fp.c:1259
+#: ../plug-ins/common/fp.c:1306
 msgid "Advanced Filter Pack Options"
 msgstr "Iragazki-paketeen aukera aurreratuak"
 
-#: ../plug-ins/common/fp.c:1270
+#: ../plug-ins/common/fp.c:1317
 msgid "Smoothness of Aliasing"
 msgstr "Aliasing-aren leuntasuna"
 
-#: ../plug-ins/common/fp.c:1370
+#: ../plug-ins/common/fp.c:1417
 msgid "Preview as You Drag"
 msgstr "Aurrebista arrastatzean"
 
-#: ../plug-ins/common/fp.c:1374
+#: ../plug-ins/common/fp.c:1421
 msgid "Preview Size"
 msgstr "Aurrebistaren tamaina"
 
 #: ../plug-ins/common/fractaltrace.c:126
-#, fuzzy
 msgid "_Fractal Trace..."
-msgstr "Arrasto fraktala"
+msgstr "Arrasto _fraktala..."
 
 #: ../plug-ins/common/fractaltrace.c:466 ../plug-ins/common/fractaltrace.c:693
 msgid "Fractal Trace"
@@ -4036,19 +3807,16 @@ msgid "Y_2:"
 msgstr "Y_2:"
 
 #: ../plug-ins/common/gauss.c:157
-#, fuzzy
 msgid "_Gaussian Blur..."
-msgstr "/Iragazkiak/Lausotuak/Gauss-en _lausotzea (_IIR)..."
+msgstr "_Gauss-en lausotzea..."
 
 #: ../plug-ins/common/gauss.c:413
-#, fuzzy
 msgid "Gaussian Blur..."
-msgstr "/Iragazkiak/Lausotuak/Gauss-en _lausotzea (_IIR)..."
+msgstr "Gauss-en lausotzea..."
 
 #: ../plug-ins/common/gauss.c:461
-#, fuzzy
 msgid "Gaussian Blur"
-msgstr "IIR Gauss-en lausotzea"
+msgstr "Gauss-en lausotzea"
 
 #. parameter settings
 #: ../plug-ins/common/gauss.c:484
@@ -4066,22 +3834,20 @@ msgid "_Vertical:"
 msgstr "_Bertikala:"
 
 #: ../plug-ins/common/gauss.c:525
-#, fuzzy
 msgid "Blur Method"
-msgstr "Lausotze-mota"
+msgstr "Lausotze-metodoa"
 
 #: ../plug-ins/common/gauss.c:529
 msgid "_IIR"
-msgstr ""
+msgstr "_IIR"
 
 #: ../plug-ins/common/gauss.c:530
-#, fuzzy
 msgid "_RLE"
-msgstr "RLE"
+msgstr "_RLE"
 
 #: ../plug-ins/common/gbr.c:130 ../plug-ins/common/gbr.c:151
 msgid "GIMP brush"
-msgstr ""
+msgstr "GIMPen brotxa"
 
 #: ../plug-ins/common/gbr.c:369 ../plug-ins/common/gbr.c:381
 msgid "Unsupported brush format"
@@ -4104,14 +3870,14 @@ msgstr "Izengabea"
 
 #: ../plug-ins/common/gbr.c:578
 msgid "GIMP brushes are either GRAYSCALE or RGBA"
-msgstr "GIMP brotxak gris-eskalakoak edo RGBA dira"
+msgstr "GIMP brotxak gris-eskalakoak edo GBUA dira"
 
 #: ../plug-ins/common/gbr.c:663
 msgid "Save as Brush"
 msgstr "Gorde brotxa gisa"
 
 #. attach labels
-#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:769
+#: ../plug-ins/common/gbr.c:683 ../plug-ins/common/grid.c:783
 msgid "Spacing:"
 msgstr "Tartea:"
 
@@ -4122,16 +3888,15 @@ msgstr "Azalpena:"
 
 #: ../plug-ins/common/gee.c:94
 msgid "Gee-_Slime"
-msgstr ""
+msgstr "_Lingirda"
 
 #: ../plug-ins/common/gee.c:152
 msgid "GEE-SLIME"
 msgstr "LINGIRDA"
 
 #: ../plug-ins/common/gee.c:158 ../plug-ins/common/gee_zoom.c:191
-#, fuzzy
 msgid "Thank you for choosing GIMP"
-msgstr "** Mila esker GIMP hautatzeagatik **"
+msgstr "Mila esker GIMP hautatzeagatik"
 
 #: ../plug-ins/common/gee.c:166
 msgid ""
@@ -4142,13 +3907,12 @@ msgstr ""
 "adam@foxbox.org / 1998-2000"
 
 #: ../plug-ins/common/gee_zoom.c:124
-#, fuzzy
 msgid "Gee-_Zoom"
-msgstr "_Zooma"
+msgstr "Lindirga-_zooma"
 
 #: ../plug-ins/common/gee_zoom.c:185
 msgid "GEE-ZOOM"
-msgstr ""
+msgstr "LINDIRGA-ZOOMA"
 
 #: ../plug-ins/common/gee_zoom.c:199
 msgid ""
@@ -4159,9 +3923,8 @@ msgstr ""
 "1998-2000"
 
 #: ../plug-ins/common/gif.c:402 ../plug-ins/common/gifload.c:143
-#, fuzzy
 msgid "GIF image"
-msgstr "Ir_udia"
+msgstr "GIF irudia"
 
 #: ../plug-ins/common/gif.c:687
 msgid "Couldn't simply reduce colors further. Saving as opaque."
@@ -4176,10 +3939,9 @@ msgstr ""
 "ditu. Ez da iradokizunik gorde."
 
 #: ../plug-ins/common/gif.c:970
-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 ""
-"Ezin dira RGB irudiak GIF gisa gorde. Bihurtu irudi indexatu edo gris-"
+"Ezin dira GBU irudiak GIF gisa gorde. Bihurtu irudi indexatu edo gris-"
 "eskalara lehenik."
 
 #: ../plug-ins/common/gif.c:1113
@@ -4194,8 +3956,7 @@ msgstr ""
 
 #: ../plug-ins/common/gif.c:1152
 msgid "Delay inserted to prevent evil CPU-sucking anim."
-msgstr ""
-"Atzerapena txertatu da, PUZ xurgatzen duen animazio gaizto hori eragozteko."
+msgstr "Atzerapena txertatu da, PUZ xurgatzen duen animazio gaizto hori eragozteko."
 
 #: ../plug-ins/common/gif.c:1194
 msgid "GIF Warning"
@@ -4228,14 +3989,12 @@ msgid "GIF Options"
 msgstr "GIF aukerak"
 
 #: ../plug-ins/common/gif.c:1275
-#, fuzzy
 msgid "_Interlace"
-msgstr "Gurutzelarkatu"
+msgstr "_Gurutzelarkatu"
 
 #: ../plug-ins/common/gif.c:1291
-#, fuzzy
 msgid "_GIF comment:"
-msgstr "GIFaren iruzkina:"
+msgstr "GIFaren _iruzkina:"
 
 #. additional animated gif parameter settings
 #: ../plug-ins/common/gif.c:1348
@@ -4243,36 +4002,30 @@ msgid "Animated GIF Options"
 msgstr "GIF animatuen aukerak"
 
 #: ../plug-ins/common/gif.c:1354
-#, fuzzy
 msgid "_Loop forever"
-msgstr "Errepikatu amaigabe"
+msgstr "_Errepikatu amaigabe"
 
 #: ../plug-ins/common/gif.c:1367
-#, fuzzy
 msgid "_Delay between frames where unspecified:"
-msgstr "Marko arteko atzerapena, zehaztu ez denean:"
+msgstr "Marko arteko _atzerapena, zehaztu ez denean:"
 
 #: ../plug-ins/common/gif.c:1380 ../plug-ins/common/mng.c:1527
 msgid "milliseconds"
 msgstr "milisegundo"
 
 #: ../plug-ins/common/gif.c:1390
-#, fuzzy
 msgid "Frame disposal where unspecified: "
 msgstr "Marko-baztertzea, zehaztu ez denean: "
 
 #: ../plug-ins/common/gif.c:1394
-#, fuzzy
 msgid "I don't care"
 msgstr "Ez dit axola"
 
 #: ../plug-ins/common/gif.c:1396
-#, fuzzy
 msgid "Cumulative layers (combine)"
 msgstr "Geruza metagarriak (konbinatu)"
 
 #: ../plug-ins/common/gif.c:1398
-#, fuzzy
 msgid "One frame per layer (replace)"
 msgstr "Marko bat geruzako (ordeztu)"
 
@@ -4320,7 +4073,7 @@ msgstr ""
 
 #: ../plug-ins/common/gih.c:205 ../plug-ins/common/gih.c:226
 msgid "GIMP brush (animated)"
-msgstr ""
+msgstr "GIMPeko brotxa (animatua)"
 
 #: ../plug-ins/common/gih.c:319
 #, c-format
@@ -4344,7 +4097,6 @@ msgid "Save as Brush Pipe"
 msgstr "Gorde brotxa animatu gisa"
 
 #: ../plug-ins/common/gih.c:890
-#, fuzzy
 msgid "Spacing (percent):"
 msgstr "Tartea (ehunekoa):"
 
@@ -4353,12 +4105,10 @@ msgid "Pixels"
 msgstr "Pixelak"
 
 #: ../plug-ins/common/gih.c:962
-#, fuzzy
 msgid "Cell size:"
 msgstr "Gelaxka-tamaina:"
 
 #: ../plug-ins/common/gih.c:974
-#, fuzzy
 msgid "Number of cells:"
 msgstr "Gelaxka-kopurua:"
 
@@ -4367,7 +4117,6 @@ msgid " Rows of "
 msgstr " Errenkadak: "
 
 #: ../plug-ins/common/gih.c:1011
-#, fuzzy
 msgid " Columns on each layer"
 msgstr " Geruza bakoitzeko zutabeak"
 
@@ -4392,9 +4141,8 @@ msgid "Ranks:"
 msgstr "Heinak:"
 
 #: ../plug-ins/common/glasstile.c:129
-#, fuzzy
 msgid "_Glass Tile..."
-msgstr "Beirazko mosaikoa..."
+msgstr "_Beirazko mosaikoa..."
 
 #: ../plug-ins/common/glasstile.c:209
 msgid "Glass Tile..."
@@ -4405,104 +4153,96 @@ msgid "Glass Tile"
 msgstr "Beirazko mosaikoa"
 
 #: ../plug-ins/common/glasstile.c:281
-#, fuzzy
 msgid "Tile _width:"
 msgstr "Mosaikoaren _zabalera:"
 
 #: ../plug-ins/common/glasstile.c:295 ../plug-ins/common/mosaic.c:621
-#, fuzzy
 msgid "Tile _height:"
-msgstr "Mosaikoaren al_tuera:"
+msgstr "Mosaikoaren _altuera:"
 
-#: ../plug-ins/common/gqbist.c:415
-#, fuzzy
+#: ../plug-ins/common/gqbist.c:409
 msgid "_Qbist..."
-msgstr "Qbist ..."
+msgstr "_Qbista ..."
 
-#: ../plug-ins/common/gqbist.c:514
+#: ../plug-ins/common/gqbist.c:510
 msgid "Qbist ..."
-msgstr "Qbist ..."
+msgstr "Qbista ..."
 
-#: ../plug-ins/common/gqbist.c:695
-#, fuzzy
+#: ../plug-ins/common/gqbist.c:693
 msgid "Load QBE file"
 msgstr "Kargatu QBE fitxategia..."
 
-#: ../plug-ins/common/gqbist.c:733
-#, fuzzy
+#: ../plug-ins/common/gqbist.c:731
 msgid "Save (middle transform) as QBE file"
 msgstr "Gorde (erdiaren eraldatzea) QBE fitxategi gisa..."
 
-#: ../plug-ins/common/gqbist.c:781
+#: ../plug-ins/common/gqbist.c:779
 msgid "G-Qbist"
 msgstr "G-Qbist"
 
 #: ../plug-ins/common/gradmap.c:86
-#, fuzzy
 msgid "_Gradient Map"
-msgstr "Gradiente-mapa..."
+msgstr "_Gradiente-mapa..."
 
 #: ../plug-ins/common/gradmap.c:124
 msgid "Gradient Map..."
 msgstr "Gradiente-mapa..."
 
 #: ../plug-ins/common/grid.c:149
-#, fuzzy
 msgid "_Grid..."
-msgstr "Gidak..."
+msgstr "_Sareta..."
 
 #: ../plug-ins/common/grid.c:242
 msgid "Drawing Grid..."
 msgstr "Sareta marrazten..."
 
-#: ../plug-ins/common/grid.c:621 ../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:385 ../plug-ins/imagemap/imap_popup.c:153
 #: ../plug-ins/imagemap/imap_toolbar.c:163
 msgid "Grid"
 msgstr "Sareta"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:696
+#: ../plug-ins/common/grid.c:710
 msgid "Horizontal"
 msgstr "Horizontala"
 
-#: ../plug-ins/common/grid.c:698
+#: ../plug-ins/common/grid.c:712
 msgid "Vertical"
 msgstr "Bertikala"
 
-#: ../plug-ins/common/grid.c:700
+#: ../plug-ins/common/grid.c:714
 msgid "Intersection"
 msgstr "Ebakidura"
 
 #. Width and Height
-#: ../plug-ins/common/grid.c:703 ../plug-ins/common/svg.c:761
+#: ../plug-ins/common/grid.c:717 ../plug-ins/common/svg.c:779
 #: ../plug-ins/common/wmf.c:548 ../plug-ins/print/gimp_main_window.c:992
 #: ../plug-ins/print/gimp_main_window.c:1199
 msgid "Width:"
 msgstr "Zabalera:"
 
 #. attach labels
-#: ../plug-ins/common/grid.c:836
+#: ../plug-ins/common/grid.c:850
 msgid "Offset:"
 msgstr "Desplazamendua:"
 
 #. attach color selectors
-#: ../plug-ins/common/grid.c:875
+#: ../plug-ins/common/grid.c:889
 msgid "Horizontal Color"
 msgstr "Kolore horizontala"
 
-#: ../plug-ins/common/grid.c:893
+#: ../plug-ins/common/grid.c:907
 msgid "Vertical Color"
 msgstr "Kolore bertikala"
 
-#: ../plug-ins/common/grid.c:911
+#: ../plug-ins/common/grid.c:925
 msgid "Intersection Color"
 msgstr "Ebakiduraren kolorea"
 
 #: ../plug-ins/common/gtm.c:154
-#, fuzzy
 msgid "HTML table"
-msgstr "Marmola"
+msgstr "HTML taula"
 
 #: ../plug-ins/common/gtm.c:399
 msgid "GIMP Table Magic"
@@ -4530,7 +4270,6 @@ msgid "HTML Page Options"
 msgstr "HTML orrien aukerak"
 
 #: ../plug-ins/common/gtm.c:446
-#, fuzzy
 msgid "_Generate full HTML document"
 msgstr "_Sortu HTML dokumentu osoa"
 
@@ -4548,9 +4287,8 @@ msgid "Table Creation Options"
 msgstr "Taula sortzeko aukerak"
 
 #: ../plug-ins/common/gtm.c:473
-#, fuzzy
 msgid "_Use cellspan"
-msgstr "_Erabili Cellspan"
+msgstr "_Erabili 'cellspan'"
 
 #: ../plug-ins/common/gtm.c:479
 msgid ""
@@ -4588,7 +4326,6 @@ msgid "The text for the table caption."
 msgstr "Taularen epigraferako testua."
 
 #: ../plug-ins/common/gtm.c:538
-#, fuzzy
 msgid "C_ell content:"
 msgstr "_Gelaxkaren edukia:"
 
@@ -4622,7 +4359,6 @@ msgstr ""
 "daiteke."
 
 #: ../plug-ins/common/gtm.c:609
-#, fuzzy
 msgid "Cell-_padding:"
 msgstr "Gela_xka-betegarria:"
 
@@ -4631,7 +4367,6 @@ msgid "The amount of cellpadding."
 msgstr "Gelaxka-betegarriaren kopurua."
 
 #: ../plug-ins/common/gtm.c:622
-#, fuzzy
 msgid "Cell-_spacing:"
 msgstr "Gelaxka-_tartea:"
 
@@ -4640,9 +4375,8 @@ msgid "The amount of cellspacing."
 msgstr "Gelaxka-tartearen kopurua."
 
 #: ../plug-ins/common/guillotine.c:72
-#, fuzzy
 msgid "_Guillotine"
-msgstr "Gillotina..."
+msgstr "_Gillotina..."
 
 #: ../plug-ins/common/guillotine.c:104
 msgid "Guillotine..."
@@ -4650,12 +4384,11 @@ msgstr "Gillotina..."
 
 #: ../plug-ins/common/header.c:75
 msgid "C source code header"
-msgstr ""
+msgstr "C iturburu-kodeko goiburua"
 
 #: ../plug-ins/common/hot.c:217
-#, fuzzy
 msgid "_Hot..."
-msgstr "Beroa..."
+msgstr "_Beroa..."
 
 #: ../plug-ins/common/hot.c:379
 msgid "Hot..."
@@ -4666,9 +4399,8 @@ msgid "Hot"
 msgstr "Beroa"
 
 #: ../plug-ins/common/hot.c:600
-#, fuzzy
 msgid "Create _New layer"
-msgstr "Sortu geru_za berria"
+msgstr "Sortu geruza _berria"
 
 #: ../plug-ins/common/hot.c:609
 msgid "Action"
@@ -4687,9 +4419,8 @@ msgid "_Blacken"
 msgstr "_Belztu"
 
 #: ../plug-ins/common/illusion.c:101
-#, fuzzy
 msgid "_Illusion..."
-msgstr "Ilusioa..."
+msgstr "_Ilusioa..."
 
 #: ../plug-ins/common/illusion.c:173
 msgid "Illusion..."
@@ -4700,7 +4431,6 @@ msgid "Illusion"
 msgstr "Ilusioa"
 
 #: ../plug-ins/common/illusion.c:423
-#, fuzzy
 msgid "_Divisions:"
 msgstr "_Banaketa:"
 
@@ -4713,9 +4443,8 @@ msgid "Mode _2"
 msgstr "_2. modua"
 
 #: ../plug-ins/common/iwarp.c:254
-#, fuzzy
 msgid "_IWarp..."
-msgstr "Okertzen..."
+msgstr "Okertze interaktiboa..."
 
 #: ../plug-ins/common/iwarp.c:688
 msgid "Warping..."
@@ -4727,7 +4456,6 @@ msgid "Warping Frame No. %d..."
 msgstr "%d. markoa okertzen..."
 
 #: ../plug-ins/common/iwarp.c:806
-#, fuzzy
 msgid "Ping pong"
 msgstr "Ping Pong"
 
@@ -4737,7 +4465,7 @@ msgstr "A_nimatu"
 
 #: ../plug-ins/common/iwarp.c:960
 msgid "Number of _Frames:"
-msgstr "_Marko-kopurua:"
+msgstr "Marko-kopurua:"
 
 #: ../plug-ins/common/iwarp.c:969
 msgid "R_everse"
@@ -4780,12 +4508,10 @@ msgid "Sw_irl CW"
 msgstr "_Zurrunbiloa erlojuaren noranzkoan"
 
 #: ../plug-ins/common/iwarp.c:1059
-#, fuzzy
 msgid "_Deform radius:"
 msgstr "_Deformatze-erradioa:"
 
 #: ../plug-ins/common/iwarp.c:1069
-#, fuzzy
 msgid "D_eform amount:"
 msgstr "D_eformatze-kopurua:"
 
@@ -4794,12 +4520,10 @@ msgid "_Bilinear"
 msgstr "_Bilineala"
 
 #: ../plug-ins/common/iwarp.c:1092
-#, fuzzy
 msgid "Adaptive s_upersample"
 msgstr "S_uperadibide moldakorra"
 
 #: ../plug-ins/common/iwarp.c:1112
-#, fuzzy
 msgid "Ma_x depth:"
 msgstr "Ge_h sakonera:"
 
@@ -4817,9 +4541,8 @@ msgid "IWarp"
 msgstr "Okertze interaktiboa"
 
 #: ../plug-ins/common/jigsaw.c:364
-#, fuzzy
 msgid "_Jigsaw..."
-msgstr "Puzzlea"
+msgstr "_Puzzlea..."
 
 #: ../plug-ins/common/jigsaw.c:418
 msgid "Assembling Jigsaw..."
@@ -4846,7 +4569,6 @@ msgid "Bevel Edges"
 msgstr "Alakaren ertzak"
 
 #: ../plug-ins/common/jigsaw.c:2500
-#, fuzzy
 msgid "_Bevel width:"
 msgstr "_Alakaren zabalera:"
 
@@ -4884,9 +4606,8 @@ msgid "Each piece has curved sides"
 msgstr "Pieza bakoitzak albo kurbatuak ditu"
 
 #: ../plug-ins/common/jpeg.c:384 ../plug-ins/common/jpeg.c:422
-#, fuzzy
 msgid "JPEG image"
-msgstr "JPEGren aurrebista"
+msgstr "JPEG irudia"
 
 #: ../plug-ins/common/jpeg.c:528
 msgid "Export Preview"
@@ -4894,112 +4615,103 @@ msgstr "Esportatu aurrebista"
 
 #: ../plug-ins/common/jpeg.c:892
 msgid "EXIF data will be ignored."
-msgstr ""
+msgstr "EXIF datuei ez ikusi egin."
 
 #: ../plug-ins/common/jpeg.c:1106
 msgid "JPEG preview"
 msgstr "JPEGren aurrebista"
 
 #: ../plug-ins/common/jpeg.c:1368
-#, fuzzy, c-format
+#, c-format
 msgid "File size: %02.01f kB"
-msgstr "Tamaina: %ld byte (%02.01f kB)"
+msgstr "Fitxategi-tamaina: %02.01f kB"
 
-#: ../plug-ins/common/jpeg.c:1861 ../plug-ins/common/jpeg.c:1961
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:1864 ../plug-ins/common/jpeg.c:1964
 msgid "File size: unknown"
-msgstr "Tamaina: ezezaguna"
+msgstr "Fitxategi-tamaina: ezezaguna"
 
-#: ../plug-ins/common/jpeg.c:1926
+#: ../plug-ins/common/jpeg.c:1929
 msgid "Save as JPEG"
 msgstr "Gorde JPEG gisa"
 
-#: ../plug-ins/common/jpeg.c:1947
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:1950
 msgid "_Quality:"
-msgstr "Kalitatea:"
+msgstr "_Kalitatea:"
 
-#: ../plug-ins/common/jpeg.c:1951
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:1954
 msgid "JPEG quality parameter"
-msgstr "Parametroak"
+msgstr "JPEG kalitare-parametroa"
 
-#: ../plug-ins/common/jpeg.c:1970
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:1973
 msgid "Show _Preview in image window"
-msgstr "Kapturatu leiho bakarra"
+msgstr "Erakutsi _aurrebista irudi-leihoan"
 
-#: ../plug-ins/common/jpeg.c:1983
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:1986
 msgid "_Advanced Options"
-msgstr "Iragazki-paketeen aukera aurreratuak"
+msgstr "_Aukera aurreratuak"
 
-#: ../plug-ins/common/jpeg.c:2011
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:2014
 msgid "_Smoothing:"
-msgstr "Leuntzea:"
+msgstr "_Leuntzea:"
 
-#: ../plug-ins/common/jpeg.c:2024
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:2027
 msgid "Frequency (rows):"
-msgstr "Berrabiarazi maiztasuna (errenkadak):"
+msgstr "Maiztasuna (errenkadak):"
 
-#: ../plug-ins/common/jpeg.c:2038
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:2041
 msgid "Use restart markers"
-msgstr "Berrabiarazi markatzaileak"
+msgstr "Berrabiarazte-markatzaileak"
 
-#: ../plug-ins/common/jpeg.c:2053 ../plug-ins/xjt/xjt.c:860
+#: ../plug-ins/common/jpeg.c:2058 ../plug-ins/xjt/xjt.c:860
 msgid "Optimize"
 msgstr "Optimizatu"
 
-#: ../plug-ins/common/jpeg.c:2067
+#: ../plug-ins/common/jpeg.c:2072
 msgid "Progressive"
 msgstr "Pixkanaka"
 
-#: ../plug-ins/common/jpeg.c:2086
+#: ../plug-ins/common/jpeg.c:2091
 msgid "Force baseline JPEG"
-msgstr ""
+msgstr "Derrigortu JPEGren oinarri-lerroa"
 
-#: ../plug-ins/common/jpeg.c:2102
+#: ../plug-ins/common/jpeg.c:2107
 msgid "Save EXIF data"
 msgstr "Gorde EXIF datua"
 
-#: ../plug-ins/common/jpeg.c:2119
-#, fuzzy
+#: ../plug-ins/common/jpeg.c:2124
 msgid "Save thumbnail"
-msgstr "Gorde fitxategia"
+msgstr "Gorde koadro txikia"
 
 #. Subsampling
-#: ../plug-ins/common/jpeg.c:2136
+#: ../plug-ins/common/jpeg.c:2141
 msgid "Subsampling:"
 msgstr "Azpilaginketa:"
 
 #. DCT method
-#: ../plug-ins/common/jpeg.c:2163
+#: ../plug-ins/common/jpeg.c:2168
 msgid "DCT method:"
-msgstr ""
+msgstr "DCT metodoa:"
 
-#: ../plug-ins/common/jpeg.c:2169
+#: ../plug-ins/common/jpeg.c:2174
 msgid "Fast Integer"
 msgstr "Osoko bizkorra"
 
-#: ../plug-ins/common/jpeg.c:2170
+#: ../plug-ins/common/jpeg.c:2175
 msgid "Integer"
 msgstr "Osokoa"
 
-#: ../plug-ins/common/jpeg.c:2171
+#: ../plug-ins/common/jpeg.c:2176
 msgid "Floating-Point"
 msgstr "Koma mugikorra"
 
-#: ../plug-ins/common/jpeg.c:2185
+#: ../plug-ins/common/jpeg.c:2190
 msgid "Comment"
 msgstr "Iruzkina"
 
-#: ../plug-ins/common/jpeg.c:2338
-#, fuzzy, c-format
+#: ../plug-ins/common/jpeg.c:2343
+#, c-format
 msgid "Opening thumbnail for '%s'..."
-msgstr "'%s' irekitzen..."
+msgstr "'%s'(r)en koadro txikia irekitzen..."
 
 #: ../plug-ins/common/laplace.c:95
 msgid "_Laplace"
@@ -5046,12 +4758,10 @@ msgid "Convolve"
 msgstr "Konboluzioa"
 
 #: ../plug-ins/common/lic.c:694
-#, fuzzy
 msgid "_With white noise"
 msgstr "_Zarata zuriarekin"
 
 #: ../plug-ins/common/lic.c:695
-#, fuzzy
 msgid "W_ith source image"
 msgstr "_Sorburuko irudiarekin"
 
@@ -5060,44 +4770,36 @@ msgid "_Effect Image:"
 msgstr "_Efektu-irudia:"
 
 #: ../plug-ins/common/lic.c:725
-#, fuzzy
 msgid "_Filter length:"
 msgstr "_Iragazkiaren luzera:"
 
 #: ../plug-ins/common/lic.c:734
-#, fuzzy
 msgid "_Noise magnitude:"
 msgstr "_Zarataren magnitudea:"
 
 #: ../plug-ins/common/lic.c:743
-#, fuzzy
 msgid "In_tegration steps:"
 msgstr "In_tegrazio-urratsak:"
 
 #: ../plug-ins/common/lic.c:752
-#, fuzzy
 msgid "_Minimum value:"
 msgstr "_Gutxieneko balioa:"
 
 #: ../plug-ins/common/lic.c:761
-#, fuzzy
 msgid "M_aximum value:"
 msgstr "Ge_hienezko balioa:"
 
 #: ../plug-ins/common/lic.c:812
-#, fuzzy
 msgid "_Van Gogh (LIC)..."
-msgstr "Van Gogh (LIC)..."
+msgstr "_Van Gogh (LIC)..."
 
 #: ../plug-ins/common/mail.c:253
-#, fuzzy
 msgid "_Mail Image..."
-msgstr "/Fitxategia/_Postaz bidali irudia..."
+msgstr "_Postaz bidali irudia..."
 
 #: ../plug-ins/common/mail.c:474
-#, fuzzy
 msgid "Send as Mail"
-msgstr "Bidali postara"
+msgstr "Bidali posta gisa"
 
 #: ../plug-ins/common/mail.c:498
 msgid "_Recipient:"
@@ -5154,16 +4856,15 @@ msgstr "Helburuko bigarren kolorea"
 
 #: ../plug-ins/common/mapcolor.c:154
 msgid "Adjust _FG-BG"
-msgstr ""
+msgstr "Doitu AurPl-AtzPl"
 
 #: ../plug-ins/common/mapcolor.c:172
-#, fuzzy
 msgid "Color Range _Mapping..."
-msgstr "Kolore-trukatzea..."
+msgstr "Kolore-barrutia _trukatzea..."
 
 #: ../plug-ins/common/mapcolor.c:219 ../plug-ins/common/mapcolor.c:507
 msgid "Cannot operate on gray or indexed color images."
-msgstr "Ezin da kolore-irudi indexatuekin edpo grisekin erabili."
+msgstr "Ezin da kolore-irudi indexatuekin edo grisekin erabili."
 
 #: ../plug-ins/common/mapcolor.c:240
 msgid "Adjusting Foreground/Background..."
@@ -5191,34 +4892,30 @@ msgid "To:"
 msgstr "Nora:"
 
 #: ../plug-ins/common/max_rgb.c:106
-#, fuzzy
 msgid "_Max RGB..."
-msgstr "Geh RGB..."
+msgstr "_Geh GBU..."
 
 #: ../plug-ins/common/max_rgb.c:145
 msgid "Can only operate on RGB drawables."
-msgstr "RGB marrazgaietan bakarrik egin daiteke lan."
+msgstr "GBU marrazgaietan bakarrik egin daiteke lan."
 
 #: ../plug-ins/common/max_rgb.c:245
 msgid "Max RGB..."
-msgstr "Geh RGB..."
+msgstr "Geh GBU..."
 
 #: ../plug-ins/common/max_rgb.c:270
 msgid "Max RGB"
-msgstr "Geh RGB"
+msgstr "Geh GBU"
 
 #: ../plug-ins/common/max_rgb.c:295
-#, fuzzy
 msgid "_Hold the maximal channels"
 msgstr "_Eutsi gehienezko kanalei"
 
 #: ../plug-ins/common/max_rgb.c:298
-#, fuzzy
 msgid "Ho_ld the minimal channels"
 msgstr "Eu_tsi gutxieneko kanalei"
 
 #: ../plug-ins/common/mblur.c:176
-#, fuzzy
 msgid "_Motion Blur..."
 msgstr "Mugimendu-lausotzea..."
 
@@ -5255,9 +4952,8 @@ msgid "_Angle:"
 msgstr "_Angelua:"
 
 #: ../plug-ins/common/mblur.c:969
-#, fuzzy
 msgid "Blur Center"
-msgstr "Erdikoa"
+msgstr "Lausotze-erdigunea"
 
 #. Inform the user that we couldn't losslessly save the
 #. * transparency & just use the full palette
@@ -5280,22 +4976,18 @@ msgid "Interlace"
 msgstr "Gurutzelarkatu"
 
 #: ../plug-ins/common/mng.c:1345
-#, fuzzy
 msgid "Save background color"
 msgstr "Gorde atzeko planoaren kolorea"
 
 #: ../plug-ins/common/mng.c:1356
-#, fuzzy
 msgid "Save gamma"
 msgstr "Gorde Gamma"
 
 #: ../plug-ins/common/mng.c:1366
-#, fuzzy
 msgid "Save resolution"
 msgstr "Gorde bereizmena"
 
 #: ../plug-ins/common/mng.c:1377
-#, fuzzy
 msgid "Save creation time"
 msgstr "Gorde sortze-denbora"
 
@@ -5308,12 +5000,10 @@ msgid "JNG"
 msgstr "JNG"
 
 #: ../plug-ins/common/mng.c:1400
-#, fuzzy
 msgid "PNG + delta PNG"
 msgstr "PNG + Delta PNG"
 
 #: ../plug-ins/common/mng.c:1401
-#, fuzzy
 msgid "JNG + delta PNG"
 msgstr "JNG + Delta PNG"
 
@@ -5326,7 +5016,6 @@ msgid "All JNG"
 msgstr "JNG denak"
 
 #: ../plug-ins/common/mng.c:1415
-#, fuzzy
 msgid "Default chunks type:"
 msgstr "Zati lehenetsien mota:"
 
@@ -5339,12 +5028,10 @@ msgid "Replace"
 msgstr "Ordeztu"
 
 #: ../plug-ins/common/mng.c:1430
-#, fuzzy
 msgid "Default frame disposal:"
 msgstr "Marko-baztertze lehenetsia:"
 
 #: ../plug-ins/common/mng.c:1442
-#, fuzzy
 msgid "PNG compression level:"
 msgstr "PNG konpresio-maila:"
 
@@ -5353,17 +5040,14 @@ msgid "Choose a high compression level for small file size"
 msgstr "Hautatu konprimatze-maila handia fitxategi-tamaina txikietarako"
 
 #: ../plug-ins/common/mng.c:1464
-#, fuzzy
 msgid "JPEG compression quality:"
 msgstr "JPEG konprimatze-kalitatea:"
 
 #: ../plug-ins/common/mng.c:1481
-#, fuzzy
 msgid "JPEG smoothing factor:"
 msgstr "JPEG leuntze-faktorea:"
 
 #: ../plug-ins/common/mng.c:1491
-#, fuzzy
 msgid "Animated MNG options"
 msgstr "MNG animatuen aukerak"
 
@@ -5372,19 +5056,16 @@ msgid "Loop"
 msgstr "Begiztak"
 
 #: ../plug-ins/common/mng.c:1511
-#, fuzzy
 msgid "Default frame delay:"
 msgstr "Marko-atzerapen lehenetsia:"
 
 #: ../plug-ins/common/mng.c:1589
-#, fuzzy
 msgid "MNG animation"
-msgstr "MNG aukerak"
+msgstr "MNG animazioa"
 
 #: ../plug-ins/common/mosaic.c:309
-#, fuzzy
 msgid "_Mosaic..."
-msgstr "Mosaikoa"
+msgstr "_Mosaikoa..."
 
 #. progress bar for gradient finding
 #: ../plug-ins/common/mosaic.c:435
@@ -5401,24 +5082,20 @@ msgid "Mosaic"
 msgstr "Mosaikoa"
 
 #: ../plug-ins/common/mosaic.c:544
-#, fuzzy
 msgid "Co_lor averaging"
-msgstr "_Kolorearen batezbestekoa"
+msgstr "_Kolorearen batez bestekoa"
 
 #: ../plug-ins/common/mosaic.c:554
-#, fuzzy
 msgid "Allo_w tile splitting"
 msgstr "_Baimendu lauza-banatzea"
 
 #: ../plug-ins/common/mosaic.c:564
-#, fuzzy
 msgid "_Pitted surfaces"
 msgstr "_Gainazal zulodunak"
 
 #: ../plug-ins/common/mosaic.c:574
-#, fuzzy
 msgid "_FG/BG lighting"
-msgstr "_Aurreko/Atzeko planoaren argiztapena"
+msgstr "_AurPl-aren/AtzPl-aren argiztapena"
 
 #. tiling primitive
 #: ../plug-ins/common/mosaic.c:588
@@ -5434,7 +5111,6 @@ msgid "He_xagons"
 msgstr "He_xagonoak"
 
 #: ../plug-ins/common/mosaic.c:594
-#, fuzzy
 msgid "Oc_tagons & squares"
 msgstr "Ok_tagonoak eta karratuak"
 
@@ -5444,27 +5120,22 @@ msgid "Settings"
 msgstr "Ezarpenak"
 
 #: ../plug-ins/common/mosaic.c:612
-#, fuzzy
 msgid "T_ile size:"
 msgstr "_Mosaikoaren tamaina:"
 
 #: ../plug-ins/common/mosaic.c:630
-#, fuzzy
 msgid "Til_e spacing:"
-msgstr "Lau_za arteko tartea:"
+msgstr "_Mosaiko-tartea:"
 
 #: ../plug-ins/common/mosaic.c:639
-#, fuzzy
 msgid "Tile _neatness:"
 msgstr "Mosaikoaren tx_ukuntasuna:"
 
 #: ../plug-ins/common/mosaic.c:649
-#, fuzzy
 msgid "Light _direction:"
 msgstr "A_rgiaren noranzkoa:"
 
 #: ../plug-ins/common/mosaic.c:658
-#, fuzzy
 msgid "Color _variation:"
 msgstr "Kolore-al_dakuntza:"
 
@@ -5473,21 +5144,18 @@ msgid "Unable to add additional point.\n"
 msgstr "Ezin da puntu osagarririk gehitu.\n"
 
 #: ../plug-ins/common/neon.c:135
-#, fuzzy
 msgid "_Neon..."
-msgstr "Bideoa/RGB..."
+msgstr "_Neon..."
 
 #: ../plug-ins/common/neon.c:207
-#, fuzzy
 msgid "Neon..."
-msgstr "Prentsa-papera..."
+msgstr "Neon..."
 
 #: ../plug-ins/common/neon.c:697
-#, fuzzy
 msgid "Neon Detection"
-msgstr "Ertz-detekzioa"
+msgstr "Neon-detekzioa"
 
-#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:678
+#: ../plug-ins/common/neon.c:742 ../plug-ins/common/unsharp.c:679
 msgid "_Amount:"
 msgstr "_Kopurua:"
 
@@ -5536,7 +5204,6 @@ msgid "Intensity"
 msgstr "Intentsitatea"
 
 #: ../plug-ins/common/newsprint.c:534
-#, fuzzy
 msgid "Newsprin_t..."
 msgstr "Prentsa-papera..."
 
@@ -5545,7 +5212,6 @@ msgid "Newsprint..."
 msgstr "Prentsa-papera..."
 
 #: ../plug-ins/common/newsprint.c:1039
-#, fuzzy
 msgid "_Spot function:"
 msgstr "Puntu-_funtzioa:"
 
@@ -5567,7 +5233,6 @@ msgid "O_utput LPI:"
 msgstr "Irteerako _lerro/hazbete:"
 
 #: ../plug-ins/common/newsprint.c:1286
-#, fuzzy
 msgid "C_ell size:"
 msgstr "Gelaxka-tamaina:"
 
@@ -5577,9 +5242,8 @@ msgid "Screen"
 msgstr "Pantaila"
 
 #: ../plug-ins/common/newsprint.c:1318
-#, fuzzy
 msgid "B_lack pullout (%):"
-msgstr "Beltza ateratzea (%):"
+msgstr "_Beltz-osagaia (%):"
 
 #: ../plug-ins/common/newsprint.c:1340
 msgid "Separate to:"
@@ -5587,7 +5251,7 @@ msgstr "Bereizi hona:"
 
 #: ../plug-ins/common/newsprint.c:1344
 msgid "_RGB"
-msgstr "_RGB"
+msgstr "_GBU"
 
 #: ../plug-ins/common/newsprint.c:1361
 msgid "C_MYK"
@@ -5598,12 +5262,10 @@ msgid "I_ntensity"
 msgstr "I_ntentsitatea"
 
 #: ../plug-ins/common/newsprint.c:1403
-#, fuzzy
 msgid "_Lock channels"
 msgstr "_Blokeatu kanalak"
 
 #: ../plug-ins/common/newsprint.c:1416
-#, fuzzy
 msgid "_Factory defaults"
 msgstr "_Fabrikako lehenetsiak"
 
@@ -5617,9 +5279,8 @@ msgid "O_versample:"
 msgstr "_Gainlaginketa:"
 
 #: ../plug-ins/common/nlfilt.c:126
-#, fuzzy
 msgid "_NL Filter..."
-msgstr "NL iragazkia..."
+msgstr "_NL iragazkia..."
 
 #: ../plug-ins/common/nlfilt.c:954
 msgid "NL Filter..."
@@ -5634,17 +5295,14 @@ msgid "Filter"
 msgstr "Iragazkia"
 
 #: ../plug-ins/common/nlfilt.c:1042
-#, fuzzy
 msgid "_Alpha trimmed mean"
-msgstr "_Alfak murriztutako batezbestekoa"
+msgstr "_Alfak murriztutako batez bestekoa"
 
 #: ../plug-ins/common/nlfilt.c:1044
-#, fuzzy
 msgid "Op_timal estimation"
 msgstr "_Zenbatespen optimoa"
 
 #: ../plug-ins/common/nlfilt.c:1046
-#, fuzzy
 msgid "_Edge enhancement"
 msgstr "_Ertzaren hobetzea"
 
@@ -5653,28 +5311,24 @@ msgid "A_lpha:"
 msgstr "A_lfa:"
 
 #: ../plug-ins/common/noisify.c:157
-#, fuzzy
 msgid "_Scatter RGB..."
-msgstr "HSV barreiatzen..."
+msgstr "GBU _barreiatzea..."
 
 #: ../plug-ins/common/noisify.c:285
 msgid "Adding Noise..."
 msgstr "Zarata gehitzen..."
 
 #: ../plug-ins/common/noisify.c:451
-#, fuzzy
 msgid "Scatter RGB"
-msgstr "Barreiatu HSV"
+msgstr "Barreiatu GBU"
 
 #: ../plug-ins/common/noisify.c:477
-#, fuzzy
 msgid "Co_rrelated noise"
-msgstr "Sortu elipsea"
+msgstr "Zarata _korrelatua"
 
 #: ../plug-ins/common/noisify.c:492
-#, fuzzy
 msgid "_Independent RGB"
-msgstr "_Independentea"
+msgstr "GBU _independentea"
 
 #: ../plug-ins/common/noisify.c:516 ../plug-ins/common/noisify.c:520
 msgid "_Gray:"
@@ -5694,9 +5348,8 @@ msgid "Normalizing..."
 msgstr "Normalizatzen..."
 
 #: ../plug-ins/common/nova.c:179
-#, fuzzy
 msgid "Su_perNova..."
-msgstr "SuperNova"
+msgstr "S_uperNova..."
 
 #: ../plug-ins/common/nova.c:262
 msgid "Rendering SuperNova..."
@@ -5715,23 +5368,20 @@ msgid "_Spokes:"
 msgstr "_Izpiak:"
 
 #: ../plug-ins/common/nova.c:386
-#, fuzzy
 msgid "R_andom hue:"
-msgstr "A_usazko �bardura:"
+msgstr "A_usazko ñabardura:"
 
 #: ../plug-ins/common/nova.c:438
 msgid "Center of SuperNova"
 msgstr "SuperNova-ren zentroa"
 
 #: ../plug-ins/common/nova.c:472
-#, fuzzy
 msgid "S_how cursor"
 msgstr "_Erakutsi kurtsorea"
 
 #: ../plug-ins/common/oilify.c:111
-#, fuzzy
 msgid "Oili_fy..."
-msgstr "Olioz pintatu"
+msgstr "_Olioz pintatu..."
 
 #: ../plug-ins/common/oilify.c:189
 msgid "Oil Painting..."
@@ -5742,12 +5392,10 @@ msgid "Oilify"
 msgstr "Olioz pintatu"
 
 #: ../plug-ins/common/oilify.c:504
-#, fuzzy
 msgid "_Mask size:"
 msgstr "_Maskara-tamaina:"
 
 #: ../plug-ins/common/oilify.c:515
-#, fuzzy
 msgid "_Use intensity algorithm"
 msgstr "_Erabili intentsitate-algoritmoa"
 
@@ -5788,7 +5436,6 @@ msgid "_Max (%):"
 msgstr "_Geh (%):"
 
 #: ../plug-ins/common/papertile.c:343
-#, fuzzy
 msgid "_Wrap around"
 msgstr "_Doitu"
 
@@ -5797,7 +5444,6 @@ msgid "Background Type"
 msgstr "Atzeko planoaren mota"
 
 #: ../plug-ins/common/papertile.c:360
-#, fuzzy
 msgid "I_nverted image"
 msgstr "I_rudi alderantzikatua"
 
@@ -5806,14 +5452,12 @@ msgid "Im_age"
 msgstr "Ir_udia"
 
 #: ../plug-ins/common/papertile.c:364
-#, fuzzy
 msgid "Fo_reground color"
 msgstr "_Aurreko planoaren kolorea"
 
 #: ../plug-ins/common/papertile.c:366
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "Atzeko pla_noaren kolorea"
+msgstr "At_zeko planoaren kolorea"
 
 #: ../plug-ins/common/papertile.c:368
 msgid "S_elect here:"
@@ -5832,14 +5476,12 @@ msgid "September 31, 1999"
 msgstr "Irailak 31, 1999"
 
 #: ../plug-ins/common/papertile.c:816
-#, fuzzy
 msgid "_Paper Tile..."
-msgstr "Paperezko mosaikoa..."
+msgstr "_Paperezko mosaikoa..."
 
 #: ../plug-ins/common/pat.c:104 ../plug-ins/common/pat.c:126
-#, fuzzy
 msgid "GIMP pattern"
-msgstr "Eredua"
+msgstr "GIMPen eredua"
 
 #: ../plug-ins/common/pat.c:343
 #, c-format
@@ -5852,7 +5494,7 @@ msgstr "Gorde eredu gisa"
 
 #: ../plug-ins/common/pcx.c:96 ../plug-ins/common/pcx.c:115
 msgid "ZSoft PCX image"
-msgstr ""
+msgstr "ZSoft PCX irudia"
 
 #: ../plug-ins/common/pcx.c:314
 #, c-format
@@ -5869,14 +5511,12 @@ msgid "Unusual PCX flavour, giving up"
 msgstr "ezohiko PCX bertsioa, utzi egingo da"
 
 #: ../plug-ins/common/photocopy.c:158
-#, fuzzy
 msgid "_Photocopy..."
-msgstr "Beroa..."
+msgstr "_Fotokopia..."
 
 #: ../plug-ins/common/photocopy.c:837
-#, fuzzy
 msgid "Photocopy"
-msgstr "Argazkia"
+msgstr "Fotokopia"
 
 #: ../plug-ins/common/photocopy.c:881 ../plug-ins/common/sharpen.c:509
 #: ../plug-ins/common/softglow.c:687
@@ -5884,23 +5524,20 @@ msgid "_Sharpness:"
 msgstr "_Enfokatze-maila:"
 
 #: ../plug-ins/common/photocopy.c:895
-#, fuzzy
 msgid "Percent _black:"
-msgstr "Ehunekoa"
+msgstr "_Beltzaren ehunekoa:"
 
 #: ../plug-ins/common/photocopy.c:909
-#, fuzzy
 msgid "Percent _white:"
-msgstr "Ehunekoa"
+msgstr "_Zuriaren ehunekoa:"
 
 #: ../plug-ins/common/pix.c:141 ../plug-ins/common/pix.c:158
 msgid "Alias|Wavefront PIX image"
-msgstr ""
+msgstr "Alias|Wavefront PIX irudia"
 
 #: ../plug-ins/common/pixelize.c:173
-#, fuzzy
 msgid "_Pixelize..."
-msgstr "Pixelizatzen..."
+msgstr "_Pixelizatu..."
 
 #: ../plug-ins/common/pixelize.c:275
 msgid "Pixelizing..."
@@ -5919,9 +5556,8 @@ msgid "Pixel _Height:"
 msgstr "Pixel-_altuera:"
 
 #: ../plug-ins/common/plasma.c:185
-#, fuzzy
 msgid "_Plasma..."
-msgstr "Plasma..."
+msgstr "_Plasma..."
 
 #: ../plug-ins/common/plasma.c:268
 msgid "Plasma..."
@@ -5932,7 +5568,6 @@ msgid "Plasma"
 msgstr "Plasma"
 
 #: ../plug-ins/common/plasma.c:334
-#, fuzzy
 msgid "Random _seed:"
 msgstr "Ausazko _hazia:"
 
@@ -5943,7 +5578,7 @@ msgstr "T_urbulentzia:"
 #: ../plug-ins/common/png.c:249 ../plug-ins/common/png.c:266
 #: ../plug-ins/common/png.c:281 ../plug-ins/common/png.c:295
 msgid "PNG image"
-msgstr ""
+msgstr "PNG irudia"
 
 #: ../plug-ins/common/png.c:657
 #, c-format
@@ -5974,12 +5609,10 @@ msgid "Save as PNG"
 msgstr "Gorde PNG gisa"
 
 #: ../plug-ins/common/png.c:1595
-#, fuzzy
 msgid "_Load defaults"
 msgstr "_Kargatu lehenetsiak"
 
 #: ../plug-ins/common/png.c:1596
-#, fuzzy
 msgid "_Save defaults"
 msgstr "_Gorde lehenetsiak"
 
@@ -5988,42 +5621,34 @@ msgid "_Interlacing (Adam7)"
 msgstr "_Gurutzelarkatu (Adam7)"
 
 #: ../plug-ins/common/png.c:1628
-#, fuzzy
 msgid "Save _background color"
 msgstr "Gorde _atzeko planoaren kolorea"
 
 #: ../plug-ins/common/png.c:1636
-#, fuzzy
 msgid "Save _gamma"
-msgstr "Gorde _gamma"
+msgstr "Gorde ga_mma"
 
 #: ../plug-ins/common/png.c:1645
-#, fuzzy
 msgid "Save layer o_ffset"
 msgstr "Gorde g_eruzaren desplazamendua"
 
 #: ../plug-ins/common/png.c:1654
-#, fuzzy
 msgid "Save _resolution"
 msgstr "Gorde _bereizmena"
 
 #: ../plug-ins/common/png.c:1663
-#, fuzzy
 msgid "Save creation _time"
 msgstr "Gorde sortze-o_rdua"
 
 #: ../plug-ins/common/png.c:1671
-#, fuzzy
 msgid "Save comme_nt"
 msgstr "Gorde iruz_kina"
 
 #: ../plug-ins/common/png.c:1686
-#, fuzzy
 msgid "Save color _values from transparent pixels"
 msgstr "Gorde _kolore-balioak pixel gardenetik"
 
 #: ../plug-ins/common/png.c:1699
-#, fuzzy
 msgid "Co_mpression level:"
 msgstr "Ko_npresio-maila:"
 
@@ -6032,23 +5657,20 @@ msgid "Could not load PNG defaults"
 msgstr "Ezin izan da PNG lehenetsia kargatu"
 
 #: ../plug-ins/common/pnm.c:228
-#, fuzzy
 msgid "PNM Image"
-msgstr "Ir_udia"
+msgstr "PNM irudia"
 
 #: ../plug-ins/common/pnm.c:248
 msgid "PNM image"
-msgstr ""
+msgstr "PNM irudia"
 
 #: ../plug-ins/common/pnm.c:260
-#, fuzzy
 msgid "PGM image"
-msgstr "JPEGren aurrebista"
+msgstr "PGM irudia"
 
 #: ../plug-ins/common/pnm.c:272
-#, fuzzy
 msgid "PPM image"
-msgstr "Ir_udia"
+msgstr "PPM irudia"
 
 #: ../plug-ins/common/pnm.c:465 ../plug-ins/common/pnm.c:486
 #: ../plug-ins/common/pnm.c:493 ../plug-ins/common/pnm.c:502
@@ -6090,7 +5712,6 @@ msgstr "Gorde PNM gisa"
 
 #. file save type
 #: ../plug-ins/common/pnm.c:959
-#, fuzzy
 msgid "Data formatting"
 msgstr "Datu-formateatzea"
 
@@ -6104,7 +5725,7 @@ msgstr "Ascii"
 
 #: ../plug-ins/common/polar.c:170
 msgid "P_olar Coords..."
-msgstr ""
+msgstr "Koordenatu p_olarrak..."
 
 #: ../plug-ins/common/polar.c:357
 msgid "Polarizing..."
@@ -6115,17 +5736,14 @@ msgid "Polarize"
 msgstr "Polarizatu"
 
 #: ../plug-ins/common/polar.c:620
-#, fuzzy
 msgid "Circle _depth in percent:"
 msgstr "Zirkuluaren _sakonera ehunekotan:"
 
 #: ../plug-ins/common/polar.c:632
-#, fuzzy
 msgid "Offset _angle:"
 msgstr "Desplazamendu-ange_lua:"
 
 #: ../plug-ins/common/polar.c:647
-#, fuzzy
 msgid "_Map backwards"
 msgstr "_Mapatu atzerantz"
 
@@ -6133,11 +5751,9 @@ msgstr "_Mapatu atzerantz"
 msgid ""
 "If checked the mapping will begin at the right side, as opposed to beginning "
 "at the left."
-msgstr ""
-"Hau hautatuz gero, mapatzea eskuineko aldean hasiko da, eta ez ezkerrekoan."
+msgstr "Hau hautatuz gero, mapatzea eskuineko aldean hasiko da, eta ez ezkerrekoan."
 
 #: ../plug-ins/common/polar.c:664
-#, fuzzy
 msgid "Map from _top"
 msgstr "Mapatu g_oitik"
 
@@ -6150,7 +5766,6 @@ msgstr ""
 "errenkada kanpoan.  Hautatzen baduzu, aurkakoa egingo du."
 
 #: ../plug-ins/common/polar.c:682
-#, fuzzy
 msgid "To _polar"
 msgstr "_Polarretara"
 
@@ -6163,18 +5778,16 @@ msgstr ""
 "baduzu, irudia zirkulura mapatuko da."
 
 #: ../plug-ins/common/postscript.c:576 ../plug-ins/common/postscript.c:662
-#, fuzzy
 msgid "PostScript document"
-msgstr "_PostScript 2. maila"
+msgstr "PostScript dokumentua"
 
 #: ../plug-ins/common/postscript.c:595 ../plug-ins/common/postscript.c:677
-#, fuzzy
 msgid "Encapsulated PostScript image"
-msgstr "_PostScript kapsulatua"
+msgstr "PostScript kapsulatutako irudia"
 
 #: ../plug-ins/common/postscript.c:614
 msgid "PDF document"
-msgstr ""
+msgstr "PDF dokumentua"
 
 #: ../plug-ins/common/postscript.c:1005
 #, c-format
@@ -6191,15 +5804,14 @@ msgid "Error starting ghostscript (%s)"
 msgstr "Errorea ghostscript (%s) abiatzean."
 
 #: ../plug-ins/common/postscript.c:1661
-#, fuzzy, c-format
+#, c-format
 msgid "Error starting ghostscript: %s"
-msgstr "Errorea ghostscript (%s) abiatzean."
+msgstr "Errorea ghostscript abiatzean: %s"
 
 #: ../plug-ins/common/postscript.c:2481 ../plug-ins/common/postscript.c:2614
 #: ../plug-ins/common/postscript.c:2766 ../plug-ins/common/postscript.c:2895
 #: ../plug-ins/common/sunras.c:1454 ../plug-ins/common/sunras.c:1562
 #: ../plug-ins/fits/fits.c:826 ../plug-ins/fits/fits.c:950
-#, fuzzy
 msgid "Write error occurred"
 msgstr "Errorea gertatu da idaztean"
 
@@ -6213,7 +5825,7 @@ msgid "Rendering"
 msgstr "Errendatzen"
 
 #. Resolution
-#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:882
+#: ../plug-ins/common/postscript.c:2958 ../plug-ins/common/svg.c:900
 #: ../plug-ins/common/wmf.c:669 ../plug-ins/print/gimp_main_window.c:1087
 msgid "Resolution:"
 msgstr "Bereizmena:"
@@ -6224,7 +5836,7 @@ msgstr "Orrialdeak:"
 
 #: ../plug-ins/common/postscript.c:2992
 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
-msgstr ""
+msgstr "Orrialdeak kargatzeko (adib.: 1-4 edo 1,3,5-7)"
 
 #: ../plug-ins/common/postscript.c:2994
 msgid "Try Bounding Box"
@@ -6239,7 +5851,7 @@ msgstr "Koloreztatzea"
 msgid "B/W"
 msgstr "Z/B"
 
-#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:411
+#: ../plug-ins/common/postscript.c:3012 ../plug-ins/rcm/rcm_dialog.c:422
 msgid "Gray"
 msgstr "Grisa"
 
@@ -6256,7 +5868,6 @@ msgid "Automatic"
 msgstr "Automatikoa"
 
 #: ../plug-ins/common/postscript.c:3024
-#, fuzzy
 msgid "Text antialiasing"
 msgstr "Testuaren antialiasing-a"
 
@@ -6269,7 +5880,6 @@ msgid "Strong"
 msgstr "Indartsua"
 
 #: ../plug-ins/common/postscript.c:3036
-#, fuzzy
 msgid "Graphic antialiasing"
 msgstr "Irudiaren antialiasing-a"
 
@@ -6283,7 +5893,6 @@ msgid "Image Size"
 msgstr "Irudiaren tamaina"
 
 #: ../plug-ins/common/postscript.c:3161
-#, fuzzy
 msgid "_Keep aspect ratio"
 msgstr "_Mantendu aspektu-erlazioa"
 
@@ -6314,7 +5923,6 @@ msgid "Output"
 msgstr "Irteera"
 
 #: ../plug-ins/common/postscript.c:3213
-#, fuzzy
 msgid "_PostScript level 2"
 msgstr "_PostScript 2. maila"
 
@@ -6327,35 +5935,38 @@ msgid "P_review"
 msgstr "A_urrebista"
 
 #: ../plug-ins/common/postscript.c:3252
-#, fuzzy
 msgid "Preview _size:"
-msgstr "Aurrebistaren tamaina:"
+msgstr "Aurrebistaren _tamaina:"
 
-#: ../plug-ins/common/psd.c:489
+#: ../plug-ins/common/psd.c:490
 msgid "Invalid UTF-8 string in PSD file"
 msgstr "UTF-8 kate baliogabea PSD fitxategian"
 
-#: ../plug-ins/common/psd_save.c:192
+#: ../plug-ins/common/psd_save.c:196
 msgid "Photoshop image"
-msgstr ""
+msgstr "Photoshop irudia"
 
-#: ../plug-ins/common/psd_save.c:1312
+#: ../plug-ins/common/psd_save.c:1354
 #, 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 ""
+"Ezin izan da '%s' gorde. PSD fitxategi-formatuak ez du luzeran edo zabaleran "
+"30000 pixel gainditzen duten irudirik onartzen."
 
-#: ../plug-ins/common/psd_save.c:1324
+#: ../plug-ins/common/psd_save.c:1366
 #, 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 ""
+"Ezin izan da '%s' gorde. PSD fitxategi-formatuak ez du luzeran edo zabaleran "
+"30000 pixel gainditzen duten eta geruzak dituzten irudirik onartzen."
 
 #: ../plug-ins/common/psp.c:362
 msgid "Paint Shop Pro image"
-msgstr ""
+msgstr "Paint Shop Pro irudia"
 
 #: ../plug-ins/common/psp.c:402
 msgid "Save as PSP"
@@ -6387,21 +5998,18 @@ msgid "Random Slur 1.7"
 msgstr "Urtu ausaz 1.7"
 
 #: ../plug-ins/common/randomize.c:244
-#, fuzzy
 msgid "_Hurl..."
-msgstr "Kiribildu orrialdea..."
+msgstr "_Jaurti..."
 
 #: ../plug-ins/common/randomize.c:256
 msgid "_Pick..."
-msgstr ""
+msgstr "_Jaso..."
 
 #: ../plug-ins/common/randomize.c:268
-#, fuzzy
 msgid "_Slur..."
-msgstr "Iturburua..."
+msgstr "_Urtu..."
 
 #: ../plug-ins/common/randomize.c:756 ../plug-ins/common/snoise.c:614
-#, fuzzy
 msgid "_Random seed:"
 msgstr "Ausazko _hazia:"
 
@@ -6423,149 +6031,127 @@ msgstr "Iragazkia zenbat aldiz aplikatu behar den"
 
 #: ../plug-ins/common/raw.c:166 ../plug-ins/common/raw.c:181
 msgid "Raw Image Data"
-msgstr ""
+msgstr "Formaturik gabeko irudi-datua"
 
 #: ../plug-ins/common/raw.c:915
-#, fuzzy
 msgid "Raw Image Loader"
-msgstr "/Fitxategia/_Inprimatu"
+msgstr "Formatu gabeko irudi kargatzailea"
 
 #: ../plug-ins/common/raw.c:943
-#, fuzzy
 msgid "Image"
-msgstr "Ir_udia"
+msgstr "Irudia"
 
 #: ../plug-ins/common/raw.c:955
 msgid "Planar RGB"
-msgstr ""
+msgstr "Planar GBU"
 
 #: ../plug-ins/common/raw.c:956
 msgid "Indexed"
-msgstr ""
+msgstr "Indexatua"
 
 #: ../plug-ins/common/raw.c:961
-#, fuzzy
 msgid "Image _Type:"
-msgstr "Irudi-mota:"
+msgstr "Irudi-_mota:"
 
 #: ../plug-ins/common/raw.c:1011
-#, fuzzy
 msgid "Palette"
-msgstr "Paleta biribila"
+msgstr "Paleta"
 
 #: ../plug-ins/common/raw.c:1021 ../plug-ins/common/raw.c:1109
 msgid "R, G, B (normal)"
-msgstr ""
+msgstr "R, G, B (normala)"
 
 #: ../plug-ins/common/raw.c:1022 ../plug-ins/common/raw.c:1111
 msgid "B, G, R, X (bmp style)"
-msgstr ""
+msgstr "B, G, R, X (bmp-estiloa)"
 
 #: ../plug-ins/common/raw.c:1027
-#, fuzzy
 msgid "_Palette Type:"
-msgstr "RGB eredu-mota"
+msgstr "_Paleta-mota:"
 
 #: ../plug-ins/common/raw.c:1038
-#, fuzzy
 msgid "Off_set:"
-msgstr "Desplazamendua:"
+msgstr "_Desplazamendua:"
 
 #: ../plug-ins/common/raw.c:1050
-#, fuzzy
 msgid "Select Palette File to Load"
-msgstr "Hautatu irudi-fitxategia"
+msgstr "Hautatu paleta-fitxategia kargatzeko"
 
 #: ../plug-ins/common/raw.c:1053
-#, fuzzy
 msgid "Pal_ette File:"
-msgstr "Eredua"
+msgstr "Pa_leta-fitxategia"
 
 #: ../plug-ins/common/raw.c:1081
-#, fuzzy
 msgid "Raw Image Save"
-msgstr "Irudiaren tamaina"
+msgstr "Formatu gabeko irudia gordetzea"
 
 #: ../plug-ins/common/raw.c:1095
-#, fuzzy
 msgid "RGB Save Type"
-msgstr "RGB eredu-mota"
+msgstr "GBU gordetze-mota"
 
 #: ../plug-ins/common/raw.c:1099
-#, fuzzy
 msgid "Standard (R,G,B)"
-msgstr "Estandarra"
+msgstr "Estandarra (R,G,B)"
 
 #: ../plug-ins/common/raw.c:1100
 msgid "Planar (RRR,GGG,BBB)"
-msgstr ""
+msgstr "Planar (RRR,GGG,BBB)"
 
 #: ../plug-ins/common/raw.c:1105
-#, fuzzy
 msgid "Indexed Palette Type"
-msgstr "RGB eredu-mota"
+msgstr "Indexatutako paleta-mota"
 
 #: ../plug-ins/common/retinex.c:168
-#, fuzzy
 msgid "_Retinex..."
-msgstr "Izurtzen..."
+msgstr "_Retinex..."
 
 #: ../plug-ins/common/retinex.c:251
-#, fuzzy
 msgid "Retinex..."
-msgstr "Biratzen..."
+msgstr "Retinex..."
 
 #: ../plug-ins/common/retinex.c:253
 msgid "Retinex (4/4): updated..."
-msgstr ""
+msgstr "Retinex (4/4): eguneratua..."
 
 #: ../plug-ins/common/retinex.c:290
-#, fuzzy
 msgid "Retinex Image Enhancement"
-msgstr "_Ertzaren hobetzea"
+msgstr "Retinex irudiaren hobetzea"
 
 #: ../plug-ins/common/retinex.c:311
 msgid "Level"
-msgstr ""
+msgstr "Maila"
 
 #: ../plug-ins/common/retinex.c:315
-#, fuzzy
 msgid "_Uniform"
-msgstr "Unitate-editorea"
+msgstr "_Uniformea"
 
 #: ../plug-ins/common/retinex.c:317
-#, fuzzy
 msgid "_Low"
-msgstr "_Behekoa"
+msgstr "_Baxua"
 
 #: ../plug-ins/common/retinex.c:319
-#, fuzzy
 msgid "_High"
-msgstr "_Altuera"
+msgstr "_Altua"
 
 #: ../plug-ins/common/retinex.c:344
-#, fuzzy
 msgid "_Scale:"
-msgstr "Eskala:"
+msgstr "_Eskala:"
 
 #: ../plug-ins/common/retinex.c:359
-#, fuzzy
 msgid "_Scale division:"
-msgstr "_Banaketa:"
+msgstr "Eskala-_banaketa:"
 
 #: ../plug-ins/common/retinex.c:374
 msgid "_Dynamic:"
-msgstr ""
+msgstr "_Dinamikoa:"
 
 #: ../plug-ins/common/retinex.c:648
-#, fuzzy
 msgid "Retinex: Filtering..."
-msgstr "Mugimendu-lausotzea..."
+msgstr "Retinex: iragaztea..."
 
 #: ../plug-ins/common/ripple.c:138
-#, fuzzy
 msgid "_Ripple..."
-msgstr "Izurtzen..."
+msgstr "_Izurtzea..."
 
 #: ../plug-ins/common/ripple.c:222
 msgid "Rippling..."
@@ -6576,7 +6162,6 @@ msgid "Ripple"
 msgstr "Izurtu"
 
 #: ../plug-ins/common/ripple.c:522
-#, fuzzy
 msgid "_Retain tilability"
 msgstr "_Mantendu mosaiko bihurtzeko gaitasuna"
 
@@ -6623,16 +6208,14 @@ msgid "Rotating..."
 msgstr "Biratzen..."
 
 #: ../plug-ins/common/sample_colorize.c:296
-#, fuzzy
 msgid "_Sample Colorize..."
-msgstr "Laginaren arabera koloreztatu"
+msgstr "_Laginaren arabera koloreztatu..."
 
 #: ../plug-ins/common/sample_colorize.c:1310
 msgid "Sample Colorize"
 msgstr "Laginaren arabera koloreztatu"
 
 #: ../plug-ins/common/sample_colorize.c:1315
-#, fuzzy
 msgid "Get sample colors"
 msgstr "Lortu kolore-laginak"
 
@@ -6651,31 +6234,26 @@ msgid "Sample:"
 msgstr "Lagina:"
 
 #: ../plug-ins/common/sample_colorize.c:1361
-#, fuzzy
 msgid "From reverse gradient"
 msgstr "Leheneratutako gradientetik"
 
 #: ../plug-ins/common/sample_colorize.c:1366
-#, fuzzy
 msgid "From gradient"
 msgstr "Gradientetik"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1387
 #: ../plug-ins/common/sample_colorize.c:1414
-#, fuzzy
 msgid "Show selection"
 msgstr "Erakutsi hautapena"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1398
 #: ../plug-ins/common/sample_colorize.c:1425
-#, fuzzy
 msgid "Show color"
 msgstr "Erakutsi kolorea"
 
 #: ../plug-ins/common/sample_colorize.c:1538
-#, fuzzy
 msgid "Input levels:"
 msgstr "Sarrera-mailak:"
 
@@ -6685,25 +6263,21 @@ msgstr "Irteera-mailak:"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1628
-#, fuzzy
 msgid "Hold intensity"
 msgstr "Eutsi intentsitateari"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1639
-#, fuzzy
 msgid "Original intensity"
 msgstr "Jatorrizko intentsitatea"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1657
-#, fuzzy
 msgid "Use subcolors"
 msgstr "Erabili azpikoloreak"
 
 #. check button
 #: ../plug-ins/common/sample_colorize.c:1668
-#, fuzzy
 msgid "Smooth samples"
 msgstr "Leundu laginak"
 
@@ -6716,17 +6290,16 @@ msgid "Remap Colorized..."
 msgstr "Mapatu berriro koloreztatua..."
 
 #: ../plug-ins/common/scatter_hsv.c:113
-#, fuzzy
 msgid "S_catter HSV..."
-msgstr "HSV barreiatzen..."
+msgstr "_Barreiatu ÑSB..."
 
 #: ../plug-ins/common/scatter_hsv.c:208
 msgid "Scattering HSV..."
-msgstr "HSV barreiatzen..."
+msgstr "ÑSB barreiatzen..."
 
 #: ../plug-ins/common/scatter_hsv.c:344
 msgid "Scatter HSV"
-msgstr "Barreiatu HSV"
+msgstr "Barreiatu ÑSB"
 
 #: ../plug-ins/common/scatter_hsv.c:372
 msgid "_Holdness:"
@@ -6745,9 +6318,8 @@ msgid "_Value:"
 msgstr "_Balioa:"
 
 #: ../plug-ins/common/screenshot.c:257 ../plug-ins/winsnap/winsnap.c:990
-#, fuzzy
 msgid "_Screen Shot..."
-msgstr "Pantaila-argazkia"
+msgstr "_Pantaila-argazkia..."
 
 #: ../plug-ins/common/screenshot.c:395
 msgid "Error grabbing the pointer"
@@ -6796,9 +6368,8 @@ msgid "Grab _After"
 msgstr "Kapturatu _igarotakoan"
 
 #: ../plug-ins/common/sel_gauss.c:107
-#, fuzzy
 msgid "_Selective Gaussian Blur..."
-msgstr "Gauss-en lausotze selektiboa..."
+msgstr "Gauss-en lausotze _selektiboa..."
 
 #: ../plug-ins/common/sel_gauss.c:187
 msgid "Selective Gaussian Blur..."
@@ -6809,28 +6380,24 @@ msgid "Selective Gaussian Blur"
 msgstr "Gauss-en lausotze selektiboa"
 
 #: ../plug-ins/common/sel_gauss.c:257
-#, fuzzy
 msgid "_Blur radius:"
-msgstr "_Lausotu erradioa:"
+msgstr "_Lausotze-erradioa:"
 
 #: ../plug-ins/common/sel_gauss.c:267
-#, fuzzy
 msgid "_Max. delta:"
 msgstr "_Geh. delta:"
 
 #: ../plug-ins/common/semiflatten.c:77
-#, fuzzy
 msgid "_Semi-Flatten"
-msgstr "Erdizka berdintzen..."
+msgstr "_Erdizka berdintzea"
 
 #: ../plug-ins/common/semiflatten.c:122
 msgid "Semi-Flattening..."
 msgstr "Erdizka berdintzen..."
 
 #: ../plug-ins/common/sharpen.c:124
-#, fuzzy
 msgid "_Sharpen..."
-msgstr "Enfokatzen..."
+msgstr "_Enfokatu..."
 
 #.
 #. * Let the user know what we're doing...
@@ -6844,37 +6411,32 @@ msgid "Sharpen"
 msgstr "Enfokatu"
 
 #: ../plug-ins/common/shift.c:113
-#, fuzzy
 msgid "_Shift..."
-msgstr "Desplazatzen..."
+msgstr "_Desplazatu..."
 
 #: ../plug-ins/common/shift.c:194
 msgid "Shifting..."
 msgstr "Desplazatzen..."
 
-#: ../plug-ins/common/shift.c:349
+#: ../plug-ins/common/shift.c:360
 msgid "Shift"
 msgstr "Desplazatu"
 
-#: ../plug-ins/common/shift.c:373
-#, fuzzy
+#: ../plug-ins/common/shift.c:384
 msgid "Shift _horizontally"
 msgstr "Desplazatu _horizontalki"
 
-#: ../plug-ins/common/shift.c:374
-#, fuzzy
+#: ../plug-ins/common/shift.c:387
 msgid "Shift _vertically"
 msgstr "Desplazatu _bertikalki"
 
-#: ../plug-ins/common/shift.c:404
-#, fuzzy
+#: ../plug-ins/common/shift.c:418
 msgid "Shift _amount:"
 msgstr "Ze_nbat desplazatu:"
 
 #: ../plug-ins/common/sinus.c:191
-#, fuzzy
 msgid "_Sinus..."
-msgstr "Sinua"
+msgstr "_Sinua..."
 
 #: ../plug-ins/common/sinus.c:284
 msgid "Sinus: rendering..."
@@ -6907,12 +6469,10 @@ msgid "Calculation Settings"
 msgstr "Kalkulu-ezarpenak"
 
 #: ../plug-ins/common/sinus.c:734
-#, fuzzy
 msgid "R_andom seed:"
 msgstr "Ausazko _hazia:"
 
 #: ../plug-ins/common/sinus.c:743
-#, fuzzy
 msgid "_Force tiling?"
 msgstr "_Mosaikoa behartu?"
 
@@ -6935,12 +6495,10 @@ msgid "The colors are white and black."
 msgstr "Koloreak zuri-beltza dira."
 
 #: ../plug-ins/common/sinus.c:795
-#, fuzzy
 msgid "Bl_ack & white"
 msgstr "_Zuri-beltza"
 
 #: ../plug-ins/common/sinus.c:797
-#, fuzzy
 msgid "_Foreground & background"
 msgstr "_Atzeko planoa eta aurreko planoa"
 
@@ -6949,12 +6507,10 @@ msgid "C_hoose here:"
 msgstr "_Hautatu hemen:"
 
 #: ../plug-ins/common/sinus.c:812
-#, fuzzy
 msgid "First color"
 msgstr "Lehen kolorea"
 
 #: ../plug-ins/common/sinus.c:822
-#, fuzzy
 msgid "Second color"
 msgstr "Bigarren kolorea"
 
@@ -6999,9 +6555,8 @@ msgid "Do _Preview"
 msgstr "Sortu _aurrebista"
 
 #: ../plug-ins/common/smooth_palette.c:88
-#, fuzzy
 msgid "Smoo_th Palette..."
-msgstr "Paleta leuna"
+msgstr "Paleta _leuna..."
 
 #: ../plug-ins/common/smooth_palette.c:180
 msgid "Deriving Smooth Palette..."
@@ -7012,14 +6567,12 @@ msgid "Smooth Palette"
 msgstr "Paleta leuna"
 
 #: ../plug-ins/common/smooth_palette.c:445
-#, fuzzy
 msgid "_Search depth:"
 msgstr "_Bilatu sakonera:"
 
 #: ../plug-ins/common/snoise.c:186
-#, fuzzy
 msgid "_Solid Noise..."
-msgstr "Zarata solidoa..."
+msgstr "_Zarata solidoa..."
 
 #: ../plug-ins/common/snoise.c:336
 msgid "Solid Noise..."
@@ -7045,19 +6598,16 @@ msgid "T_ilable"
 msgstr "_Mosaikoan jar daiteke"
 
 #: ../plug-ins/common/snoise.c:666
-#, fuzzy
 msgid "_X size:"
 msgstr "_X tamaina:"
 
 #: ../plug-ins/common/snoise.c:679
-#, fuzzy
 msgid "_Y size:"
 msgstr "_Y tamaina:"
 
 #: ../plug-ins/common/sobel.c:119
-#, fuzzy
 msgid "_Sobel..."
-msgstr "_Sobel"
+msgstr "_Sobel..."
 
 #: ../plug-ins/common/sobel.c:227
 msgid "Sobel Edge Detection"
@@ -7072,7 +6622,6 @@ msgid "Sobel _Vertically"
 msgstr "Sobel _bertikalki"
 
 #: ../plug-ins/common/sobel.c:273
-#, fuzzy
 msgid "_Keep sign of result (one direction only)"
 msgstr "_Mantendu emaitzaren zeinua (noranzko batean bakarrik)"
 
@@ -7081,23 +6630,20 @@ msgid "Sobel Edge Detecting..."
 msgstr "Sobel: ertzak detektatzen..."
 
 #: ../plug-ins/common/softglow.c:138
-#, fuzzy
 msgid "_Softglow..."
-msgstr "_Sobel"
+msgstr "_Argitasun leuna..."
 
 #: ../plug-ins/common/softglow.c:629
 msgid "Softglow"
-msgstr ""
+msgstr "Lausotze leuna"
 
 #: ../plug-ins/common/softglow.c:659
-#, fuzzy
 msgid "_Glow radius:"
-msgstr "_Lausotu erradioa:"
+msgstr "_Lausotze-erradioa:"
 
 #: ../plug-ins/common/sparkle.c:186
-#, fuzzy
 msgid "_Sparkle..."
-msgstr "Txinpartak ateratzen..."
+msgstr "Atera -txinpartak..."
 
 #: ../plug-ins/common/sparkle.c:292
 msgid "Sparkling..."
@@ -7116,7 +6662,6 @@ msgid "Adjust the Luminosity Threshold"
 msgstr "Doitu argitasunaren muga"
 
 #: ../plug-ins/common/sparkle.c:376
-#, fuzzy
 msgid "F_lare intensity:"
 msgstr "_Erlantzaren intentsitatea:"
 
@@ -7125,7 +6670,6 @@ msgid "Adjust the Flare Intensity"
 msgstr "Doitu erlantzaren intentsitatea"
 
 #: ../plug-ins/common/sparkle.c:386
-#, fuzzy
 msgid "_Spike length:"
 msgstr "_Erpin-luzera:"
 
@@ -7134,7 +6678,6 @@ msgid "Adjust the Spike Length"
 msgstr "Doitu erpin-luzera"
 
 #: ../plug-ins/common/sparkle.c:396
-#, fuzzy
 msgid "Sp_ike points:"
 msgstr "Erp_in-puntuak:"
 
@@ -7143,17 +6686,14 @@ msgid "Adjust the Number of Spikes"
 msgstr "Doitu erpin-kopurua"
 
 #: ../plug-ins/common/sparkle.c:406
-#, fuzzy
 msgid "Spi_ke angle (-1: random):"
-msgstr "Erpi_n-angelua (-1: Ausazkoa):"
+msgstr "Erpi_n-angelua (-1: ausazkoa):"
 
 #: ../plug-ins/common/sparkle.c:409
-#, fuzzy
 msgid "Adjust the Spike Angle (-1 means a Random Angle is chosen)"
-msgstr "Doitu erpin-angelua (-1ek ausazko angelua hautatu dela esan nahi du)"
+msgstr "Doitu erpin-angelua (-1ek ausazko angelua aukeratu dela esan nahi du)"
 
 #: ../plug-ins/common/sparkle.c:417
-#, fuzzy
 msgid "Spik_e density:"
 msgstr "_Erpin-dentsitatea:"
 
@@ -7166,16 +6706,14 @@ msgid "Adjust the Opacity of the Spikes"
 msgstr "Doitu erpinaren opakutasuna"
 
 #: ../plug-ins/common/sparkle.c:437
-#, fuzzy
 msgid "_Random hue:"
-msgstr "A_usazko �bardura:"
+msgstr "A_usazko ñabardura:"
 
 #: ../plug-ins/common/sparkle.c:440
 msgid "Adjust the Value how much the Hue should be changed randomly"
-msgstr "Zehaztu �bardura ausaz zenbat aldatu behar den"
+msgstr "Zehaztu ñabardura ausaz zenbat aldatu behar den"
 
 #: ../plug-ins/common/sparkle.c:448
-#, fuzzy
 msgid "Rando_m saturation:"
 msgstr "Au_sazko saturazioa:"
 
@@ -7184,7 +6722,6 @@ msgid "Adjust the Value how much the Saturation should be changed randomly"
 msgstr "Zehaztu saturazioa ausaz zenbat aldatu behar den"
 
 #: ../plug-ins/common/sparkle.c:465
-#, fuzzy
 msgid "_Preserve luminosity"
 msgstr "_Mantendu argitasuna"
 
@@ -7201,7 +6738,6 @@ msgid "Should an Inverse Effect be done?"
 msgstr "Alderantzizko efektua egitea nahi duzu?"
 
 #: ../plug-ins/common/sparkle.c:490
-#, fuzzy
 msgid "A_dd border"
 msgstr "_Gehitu ertza"
 
@@ -7210,32 +6746,26 @@ msgid "Draw a Border of Spikes around the Image"
 msgstr "Marraztu erpinez osaturiko ertz bat irudiaren inguruan"
 
 #: ../plug-ins/common/sparkle.c:507
-#, fuzzy
 msgid "_Natural color"
 msgstr "_Kolore naturala"
 
 #: ../plug-ins/common/sparkle.c:508
-#, fuzzy
 msgid "_Foreground color"
 msgstr "_Aurreko planoaren kolorea"
 
 #: ../plug-ins/common/sparkle.c:509
-#, fuzzy
 msgid "_Background color"
 msgstr "Atzeko pla_noaren kolorea"
 
 #: ../plug-ins/common/sparkle.c:516
-#, fuzzy
 msgid "Use the color of the image"
 msgstr "Erabili irudiaren kolorea"
 
 #: ../plug-ins/common/sparkle.c:517
-#, fuzzy
 msgid "Use the foreground color"
 msgstr "Erabili aurreko planoaren kolorea"
 
 #: ../plug-ins/common/sparkle.c:518
-#, fuzzy
 msgid "Use the background color"
 msgstr "Erabili atzeko planoaren kolorea"
 
@@ -7303,9 +6833,8 @@ msgid "Sphere Designer"
 msgstr "Esfera-diseinatzailea"
 
 #: ../plug-ins/common/spheredesigner.c:2518
-#, fuzzy
 msgid "Update _Preview"
-msgstr "_Eguneratu automatikoki aurrebista"
+msgstr "_Eguneratu aurrebista"
 
 #: ../plug-ins/common/spheredesigner.c:2572
 msgid "Textures"
@@ -7348,14 +6877,12 @@ msgid "Amount:"
 msgstr "Kopurua:"
 
 #: ../plug-ins/common/spheredesigner.c:2696
-#, fuzzy
 msgid "Exp.:"
 msgstr "Berr:"
 
 #: ../plug-ins/common/spheredesigner.c:2703
-#, fuzzy
 msgid "Texture Transformations"
-msgstr "%s eraldaketa"
+msgstr "Testura-eraldaketa"
 
 #: ../plug-ins/common/spheredesigner.c:2726
 msgid "Scale Y:"
@@ -7378,33 +6905,28 @@ msgid "Rotate Z:"
 msgstr "Biratu Z:"
 
 #: ../plug-ins/common/spheredesigner.c:2760
-#, fuzzy
 msgid "Position X:"
-msgstr "Kokalekua"
+msgstr "X kokalekua:"
 
 #: ../plug-ins/common/spheredesigner.c:2767
-#, fuzzy
 msgid "Position Y:"
-msgstr "Kokalekua"
+msgstr "Y kokalekua:"
 
 #: ../plug-ins/common/spheredesigner.c:2774
-#, fuzzy
 msgid "Position Z:"
-msgstr "Kokalekua"
+msgstr "Z kokalekua:"
 
 #: ../plug-ins/common/spheredesigner.c:2922
 msgid "Rendering Sphere..."
 msgstr "Esfera errendatzen..."
 
 #: ../plug-ins/common/spheredesigner.c:2979
-#, fuzzy
 msgid "Sphere _Designer..."
-msgstr "Esfera-diseinatzailea"
+msgstr "Esfera-_diseinatzailea..."
 
 #: ../plug-ins/common/spread.c:99
-#, fuzzy
 msgid "Sp_read..."
-msgstr "Sakabanatzen..."
+msgstr "_Sakabanatu..."
 
 #: ../plug-ins/common/spread.c:182
 msgid "Spreading..."
@@ -7419,9 +6941,8 @@ msgid "Spread Amount"
 msgstr "Sakabanatze-kopurua"
 
 #: ../plug-ins/common/struc.c:1146
-#, fuzzy
 msgid "_Apply Canvas..."
-msgstr "Oihala aplikatzen..."
+msgstr "_Aplikatu oihala..."
 
 #: ../plug-ins/common/struc.c:1227
 msgid "Applying Canvas..."
@@ -7432,28 +6953,24 @@ msgid "Apply Canvas"
 msgstr "Aplikatu oihala"
 
 #: ../plug-ins/common/struc.c:1290
-#, fuzzy
 msgid "_Top-right"
 msgstr "_Goiko eskuinekoa"
 
 #: ../plug-ins/common/struc.c:1291
-#, fuzzy
 msgid "Top-_left"
-msgstr "Goiko _ezkerrekoa"
+msgstr "Goiko e_zkerrekoa"
 
 #: ../plug-ins/common/struc.c:1292
-#, fuzzy
 msgid "_Bottom-left"
 msgstr "_Beheko ezkerrekoa"
 
 #: ../plug-ins/common/struc.c:1293
-#, fuzzy
 msgid "Bottom-_right"
-msgstr "Be_heko eskuinekoa"
+msgstr "Beheko e_skuinekoa"
 
 #: ../plug-ins/common/sunras.c:217 ../plug-ins/common/sunras.c:237
 msgid "SUN Rasterfile image"
-msgstr ""
+msgstr "SUN-raster irudia"
 
 #: ../plug-ins/common/sunras.c:392
 #, c-format
@@ -7506,24 +7023,23 @@ msgstr "Datu-formateatzea"
 msgid "RunLength Encoded"
 msgstr "RunLength kodetzea"
 
-#: ../plug-ins/common/svg.c:136
-#, fuzzy
+#: ../plug-ins/common/svg.c:137
 msgid "Scalable SVG image"
-msgstr "Eskalatu irudira"
+msgstr "Eskalatu SVG irudira"
 
-#: ../plug-ins/common/svg.c:313 ../plug-ins/common/svg.c:696
+#: ../plug-ins/common/svg.c:314 ../plug-ins/common/svg.c:714
 msgid "Unknown reason"
 msgstr "Zergatia ezezaguna"
 
-#: ../plug-ins/common/svg.c:317
+#: ../plug-ins/common/svg.c:318
 msgid "Rendering SVG..."
 msgstr "SVG errendatzen..."
 
-#: ../plug-ins/common/svg.c:327
+#: ../plug-ins/common/svg.c:328
 msgid "Rendered SVG"
 msgstr "SVG errendatua"
 
-#: ../plug-ins/common/svg.c:492
+#: ../plug-ins/common/svg.c:511
 msgid ""
 "SVG file does not\n"
 "specify a size!"
@@ -7531,63 +7047,57 @@ msgstr ""
 "SVG fitxategiak ez du\n"
 "tamainarik zehazten."
 
-#: ../plug-ins/common/svg.c:498 ../plug-ins/common/wmf.c:342
+#: ../plug-ins/common/svg.c:517 ../plug-ins/common/wmf.c:342
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/svg.c:703
+#: ../plug-ins/common/svg.c:721
 msgid "Render Scalable Vector Graphics"
 msgstr "Errendatu Grafiko Bektorial Eskalakorrak (SVG)"
 
-#: ../plug-ins/common/svg.c:767 ../plug-ins/common/wmf.c:554
+#: ../plug-ins/common/svg.c:785 ../plug-ins/common/wmf.c:554
 #: ../plug-ins/print/gimp_main_window.c:1009
 #: ../plug-ins/print/gimp_main_window.c:1212
 msgid "Height:"
 msgstr "Altuera:"
 
-#: ../plug-ins/common/svg.c:841 ../plug-ins/common/wmf.c:628
-#, fuzzy
+#: ../plug-ins/common/svg.c:859 ../plug-ins/common/wmf.c:628
 msgid "_X ratio:"
-msgstr "_�barduraren biraketa:"
+msgstr "_X tasa:"
 
-#: ../plug-ins/common/svg.c:863 ../plug-ins/common/wmf.c:650
-#, fuzzy
+#: ../plug-ins/common/svg.c:881 ../plug-ins/common/wmf.c:650
 msgid "_Y ratio:"
-msgstr "_�barduraren biraketa:"
+msgstr "_Y tasa:"
 
-#: ../plug-ins/common/svg.c:877 ../plug-ins/common/wmf.c:664
+#: ../plug-ins/common/svg.c:895 ../plug-ins/common/wmf.c:664
 msgid "Constrain aspect ratio"
 msgstr "Mantendu aspektu-erlazioa"
 
-#: ../plug-ins/common/svg.c:888 ../plug-ins/common/wmf.c:675
+#: ../plug-ins/common/svg.c:906 ../plug-ins/common/wmf.c:675
 #, c-format
 msgid "pixels/%a"
 msgstr "pixel/%a"
 
 #. Path Import
-#: ../plug-ins/common/svg.c:908
-#, fuzzy
+#: ../plug-ins/common/svg.c:926
 msgid "Import _paths"
 msgstr "Inportatu _bideak"
 
-#: ../plug-ins/common/svg.c:914
-msgid ""
-"Import path elements of the SVG so they can be used with the GIMP path tool"
+#: ../plug-ins/common/svg.c:932
+msgid "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Inportatu SVG-ko bide-elementuak, GIMPeko bide-tresnarekin erabil ahal "
 "izateko."
 
-#: ../plug-ins/common/svg.c:927
-#, fuzzy
+#: ../plug-ins/common/svg.c:945
 msgid "Merge imported paths"
 msgstr "Batu inportatutako bideak"
 
 #: ../plug-ins/common/tga.c:233 ../plug-ins/common/tga.c:249
-#, fuzzy
 msgid "TarGA image"
-msgstr "Irudia transferitzen"
+msgstr "TarGA irudia"
 
 #: ../plug-ins/common/tga.c:428
 #, c-format
@@ -7614,9 +7124,8 @@ msgid "Or_igin at bottom left"
 msgstr "_Jatorria behean ezkerrean"
 
 #: ../plug-ins/common/threshold_alpha.c:95
-#, fuzzy
 msgid "_Threshold Alpha..."
-msgstr "Alfa muga"
+msgstr "_Alfa muga..."
 
 #: ../plug-ins/common/threshold_alpha.c:134
 msgid "The layer preserves transparency."
@@ -7624,7 +7133,7 @@ msgstr "Geruzak gardentasuna gordetzen du."
 
 #: ../plug-ins/common/threshold_alpha.c:140
 msgid "RGBA/GRAYA drawable is not selected."
-msgstr "RGBA/GRAYA marrazgaia ez dago hautatuta."
+msgstr "GBUA/GRAYA marrazgaia ez dago hautatuta."
 
 #: ../plug-ins/common/threshold_alpha.c:202
 msgid "Threshold Alpha: Coloring Transparency..."
@@ -7640,9 +7149,8 @@ msgstr "Muga:"
 
 #: ../plug-ins/common/tiff.c:211 ../plug-ins/common/tiff.c:232
 #: ../plug-ins/common/tiff.c:249
-#, fuzzy
 msgid "TIFF image"
-msgstr "TIFF kanala"
+msgstr "TIFF irudia"
 
 #: ../plug-ins/common/tiff.c:850
 #, c-format
@@ -7711,9 +7219,8 @@ msgid "Comment:"
 msgstr "Iruzkina:"
 
 #: ../plug-ins/common/tile.c:112
-#, fuzzy
 msgid "_Tile..."
-msgstr "Mosaikoa..."
+msgstr "_Mosaikoa..."
 
 #. Set the tile cache size
 #: ../plug-ins/common/tile.c:192 ../plug-ins/common/tileit.c:320
@@ -7733,9 +7240,8 @@ msgid "C_reate New Image"
 msgstr "Sortu irudi berri_a"
 
 #: ../plug-ins/common/tileit.c:224
-#, fuzzy
 msgid "_Small Tiles..."
-msgstr "_Lauza guztiak"
+msgstr "_Mosaiko txikiak..."
 
 #. Get the preview image
 #: ../plug-ins/common/tileit.c:363
@@ -7749,17 +7255,14 @@ msgid "Flip"
 msgstr "Irauli"
 
 #: ../plug-ins/common/tileit.c:454
-#, fuzzy
 msgid "A_ll tiles"
 msgstr "_Lauza guztiak"
 
 #: ../plug-ins/common/tileit.c:468
-#, fuzzy
 msgid "Al_ternate tiles"
 msgstr "T_xandakatu lauzak"
 
 #: ../plug-ins/common/tileit.c:482
-#, fuzzy
 msgid "_Explicit tile"
 msgstr "L_auza esplizitua"
 
@@ -7777,13 +7280,12 @@ msgstr "_Opakutasuna:"
 
 #. Lower frame saying howmany segments
 #: ../plug-ins/common/tileit.c:573
-#, fuzzy
 msgid "Number of Segments"
 msgstr "_Segmentu-kopurua:"
 
 #: ../plug-ins/common/tiler.c:66
 msgid "_Make Seamless"
-msgstr ""
+msgstr "_Homogeneo egin"
 
 #: ../plug-ins/common/tiler.c:322
 msgid "Tiler..."
@@ -7806,8 +7308,7 @@ msgid "ID"
 msgstr "IDa"
 
 #: ../plug-ins/common/uniteditor.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 ""
 "Kate hau GIMPen konfigurazio-fitxategietan unitate bat identifikatzeko "
 "erabiliko da."
@@ -7875,15 +7376,12 @@ msgid "Create a new unit from scratch."
 msgstr "Sortu unitate berria hutsetik."
 
 #: ../plug-ins/common/uniteditor.c:127
-#, fuzzy
 msgid "Create a new unit with the currently selected unit as template."
-msgstr ""
-"Sortu unitate berria unean hautatutako unitatea txantiloi gisa erabiliz."
+msgstr "Sortu unitate berria unean hautatutako unitatea txantiloi gisa erabiliz."
 
 #: ../plug-ins/common/uniteditor.c:151
-#, fuzzy
 msgid "_Unit Editor"
-msgstr "Unitate-editorea"
+msgstr "_Unitate-editorea"
 
 #: ../plug-ins/common/uniteditor.c:210
 msgid "New Unit"
@@ -7891,7 +7389,7 @@ msgstr "Unitate berria"
 
 #: ../plug-ins/common/uniteditor.c:234
 msgid "_ID:"
-msgstr "_ID:"
+msgstr "_IDa:"
 
 #: ../plug-ins/common/uniteditor.c:245
 msgid "_Factor:"
@@ -7930,15 +7428,14 @@ msgid "Unit Editor"
 msgstr "Unitate-editorea"
 
 #: ../plug-ins/common/unsharp.c:143
-#, fuzzy
 msgid "_Unsharp Mask..."
-msgstr "Desenfokatze-maskara"
+msgstr "_Desenfokatze-maskara..."
 
-#: ../plug-ins/common/unsharp.c:468
+#: ../plug-ins/common/unsharp.c:469
 msgid "Merging..."
 msgstr "Batzen..."
 
-#: ../plug-ins/common/unsharp.c:635
+#: ../plug-ins/common/unsharp.c:636
 msgid "Unsharp Mask"
 msgstr "Desenfokatze-maskara"
 
@@ -7983,13 +7480,12 @@ msgid "_Dots"
 msgstr "_Puntuak"
 
 #: ../plug-ins/common/video.c:1817
-#, fuzzy
 msgid "Vi_deo..."
-msgstr "Bideoa/RGB..."
+msgstr "B_ideoa..."
 
 #: ../plug-ins/common/video.c:1889
 msgid "Video/RGB..."
-msgstr "Bideoa/RGB..."
+msgstr "Bideoa/GBU..."
 
 #: ../plug-ins/common/video.c:2020
 msgid "Video"
@@ -7997,9 +7493,8 @@ msgstr "Bideoa"
 
 #. frame for the radio buttons
 #: ../plug-ins/common/video.c:2035
-#, fuzzy
 msgid "Video Pattern"
-msgstr "Eredua"
+msgstr "Bideo-eredua"
 
 #: ../plug-ins/common/video.c:2079
 msgid "_Additive"
@@ -8010,68 +7505,56 @@ msgid "_Rotated"
 msgstr "_Biratuta"
 
 #: ../plug-ins/common/vinvert.c:84
-#, fuzzy
 msgid "_Value Invert"
-msgstr "Alderantzikatu balioa..."
+msgstr "_Alderantzikatu balioa..."
 
 #: ../plug-ins/common/vinvert.c:126
 msgid "Value Invert..."
 msgstr "Alderantzikatu balioa..."
 
 #: ../plug-ins/common/vpropagate.c:193
-#, fuzzy
 msgid "More _white (larger value)"
 msgstr "_Zuri gehiago (balio handiagoa)"
 
 #: ../plug-ins/common/vpropagate.c:196
-#, fuzzy
 msgid "More blac_k (smaller value)"
 msgstr "_Beltz gehiago (balio txikiagoa)"
 
 #: ../plug-ins/common/vpropagate.c:199
-#, fuzzy
 msgid "_Middle value to peaks"
 msgstr "_Erdiko balioa gailurretara"
 
 #: ../plug-ins/common/vpropagate.c:202
-#, fuzzy
 msgid "_Foreground to peaks"
 msgstr "_Aurreko planoa gailurretara"
 
 #: ../plug-ins/common/vpropagate.c:205
-#, fuzzy
 msgid "O_nly foreground"
 msgstr "A_urreko planoa bakarrik"
 
 #: ../plug-ins/common/vpropagate.c:208
-#, fuzzy
 msgid "Only b_ackground"
-msgstr "Atzeko p_lanoa bakarrik"
+msgstr "At_zeko planoa bakarrik"
 
 #: ../plug-ins/common/vpropagate.c:211
-#, fuzzy
 msgid "Mor_e opaque"
 msgstr "_Opakuago"
 
 #: ../plug-ins/common/vpropagate.c:214
-#, fuzzy
 msgid "More t_ransparent"
 msgstr "_Gardenago"
 
 #: ../plug-ins/common/vpropagate.c:242
-#, fuzzy
 msgid "_Value Propagate..."
-msgstr "Balioa hedatzen"
+msgstr "_Balioa hedatzea..."
 
 #: ../plug-ins/common/vpropagate.c:254
-#, fuzzy
 msgid "E_rode"
-msgstr "Modua"
+msgstr "_Higatu"
 
 #: ../plug-ins/common/vpropagate.c:266
-#, fuzzy
 msgid "_Dilate"
-msgstr "_Hustu"
+msgstr "_Luzatu"
 
 #: ../plug-ins/common/vpropagate.c:476
 msgid "Value Propagating..."
@@ -8083,42 +7566,34 @@ msgstr "Balioa hedatzen"
 
 #. Parameter settings
 #: ../plug-ins/common/vpropagate.c:1116
-#, fuzzy
 msgid "Propagate"
-msgstr "Hedatze-modua"
+msgstr "Hedatzea"
 
 #: ../plug-ins/common/vpropagate.c:1129
-#, fuzzy
 msgid "Lower t_hreshold:"
-msgstr "Behe-muga:"
+msgstr "_Behe-muga:"
 
 #: ../plug-ins/common/vpropagate.c:1141
-#, fuzzy
 msgid "_Upper threshold:"
 msgstr "_Goi-muga:"
 
 #: ../plug-ins/common/vpropagate.c:1153
-#, fuzzy
 msgid "_Propagating rate:"
 msgstr "_Hedatze-tasa:"
 
 #: ../plug-ins/common/vpropagate.c:1164
-#, fuzzy
 msgid "To l_eft"
 msgstr "E_zkerrera"
 
 #: ../plug-ins/common/vpropagate.c:1167
-#, fuzzy
 msgid "To _right"
 msgstr "E_skuinera"
 
 #: ../plug-ins/common/vpropagate.c:1170
-#, fuzzy
 msgid "To _top"
 msgstr "_Gora"
 
 #: ../plug-ins/common/vpropagate.c:1173
-#, fuzzy
 msgid "To _bottom"
 msgstr "_Behera"
 
@@ -8131,21 +7606,18 @@ msgid "Propagating Value Channel"
 msgstr "Balio-kanala hedatzen"
 
 #: ../plug-ins/common/warp.c:247
-#, fuzzy
 msgid "_Warp..."
-msgstr "Okertzen..."
+msgstr "_Okertu..."
 
 #: ../plug-ins/common/warp.c:391
 msgid "Warp"
 msgstr "Okertu"
 
 #: ../plug-ins/common/warp.c:405
-#, fuzzy
 msgid "Basic Options"
-msgstr "Aukera nagusiak"
+msgstr "Oinarrizko aukerak"
 
 #: ../plug-ins/common/warp.c:427
-#, fuzzy
 msgid "Step size:"
 msgstr "Urratsaren tamaina:"
 
@@ -8155,14 +7627,12 @@ msgstr "Iterazioak:"
 
 #. Displacement map menu
 #: ../plug-ins/common/warp.c:450
-#, fuzzy
 msgid "Displacement map:"
 msgstr "Desplazamendu-mapa:"
 
 #. =======================================================================
 #. Displacement Type
 #: ../plug-ins/common/warp.c:468
-#, fuzzy
 msgid "On edges:"
 msgstr "Ertzetan:"
 
@@ -8180,24 +7650,20 @@ msgid "Black"
 msgstr "Beltza"
 
 #: ../plug-ins/common/warp.c:524
-#, fuzzy
 msgid "FG color"
-msgstr "Aurreko planoaren kolorea"
+msgstr "AurPl-aren kolorea"
 
 #. --------------------------------------------------------------------
 #. ---------    The secondary table         --------------------------
 #: ../plug-ins/common/warp.c:544
-#, fuzzy
 msgid "Advanced Options"
-msgstr "Iragazki-paketeen aukera aurreratuak"
+msgstr "Aukera aurreratuak"
 
 #: ../plug-ins/common/warp.c:560
-#, fuzzy
 msgid "Dither size:"
 msgstr "Bilbearen tamaina:"
 
 #: ../plug-ins/common/warp.c:573
-#, fuzzy
 msgid "Rotation angle:"
 msgstr "Biratze-angelua:"
 
@@ -8207,24 +7673,20 @@ msgstr "Azpiurratsak:"
 
 #. Magnitude map menu
 #: ../plug-ins/common/warp.c:595
-#, fuzzy
 msgid "Magnitude map:"
 msgstr "Magnitude-mapa:"
 
 #: ../plug-ins/common/warp.c:617
-#, fuzzy
 msgid "Use magnitude map"
-msgstr "Magnitude-mapa:"
+msgstr "Erabili magnitude-mapa"
 
 #. --------------------------------------------------------------------
 #. ---------    The "other" table         --------------------------
 #: ../plug-ins/common/warp.c:630
-#, fuzzy
 msgid "More Advanced Options"
-msgstr "Aukera nagusiak"
+msgstr "Beste aukera aurretuak"
 
 #: ../plug-ins/common/warp.c:647
-#, fuzzy
 msgid "Gradient scale:"
 msgstr "Gradientearen eskala:"
 
@@ -8233,7 +7695,6 @@ msgid "Gradient map selection menu"
 msgstr "Gradiente-mapa hautatzeko menua"
 
 #: ../plug-ins/common/warp.c:680
-#, fuzzy
 msgid "Vector mag:"
 msgstr "Bektore-magnitudea:"
 
@@ -8271,9 +7732,8 @@ msgid "Flow Step %d..."
 msgstr "%d urratsa..."
 
 #: ../plug-ins/common/waves.c:127
-#, fuzzy
 msgid "_Waves..."
-msgstr "Gorde honela..."
+msgstr "_Uhinak..."
 
 #: ../plug-ins/common/waves.c:249
 msgid "Waves"
@@ -8326,9 +7786,8 @@ msgstr ""
 "%s"
 
 #: ../plug-ins/common/whirlpinch.c:161
-#, fuzzy
 msgid "W_hirl and Pinch..."
-msgstr "Bihurritu eta tira"
+msgstr "Bi_hurritu eta tira..."
 
 #: ../plug-ins/common/whirlpinch.c:348
 msgid "Whirling and Pinching..."
@@ -8339,27 +7798,22 @@ msgid "Whirl and Pinch"
 msgstr "Bihurritu eta tira"
 
 #: ../plug-ins/common/whirlpinch.c:564
-#, fuzzy
 msgid "_Whirl angle:"
 msgstr "_Bihurritze-angelua:"
 
 #: ../plug-ins/common/whirlpinch.c:576
-#, fuzzy
 msgid "_Pinch amount:"
 msgstr "_Tiratze-kopurua:"
 
 #: ../plug-ins/common/winclipboard.c:109
-#, fuzzy
 msgid "Copy to Clipboard"
-msgstr "/Editatu/Kopiatu arbelean"
+msgstr "Kopiatu arbelean"
 
 #: ../plug-ins/common/winclipboard.c:121
-#, fuzzy
 msgid "Paste from Clipboard"
-msgstr "/Editatu/Itsatsi arbeletik"
+msgstr "Itsatsi arbeletik"
 
 #: ../plug-ins/common/winclipboard.c:133
-#, fuzzy
 msgid "From Clipboard"
 msgstr "Koloretik"
 
@@ -8386,7 +7840,6 @@ msgid "Pasting..."
 msgstr "Itsasten..."
 
 #: ../plug-ins/common/wind.c:183
-#, fuzzy
 msgid "Wi_nd..."
 msgstr "Uhintzen..."
 
@@ -8457,14 +7910,12 @@ msgid "Higher values increase the magnitude of the effect"
 msgstr "Balio handiek efektuaren magnitudea handitzen dute"
 
 #: ../plug-ins/common/winprint.c:224
-#, fuzzy
 msgid "_Print"
-msgstr "Puntua"
+msgstr "_Inprimatu"
 
 #: ../plug-ins/common/winprint.c:236
-#, fuzzy
 msgid "Page Setup"
-msgstr "/Fitxategia/Prestatu orrialdea"
+msgstr "Orrialdearen konfigurazioa"
 
 #: ../plug-ins/common/winprint.c:341
 #, c-format
@@ -8511,21 +7962,19 @@ msgstr "PageSetupDlg-ek huts egin du: %d"
 
 #: ../plug-ins/common/wmf.c:131
 msgid "Microsoft WMF file"
-msgstr ""
+msgstr "Microsoft WMF fitxategia"
 
 #: ../plug-ins/common/wmf.c:336
-#, fuzzy
 msgid ""
 "WMF file does not\n"
 "specify a size!"
 msgstr ""
-"SVG fitxategiak ez du\n"
+"WMF fitxategiak ez du\n"
 "tamainarik zehazten."
 
 #: ../plug-ins/common/wmf.c:484
-#, fuzzy
 msgid "Render Windows Metafile"
-msgstr "Kargatu Windows-eko metafitxategia"
+msgstr "Marraztu Windows-eko metafitxategia"
 
 #: ../plug-ins/common/wmf.c:947 ../plug-ins/sgi/sgi.c:318
 #, c-format
@@ -8538,7 +7987,7 @@ msgstr "WMF errendatua"
 
 #: ../plug-ins/common/xbm.c:169 ../plug-ins/common/xbm.c:187
 msgid "X BitMap image"
-msgstr ""
+msgstr "X Bitmap irudia"
 
 #: ../plug-ins/common/xbm.c:241
 msgid "Created with The GIMP"
@@ -8611,28 +8060,23 @@ msgstr "XBM aukerak"
 
 #. X10 format
 #: ../plug-ins/common/xbm.c:1167
-#, fuzzy
 msgid "_X10 format bitmap"
 msgstr "_X10 formatuko bit-mapa"
 
 #: ../plug-ins/common/xbm.c:1187
-#, fuzzy
 msgid "_Identifier prefix:"
-msgstr "_Identifikatzailearen aurrizkia:"
+msgstr "_Identifikatzaile-aurrizkia:"
 
 #. hotspot toggle
 #: ../plug-ins/common/xbm.c:1209
-#, fuzzy
 msgid "_Write hot spot values"
 msgstr "_Idatzi Hot Spot balioak"
 
 #: ../plug-ins/common/xbm.c:1231
-#, fuzzy
 msgid "Hot spot _X:"
 msgstr "Hot Spot _X:"
 
 #: ../plug-ins/common/xbm.c:1241
-#, fuzzy
 msgid "Hot spot _Y:"
 msgstr "Hot Spot _X:"
 
@@ -8642,18 +8086,16 @@ msgid "Mask File"
 msgstr "Maskara-fitxategia"
 
 #: ../plug-ins/common/xbm.c:1258
-#, fuzzy
 msgid "W_rite extra mask file"
 msgstr "I_datzi maskara-fitxategi estra"
 
 #: ../plug-ins/common/xbm.c:1271
-#, fuzzy
 msgid "_Mask file extension:"
 msgstr "_Maskara-fitxategiaren luzapena:"
 
 #: ../plug-ins/common/xpm.c:170 ../plug-ins/common/xpm.c:195
 msgid "X PixMap image"
-msgstr ""
+msgstr "X PixMap irudia"
 
 #: ../plug-ins/common/xpm.c:354
 #, c-format
@@ -8669,13 +8111,12 @@ msgid "Save as XPM"
 msgstr "Gorde XPM gisa"
 
 #: ../plug-ins/common/xpm.c:796
-#, fuzzy
 msgid "_Alpha threshold:"
 msgstr "_Alfa muga:"
 
 #: ../plug-ins/common/xwd.c:277 ../plug-ins/common/xwd.c:297
 msgid "X window dump"
-msgstr ""
+msgstr "X window-ren iraulia"
 
 #: ../plug-ins/common/xwd.c:430
 #, c-format
@@ -8683,38 +8124,35 @@ msgid "Could not read XWD header from '%s'"
 msgstr "Ezin da XWD goiburua irakurri '%s'(e)tik"
 
 #: ../plug-ins/common/xwd.c:468
-#, fuzzy
 msgid "Can't read color entries"
 msgstr "ezin dira kolore-sarrerak irakurri"
 
 #: ../plug-ins/common/xwd.c:527
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "XWD-file %s has format %d, depth %d\n"
 "and bits per pixel %d.\n"
 "Currently this is not supported."
 msgstr ""
-"load_image (xwd): %s XWD fitxategiak %d formatua, %d sakonera\n"
+"%s XWD fitxategiak %d formatua, %d sakonera\n"
 "eta %d bit pixeleko ditu.\n"
-"Une honetan hori ez da onartzen.\n"
+"Une honetan hori ez da onartzen."
 
 #: ../plug-ins/common/xwd.c:557
 msgid "Cannot save images with alpha channels."
 msgstr "Ezin izan dira alfa kanalak dituzten irudiak gorde."
 
 #: ../plug-ins/common/xwd.c:2160
-#, fuzzy
 msgid "Error during writing indexed/gray image"
 msgstr "Errorea irudi indexatu/grisa idaztean"
 
 #: ../plug-ins/common/xwd.c:2258
 msgid "Error during writing rgb image"
-msgstr "Errorea rgb irudia idaztean"
+msgstr "Errorea GBU irudia idaztean"
 
 #: ../plug-ins/common/zealouscrop.c:85
-#, fuzzy
 msgid "_Zealous Crop"
-msgstr "KontuzMoztea(tm)..."
+msgstr "_Kontuz moztea..."
 
 #: ../plug-ins/common/zealouscrop.c:133
 msgid "ZealousCropping(tm)..."
@@ -8727,7 +8165,7 @@ msgstr "Ez dago zer moztu."
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:128
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:142
 msgid "Procedure Browser"
-msgstr ""
+msgstr "Prozedura arakatzailea"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:132
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:146
@@ -8748,30 +8186,29 @@ msgstr "_Bilatu:"
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:386
 #: ../plug-ins/dbbrowser/plugin-browser.c:397
 msgid "Searching by name - please wait"
-msgstr "Izenaren arabera bilatzen - itxaron apur bat"
+msgstr "Izenaren arabera bilatzen - itxaron"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:410
 msgid "Searching by blurb - please wait"
-msgstr "Deskribapenaren arabera bilatzen - itxaron apur bat"
+msgstr "Deskribapenaren arabera bilatzen - itxaron"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:421
 msgid "Searching - please wait"
-msgstr "Bilatzen - itxaron apur bat"
+msgstr "Bilatzen - itxaron"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:428
-#, fuzzy
 msgid "1 Procedure"
-msgstr "Aldi baterako prozedura"
+msgstr "Prozedura 1"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "%d Procedures"
-msgstr "Aldi baterako prozedura"
+msgstr "%d prozedura"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:476
 #: ../plug-ins/dbbrowser/plugin-browser.c:516
 msgid "No matches"
-msgstr "Ez dago bat datorren ezer"
+msgstr "Ez dago bat datorrenik"
 
 #.
 #. *  Scales
@@ -8787,12 +8224,11 @@ msgstr "Parametroak"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:146
 msgid "Return Values"
-msgstr ""
+msgstr "Itzulitako balioak"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:159
-#, fuzzy
 msgid "Additional Information"
-msgstr "Eraldaketa espaziala"
+msgstr "Informazio gehigarria"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:198
 msgid "Author:"
@@ -8808,39 +8244,36 @@ msgstr "Copyright-a:"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:319
 msgid "Internal GIMP procedure"
-msgstr "GIMPeko barne-prozedura"
+msgstr "GIMPen barne-prozedura"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:320
 msgid "GIMP Plug-In"
-msgstr "GIMPeko plugin-a"
+msgstr "GIMPen plugin-a"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:321
 msgid "GIMP Extension"
-msgstr "GIMPeko luzapena"
+msgstr "GIMPen luzapena"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:322
 msgid "Temporary Procedure"
 msgstr "Aldi baterako prozedura"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:151
-#, fuzzy
 msgid "_Plug-In Browser"
-msgstr "Datu-base arakatzailea"
+msgstr "_Plugin-en arakatzailea"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:418
-#, fuzzy
 msgid "1 Plug-In Interface"
-msgstr "Plugin-interfazeen kopurua: %d"
+msgstr "Plugin-interfaze 1"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:420
-#, fuzzy, c-format
+#, c-format
 msgid "%d Plug-In Interfaces"
-msgstr "Plugin-interfazeen kopurua: %d"
+msgstr "%d plugin-interfaze"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:544
-#, fuzzy
 msgid "Plug-In Browser"
-msgstr "Datu-base arakatzailea"
+msgstr "Plugin-en arakatzailea"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:595
 msgid "Name"
@@ -8848,18 +8281,15 @@ msgstr "Izena"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:603
 #: ../plug-ins/dbbrowser/plugin-browser.c:672
-#, fuzzy
 msgid "Insertion Date"
-msgstr "Txertatu puntua"
+msgstr "Txertatu data"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:611
-#, fuzzy
 msgid "Menu Path"
-msgstr "Menuaren bide-izena:"
+msgstr "Menuaren bide-izena"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:619
 #: ../plug-ins/dbbrowser/plugin-browser.c:681
-#, fuzzy
 msgid "Image Types"
 msgstr "Irudi-motak"
 
@@ -8868,26 +8298,24 @@ msgid "List View"
 msgstr "Zerrenda-ikuspegia"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:663
-#, fuzzy
 msgid "Menu Path/Name"
 msgstr "Menuaren bide-izena/izena"
 
 #: ../plug-ins/dbbrowser/plugin-browser.c:704
-#, fuzzy
 msgid "Tree View"
 msgstr "Zuhaitz-ikuspegia"
 
 #: ../plug-ins/dbbrowser/procedure-browser.c:89
 msgid "Procedure _Browser"
-msgstr ""
+msgstr "Prozedura _arakatzailea"
 
 #: ../plug-ins/faxg3/faxg3.c:100
 msgid "G3 fax image"
-msgstr ""
+msgstr "G3 fax irudia"
 
 #: ../plug-ins/fits/fits.c:159 ../plug-ins/fits/fits.c:178
 msgid "Flexible Image Transport System"
-msgstr ""
+msgstr "FITS: Irudi Malguaren Garraio Sistema"
 
 #: ../plug-ins/fits/fits.c:346
 msgid "Error during open of FITS file"
@@ -8915,7 +8343,6 @@ msgid "White"
 msgstr "Zuria"
 
 #: ../plug-ins/fits/fits.c:996
-#, fuzzy
 msgid "Pixel value scaling"
 msgstr "Pixel-balioen eskala"
 
@@ -8928,9 +8355,8 @@ msgid "Image Composing"
 msgstr "Irudi-konposizioa"
 
 #: ../plug-ins/flame/flame.c:133
-#, fuzzy
 msgid "_Flame..."
-msgstr "Sugarra"
+msgstr "_Sugarra..."
 
 #: ../plug-ins/flame/flame.c:227
 msgid "Drawing Flame..."
@@ -8938,7 +8364,7 @@ msgstr "Sugarra marrazten..."
 
 #: ../plug-ins/flame/flame.c:319
 msgid "Flame works only on RGB drawables."
-msgstr "Sugarrak RGB marrazgaietan bakarrik funtzionatzen du."
+msgstr "Sugarrak GBU marrazgaietan bakarrik funtzionatzen du."
 
 #: ../plug-ins/flame/flame.c:402
 #, c-format
@@ -9019,17 +8445,14 @@ msgid "_Gamma:"
 msgstr "_Gamma:"
 
 #: ../plug-ins/flame/flame.c:1079
-#, fuzzy
 msgid "Sample _density:"
 msgstr "_Laginaren dentsitatea:"
 
 #: ../plug-ins/flame/flame.c:1090
-#, fuzzy
 msgid "Spa_tial oversample:"
 msgstr "Gai_nlaginketa espaziala:"
 
 #: ../plug-ins/flame/flame.c:1101
-#, fuzzy
 msgid "Spatial _filter radius:"
 msgstr "_Iragazki espazialaren erradioa:"
 
@@ -9038,7 +8461,6 @@ msgid "Color_map:"
 msgstr "K_olore-mapa:"
 
 #: ../plug-ins/flame/flame.c:1162
-#, fuzzy
 msgid "Custom gradient"
 msgstr "Gradiente pertsonalizatua"
 
@@ -9073,49 +8495,41 @@ msgstr "Gfig"
 
 #. Tool options notebook
 #: ../plug-ins/gfig/gfig-dialog.c:341
-#, fuzzy
 msgid "Tool options"
-msgstr "Zoom-aukerak"
+msgstr "Tresnen aukerak"
 
 #: ../plug-ins/gfig/gfig-dialog.c:358
-#, fuzzy
 msgid "_Stroke"
-msgstr "_Izpiak:"
+msgstr "_Trazua"
 
 #. Fill frame on right side
 #: ../plug-ins/gfig/gfig-dialog.c:405
-#, fuzzy
 msgid "Fill"
-msgstr "Filma"
+msgstr "Betegarria"
 
 #: ../plug-ins/gfig/gfig-dialog.c:419
 msgid "No fill"
-msgstr ""
+msgstr "Ez bete"
 
 #: ../plug-ins/gfig/gfig-dialog.c:420
-#, fuzzy
 msgid "Color fill"
 msgstr "Kolorea"
 
 #: ../plug-ins/gfig/gfig-dialog.c:421
-#, fuzzy
 msgid "Pattern fill"
 msgstr "Eredua"
 
 #: ../plug-ins/gfig/gfig-dialog.c:422
-#, fuzzy
 msgid "Gradient fill"
 msgstr "Gradientea"
 
 #. "show image" checkbutton at bottom of style frame
 #: ../plug-ins/gfig/gfig-dialog.c:482
-#, fuzzy
 msgid "Show image"
 msgstr "Erakutsi irudia"
 
 #. "show grid" checkbutton at bottom of style frame
 #: ../plug-ins/gfig/gfig-dialog.c:504
-#, fuzzy
 msgid "Show grid"
 msgstr "Erakutsi sareta"
 
@@ -9132,39 +8546,32 @@ msgid "First Gfig"
 msgstr "Lehen Gfig"
 
 #: ../plug-ins/gfig/gfig-dialog.c:859
-#, fuzzy
 msgid "_Undo"
-msgstr "Desegin"
+msgstr "_Desegin"
 
 #: ../plug-ins/gfig/gfig-dialog.c:863
-#, fuzzy
 msgid "_Clear"
-msgstr "Garbitu"
+msgstr "_Garbitu"
 
 #: ../plug-ins/gfig/gfig-dialog.c:867
-#, fuzzy
 msgid "_Grid"
-msgstr "Sareta"
+msgstr "_Sareta"
 
 #: ../plug-ins/gfig/gfig-dialog.c:875
-#, fuzzy
 msgid "Raise selected object"
-msgstr "Mugitu hautatutako objektuak"
+msgstr "Eraman gora hautatutako objektua"
 
 #: ../plug-ins/gfig/gfig-dialog.c:879
-#, fuzzy
 msgid "Lower selected object"
-msgstr "Mugitu hautatutako objektuak"
+msgstr "Eraman behera hautatutako objektuak"
 
 #: ../plug-ins/gfig/gfig-dialog.c:883
-#, fuzzy
 msgid "Raise selected object to top"
-msgstr "Hautatutako aurrezarpenak memoriatik irakurtzen ditu"
+msgstr "Eraman hautatutako objektua goienera"
 
 #: ../plug-ins/gfig/gfig-dialog.c:887
-#, fuzzy
 msgid "Lower selected object to bottom"
-msgstr "Mugitu hautatutako objektuak"
+msgstr "Eraman hautatutako objektua leku baxuenera"
 
 #: ../plug-ins/gfig/gfig-dialog.c:891
 msgid "Show previous object"
@@ -9191,7 +8598,6 @@ msgid "Create ellipse"
 msgstr "Sortu elipsea"
 
 #: ../plug-ins/gfig/gfig-dialog.c:914 ../plug-ins/gfig/gfig-stock.c:44
-#, fuzzy
 msgid "Create arc"
 msgstr "Sortu arkua"
 
@@ -9210,16 +8616,16 @@ msgstr "Sortu espirala"
 #: ../plug-ins/gfig/gfig-dialog.c:926
 msgid "Create bezier curve. Shift + Button ends object creation."
 msgstr ""
-"Sortu bezier kurba. MAIUS + botoia sakatuz gero, objektuaren sorrera "
+"Sortu bezier kurba. Maius + botoia sakatuz gero, objektuaren sorrera "
 "amaituko da."
 
 #: ../plug-ins/gfig/gfig-dialog.c:930 ../plug-ins/gfig/gfig-stock.c:48
 msgid "Move an object"
-msgstr "Mugitu objektua"
+msgstr "Aldatu lekuz objektua"
 
 #: ../plug-ins/gfig/gfig-dialog.c:933 ../plug-ins/gfig/gfig-stock.c:49
 msgid "Move a single point"
-msgstr "Mugitu puntu bakarra"
+msgstr "Aldatu lekuz puntu bakarra"
 
 #: ../plug-ins/gfig/gfig-dialog.c:936 ../plug-ins/gfig/gfig-stock.c:43
 msgid "Copy an object"
@@ -9230,29 +8636,25 @@ msgid "Delete an object"
 msgstr "Ezabatu objektua"
 
 #: ../plug-ins/gfig/gfig-dialog.c:942 ../plug-ins/gfig/gfig-stock.c:51
-#, fuzzy
 msgid "Select an object"
 msgstr "Ezabatu objektua"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1023
 msgid "This tool has no options"
-msgstr ""
+msgstr "Tresna honek ez du aukerarik"
 
 #. Put buttons in
 #: ../plug-ins/gfig/gfig-dialog.c:1230
-#, fuzzy
 msgid "Show position"
 msgstr "Erakutsi posizioa"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1242
-#, fuzzy
 msgid "Show control points"
 msgstr "Ezkutatu kontrol-puntuak"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1276
-#, fuzzy
 msgid "Max undo:"
-msgstr "Gehienezko desegitea:"
+msgstr "Geh desegitea:"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1285
 #: ../plug-ins/gimpressionist/general.c:166
@@ -9271,7 +8673,6 @@ msgid "Copy"
 msgstr "Kopiatu"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1298
-#, fuzzy
 msgid ""
 "Layer background type. Copy causes the previous layer to be copied before "
 "the draw is performed."
@@ -9305,7 +8706,6 @@ msgid "Isometric"
 msgstr "Isometrikoa"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1413
-#, fuzzy
 msgid "Grid type:"
 msgstr "Sareta-mota:"
 
@@ -9326,29 +8726,24 @@ msgid "Lighter"
 msgstr "Argiago"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1426
-#, fuzzy
 msgid "Very dark"
 msgstr "Oso iluna"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1435
-#, fuzzy
 msgid "Grid color:"
 msgstr "Saretaren kolorea:"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1638
-#, fuzzy
 msgid "Sides:"
-msgstr "Tamainak:"
+msgstr "Alboak:"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1648
-#, fuzzy
 msgid "Right"
-msgstr "E_skuinera"
+msgstr "Eskuina"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1649
-#, fuzzy
 msgid "Left"
-msgstr "E_zkerrera"
+msgstr "Ezkerra"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1659
 #: ../plug-ins/gimpressionist/orientation.c:130
@@ -9378,39 +8773,35 @@ msgstr "Objektuaren xehetasunak"
 
 #. Position labels
 #: ../plug-ins/gfig/gfig-preview.c:383
-#, fuzzy
 msgid "XY position:"
 msgstr "XY posizioa:"
 
 #: ../plug-ins/gfig/gfig-spiral.c:59
-#, fuzzy
 msgid "Spiral Number of Turns"
-msgstr "Espirala: puntu-kopurua"
+msgstr "Espirala: bira-kopurua"
 
 #: ../plug-ins/gfig/gfig-star.c:57
 msgid "Star Number of Points"
 msgstr "Izarra: puntu-kopurua"
 
 #: ../plug-ins/gfig/gfig-stock.c:41
-#, fuzzy
 msgid "Create bezier curve"
-msgstr "Sortu zirkulua"
+msgstr "Sortu bezier kurba"
 
 #: ../plug-ins/gfig/gfig.c:132
-#, fuzzy
 msgid "_Gfig..."
-msgstr "Gfig"
+msgstr "_Irudi geometrikoak (Gfig)..."
 
 #: ../plug-ins/gfig/gfig.c:726
 msgid ""
 "Error trying to save figure as a parasite: can't attach parasite to "
 "drawable.\n"
-msgstr ""
+msgstr "Errorea irudia parasito gisa gordetzean: ezin da parasito marrazgaiari erantsi.\n"
 
-#: ../plug-ins/gfig/gfig.c:747
+#: ../plug-ins/gfig/gfig.c:752
 #, c-format
-msgid "Error trying to open temp file '%s'for parasite loading.\n"
-msgstr ""
+msgid "Error trying to open temporary file '%s' for parasite loading: %s"
+msgstr "Errorea '%s' aldi baterako fitxategia irekitzean parasitoa kargatzeko: %s"
 
 #: ../plug-ins/gflare/gflare.c:560
 msgid "Addition"
@@ -9421,9 +8812,8 @@ msgid "Overlay"
 msgstr "Gainjarri"
 
 #: ../plug-ins/gflare/gflare.c:821
-#, fuzzy
 msgid "_GFlare..."
-msgstr "GFlare:"
+msgstr "_Erlantzaren gradientea..."
 
 #: ../plug-ins/gflare/gflare.c:960
 msgid "Gradient Flare..."
@@ -9467,10 +8857,9 @@ msgstr "Ezin izan da '%s' GFlare fitxategia idatzi: %s"
 #.
 #: ../plug-ins/gflare/gflare.c:2294
 msgid "GFlare"
-msgstr "GFlare:"
+msgstr "GFlare"
 
 #: ../plug-ins/gflare/gflare.c:2346
-#, fuzzy
 msgid "A_uto update preview"
 msgstr "_Eguneratu automatikoki aurrebista"
 
@@ -9487,9 +8876,8 @@ msgid "Ro_tation:"
 msgstr "_Biraketa:"
 
 #: ../plug-ins/gflare/gflare.c:2711
-#, fuzzy
 msgid "_Hue rotation:"
-msgstr "_�barduraren biraketa:"
+msgstr "_Ñabarduraren biraketa:"
 
 #: ../plug-ins/gflare/gflare.c:2723
 msgid "Vector _Angle:"
@@ -9500,7 +8888,6 @@ msgid "Vector _Length:"
 msgstr "Bekt_orearen _luzera:"
 
 #: ../plug-ins/gflare/gflare.c:2756
-#, fuzzy
 msgid "A_daptive supersampling"
 msgstr "_Gainlaginketa moldakorra"
 
@@ -9518,11 +8905,11 @@ msgstr "_Hautatzailea"
 
 #: ../plug-ins/gflare/gflare.c:2987
 msgid "New GFlare"
-msgstr "Gflare berria"
+msgstr "Erlantza berria"
 
 #: ../plug-ins/gflare/gflare.c:2990
 msgid "Enter a name for the new GFlare"
-msgstr "Idatzi izen bat Gflare berriarentzat"
+msgstr "Idatzi izen bat erlantza berriarentzat"
 
 #: ../plug-ins/gflare/gflare.c:3010
 #, c-format
@@ -9531,11 +8918,11 @@ msgstr "'%s' izena erabilita dago jada!"
 
 #: ../plug-ins/gflare/gflare.c:3066
 msgid "Copy GFlare"
-msgstr "Kopiatu GFlare"
+msgstr "Kopiatu erlantza"
 
 #: ../plug-ins/gflare/gflare.c:3069
 msgid "Enter a name for the copied GFlare"
-msgstr "Idatzi izen bat kopiatutako Gflare-rentzat"
+msgstr "Idatzi izen bat kopiatutako erlantzarentzat"
 
 #: ../plug-ins/gflare/gflare.c:3091
 #, c-format
@@ -9548,7 +8935,7 @@ msgstr "Ezin da ezabatu!! Gutxienez Gflare batek egon behar du."
 
 #: ../plug-ins/gflare/gflare.c:3132
 msgid "Delete GFlare"
-msgstr "Ezabatu GFlare"
+msgstr "Ezabatu erlantza"
 
 #: ../plug-ins/gflare/gflare.c:3203
 #, c-format
@@ -9557,7 +8944,7 @@ msgstr "ez da %s aurkitu gflares_list-en"
 
 #: ../plug-ins/gflare/gflare.c:3244
 msgid "GFlare Editor"
-msgstr "GFlare editorea"
+msgstr "Erlantza-editorea"
 
 #: ../plug-ins/gflare/gflare.c:3248
 msgid "Rescan Gradients"
@@ -9626,7 +9013,7 @@ msgstr "Biraketa:"
 #: ../plug-ins/gflare/gflare.c:3539 ../plug-ins/gflare/gflare.c:3645
 #: ../plug-ins/gflare/gflare.c:3782
 msgid "Hue Rotation:"
-msgstr "�barduraren biraketa:"
+msgstr "Ñabarduraren biraketa:"
 
 #: ../plug-ins/gflare/gflare.c:3553
 msgid "G_low"
@@ -9679,7 +9066,7 @@ msgstr "_Bigarren erlantzak"
 
 #: ../plug-ins/gfli/gfli.c:158 ../plug-ins/gfli/gfli.c:178
 msgid "AutoDesk FLIC animation"
-msgstr ""
+msgstr "AutoDesk FLIC animazioa"
 
 #: ../plug-ins/gfli/gfli.c:527
 #, c-format
@@ -9755,8 +9142,7 @@ msgstr "B_rotxaren erdian"
 
 #: ../plug-ins/gimpressionist/color.c:61
 msgid "Color is computed from the average of all pixels under the brush"
-msgstr ""
-"Kolorea brotxaren azpiko pixel guztien batazbestekoarekin kalkulatzen da"
+msgstr "Kolorea brotxaren azpiko pixel guztien batazbestekoarekin kalkulatzen da"
 
 #: ../plug-ins/gimpressionist/color.c:65
 msgid "Samples the color from the pixel in the center of the brush"
@@ -9792,8 +9178,7 @@ msgstr "Kolore lisoko atzeko planoa"
 
 #: ../plug-ins/gimpressionist/general.c:167
 msgid "Use a transparent background; Only the strokes painted will be visible"
-msgstr ""
-"Erabili atzeko plano gardena; pintatutako trazuak bakarrik ikusiko dira"
+msgstr "Erabili atzeko plano gardena; pintatutako trazuak bakarrik ikusiko dira"
 
 #: ../plug-ins/gimpressionist/general.c:184
 msgid "Paint edges"
@@ -9843,10 +9228,8 @@ msgid "Shadow depth:"
 msgstr "Itzalaren sakonera:"
 
 #: ../plug-ins/gimpressionist/general.c:243
-msgid ""
-"The depth of the drop shadow, i.e. how far apart from the object it should be"
-msgstr ""
-"Itzalaren sakonera, hau da, objektutik zein distantziatara egon behar duen"
+msgid "The depth of the drop shadow, i.e. how far apart from the object it should be"
+msgstr "Itzalaren sakonera, hau da, objektutik zein distantziatara egon behar duen"
 
 #: ../plug-ins/gimpressionist/general.c:248
 msgid "Shadow blur:"
@@ -9865,9 +9248,8 @@ msgid "A bailout-value for adaptive selections"
 msgstr "Hautapen moldakorretarako segurtasun-balioa"
 
 #: ../plug-ins/gimpressionist/gimp.c:79
-#, fuzzy
 msgid "_GIMPressionist..."
-msgstr "GIMPresionista"
+msgstr "_GIMPresionista..."
 
 #: ../plug-ins/gimpressionist/gimp.c:350
 msgid "Painting..."
@@ -9902,7 +9284,6 @@ msgid "Start angle:"
 msgstr "Hasierako angelua:"
 
 #: ../plug-ins/gimpressionist/orientation.c:104
-#, fuzzy
 msgid "The starting angle of the first brush to create"
 msgstr "Sortu beharreko lehen brotxaren angelua"
 
@@ -9911,7 +9292,6 @@ msgid "Angle span:"
 msgstr "Angelu arteko bitartea:"
 
 #: ../plug-ins/gimpressionist/orientation.c:116
-#, fuzzy
 msgid "The angle span of the first brush to create"
 msgstr "Sortu beharreko lehen brotxaren angelua"
 
@@ -9957,7 +9337,7 @@ msgstr "Trazuek \"fluxu-eredu\" bati jarraitzen diote"
 
 #: ../plug-ins/gimpressionist/orientation.c:163
 msgid "The hue of the region determines the direction of the stroke"
-msgstr "Eskualdearen �bardurak trazuaren noranzkoa zehazten du"
+msgstr "Eskualdearen ñabardurak trazuaren noranzkoa zehazten du"
 
 #: ../plug-ins/gimpressionist/orientation.c:166
 #: ../plug-ins/gimpressionist/size.c:169
@@ -10080,7 +9460,7 @@ msgstr "Aldatu hautatutako bektorearen indarra"
 
 #: ../plug-ins/gimpressionist/orientmap.c:680
 msgid "S_trength exp.:"
-msgstr "I_ndararen berr.:"
+msgstr "I_ndarraren berr.:"
 
 #: ../plug-ins/gimpressionist/orientmap.c:684
 #: ../plug-ins/gimpressionist/sizemap.c:513
@@ -10161,9 +9541,8 @@ msgid "Save Current"
 msgstr "Gorde unekoa"
 
 #: ../plug-ins/gimpressionist/presets.c:863
-#, fuzzy
 msgid "The Gimpressionist Defaults"
-msgstr "Gimpressionist"
+msgstr "Gimpresionistaren lehenespenak"
 
 #: ../plug-ins/gimpressionist/presets.c:979
 msgid "_Presets"
@@ -10234,13 +9613,11 @@ msgid "Size:"
 msgstr "Tamaina:"
 
 #: ../plug-ins/gimpressionist/size.c:142
-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 "Eskualdearen balioak (distirak) zehazten du trazuaren tamaina"
 
 #: ../plug-ins/gimpressionist/size.c:146
-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 "Irudiaren erdira dagoen distantziak trazuaren tamaina zehazten du"
 
 #: ../plug-ins/gimpressionist/size.c:150
@@ -10253,7 +9630,7 @@ msgstr "Erditiko noranzkoak trazuaren tamaina zehazten du"
 
 #: ../plug-ins/gimpressionist/size.c:166
 msgid "The hue of the region determines the size of the stroke"
-msgstr "Eskualdearen �bardurak trazuaren tamaina zehazten du"
+msgstr "Eskualdearen ñabardurak trazuaren tamaina zehazten du"
 
 #: ../plug-ins/gimpressionist/size.c:170
 msgid "The brush-size that matches the original image the closest is selected"
@@ -10273,36 +9650,36 @@ msgstr "Tamaina-mapen editorea"
 
 #: ../plug-ins/gimpressionist/sizemap.c:405
 msgid "Smvectors"
-msgstr "Tamaina-bektoreak"
+msgstr "Bektoreak"
 
 #: ../plug-ins/gimpressionist/sizemap.c:415
 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 ""
-"Tamaina-bektoreen eremua. Egin klik ezkerreko botoian hautatutako tamaina-"
-"bektorea mugitzeko, eskuineko botoian sagurantz seinalatzeko, eta erdiko "
-"botoian tamaina-bektore berria gehitzeko."
+"Bektoreen eremua. Egin klik ezkerreko botoian hautatutako tamaina-bektorea "
+"mugitzeko, eskuineko botoian sagurantz seinalatzeko, eta erdiko botoian "
+"tamaina-bektore berria gehitzeko."
 
 #: ../plug-ins/gimpressionist/sizemap.c:457
 msgid "Select previous smvector"
-msgstr "Hautatu aurreko tamaina-bektorea"
+msgstr "Hautatu aurreko bektorea"
 
 #: ../plug-ins/gimpressionist/sizemap.c:464
 msgid "Select next smvector"
-msgstr "Hautatu hurrengo tamaina-bektorea"
+msgstr "Hautatu hurrengo bektorea"
 
 #: ../plug-ins/gimpressionist/sizemap.c:471
 msgid "Add new smvector"
-msgstr "Gehitu tamaina-bektore berria"
+msgstr "Gehitu bektore berria"
 
 #: ../plug-ins/gimpressionist/sizemap.c:478
 msgid "Delete selected smvector"
-msgstr "Ezabatu hautatutako tamaina-bektorea"
+msgstr "Ezabatu hautatutako bektorea"
 
 #: ../plug-ins/gimpressionist/sizemap.c:491
 msgid "Change the angle of the selected smvector"
-msgstr "Aldatu hautatutako tamaina-bektorearen angelua"
+msgstr "Aldatu hautatutako bektorearen angelua"
 
 #: ../plug-ins/gimpressionist/sizemap.c:498
 msgid "S_trength:"
@@ -10310,7 +9687,7 @@ msgstr "_Indarra:"
 
 #: ../plug-ins/gimpressionist/sizemap.c:502
 msgid "Change the strength of the selected smvector"
-msgstr "Aldatu hautatutako tamaina-bektorearen indarra"
+msgstr "Aldatu hautatutako bektorearen indarra"
 
 #: ../plug-ins/gimpressionist/sizemap.c:509
 msgid "St_rength exp.:"
@@ -10321,8 +9698,8 @@ msgid ""
 "Voronoi-mode makes only the smvector closest to the given point have any "
 "influence"
 msgstr ""
-"Voronoi moduan, adierazitako puntutik hurbilen dagoen tamaina-bektoreak "
-"bakarrik du eragina"
+"Voronoi moduan, adierazitako puntutik hurbilen dagoen bektoreak bakarrik du "
+"eragina"
 
 #. don't translate the gimprc entry
 #: ../plug-ins/gimpressionist/utils.c:135
@@ -10363,23 +9740,20 @@ msgstr ""
 "%s"
 
 #: ../plug-ins/helpbrowser/dialog.c:159
-#, fuzzy
 msgid "GIMP Help browser"
 msgstr "GIMPeko Laguntza arakatzailea"
 
 #: ../plug-ins/helpbrowser/dialog.c:411
-#, fuzzy
 msgid "Document not found"
 msgstr "Ez da dokumentua aurkitu"
 
 #: ../plug-ins/helpbrowser/dialog.c:413
 msgid "The requested URL could not be loaded:"
-msgstr ""
+msgstr "Eskatutako URLa ezin izan da kargatu:"
 
 #: ../plug-ins/ifscompose/ifscompose.c:357
-#, fuzzy
 msgid "_IFS Fractal..."
-msgstr "Arrasto fraktala"
+msgstr "_Arrasto fraktala..."
 
 #. Asym
 #: ../plug-ins/ifscompose/ifscompose.c:600
@@ -10397,13 +9771,12 @@ msgid "Simple"
 msgstr "Soila"
 
 #: ../plug-ins/ifscompose/ifscompose.c:668
-#, fuzzy
 msgid "IFS Fractal: Target"
-msgstr "Arrasto fraktala"
+msgstr "Arrasto fraktala: helburua"
 
 #: ../plug-ins/ifscompose/ifscompose.c:674
 msgid "Scale Hue by:"
-msgstr "Eskalatu �bardura honen arabera:"
+msgstr "Eskalatu ñabardura honen arabera:"
 
 #: ../plug-ins/ifscompose/ifscompose.c:689
 msgid "Scale Value by:"
@@ -10415,29 +9788,24 @@ msgid "Full"
 msgstr "Osoa"
 
 #: ../plug-ins/ifscompose/ifscompose.c:713
-#, fuzzy
 msgid "IFS Fractal: Red"
-msgstr "Fraktal-mota"
+msgstr "Arrasto fraktala: gorria"
 
 #: ../plug-ins/ifscompose/ifscompose.c:720
-#, fuzzy
 msgid "IFS Fractal: Green"
-msgstr "Arrasto fraktala"
+msgstr "Arrasto fraktala: berdea"
 
 #: ../plug-ins/ifscompose/ifscompose.c:727
-#, fuzzy
 msgid "IFS Fractal: Blue"
-msgstr "Fraktal-mota"
+msgstr "Arrasto fraktala: urdina"
 
 #: ../plug-ins/ifscompose/ifscompose.c:734
-#, fuzzy
 msgid "IFS Fractal: Black"
-msgstr "Arrasto fraktala"
+msgstr "Arrasto fraktala: beltza"
 
 #: ../plug-ins/ifscompose/ifscompose.c:784
-#, fuzzy
 msgid "IFS Fractal"
-msgstr "Fraktal berria"
+msgstr "Arrasto fraktala"
 
 #: ../plug-ins/ifscompose/ifscompose.c:872
 msgid "Spatial Transformation"
@@ -10448,7 +9816,6 @@ msgid "Color Transformation"
 msgstr "Kolore-eraldaketa"
 
 #: ../plug-ins/ifscompose/ifscompose.c:888
-#, fuzzy
 msgid "Relative probability:"
 msgstr "Probabilitate erlatiboa:"
 
@@ -10457,17 +9824,14 @@ msgid "Select _All"
 msgstr "Hautatu _dena"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1067
-#, fuzzy
 msgid "Re_center"
-msgstr "Birkalkulatu _erdia"
+msgstr "Zentratu _berriro"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1067
-#, fuzzy
 msgid "Recompute Center"
-msgstr "/Birkalkulatu erdia"
+msgstr "Birkalkulatu erdia"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1071
-#, fuzzy
 msgid "Render options"
 msgstr "Errendatze-aukerak"
 
@@ -10478,23 +9842,20 @@ msgid "Move"
 msgstr "Lekuz aldatu"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1080
-#, fuzzy
 msgid "Rotate"
-msgstr "Biratuta"
+msgstr "Biratu"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1080
-#, fuzzy
 msgid "Rotate / Scale"
-msgstr "/Biratu\\/Eskalatu"
+msgstr "Biratu / Eskalatu"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1083
 msgid "Stretch"
 msgstr "Tiratu"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1180
-#, fuzzy
 msgid "IFS Fractal Render Options"
-msgstr "Errendatze-aukerak"
+msgstr "Arrasto fraktalaren errendatze-aukerak"
 
 #: ../plug-ins/ifscompose/ifscompose.c:1201
 msgid "Max. Memory:"
@@ -10517,7 +9878,7 @@ msgstr "IFS errendatzen (%d/%d)..."
 #: ../plug-ins/ifscompose/ifscompose.c:1333
 #, c-format
 msgid "Copying IFS to image (%d/%d)..."
-msgstr "IFS irudira kopiatzen (%d/%d)..."
+msgstr "Arrasto-fraktala irudira kopiatzen (%d/%d)..."
 
 #: ../plug-ins/ifscompose/ifscompose.c:1476
 #, c-format
@@ -10525,9 +9886,8 @@ msgid "Transformation %s"
 msgstr "%s eraldaketa"
 
 #: ../plug-ins/ifscompose/ifscompose.c:2400
-#, fuzzy
 msgid "Save failed"
-msgstr "Gorde fitxategia"
+msgstr "Huts egin du gordetzean"
 
 #: ../plug-ins/ifscompose/ifscompose.c:2481
 #: ../plug-ins/ifscompose/ifscompose.c:2494
@@ -10535,34 +9895,29 @@ msgid "Open failed"
 msgstr "Huts egin du irekitzean"
 
 #: ../plug-ins/ifscompose/ifscompose.c:2489
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
-msgstr "Ez dirudi '%s' fitxategia IFS Compose fitxategia denik."
+msgstr "Ez dirudi '%s' fitxategia IFS fraktal-fitxategia denik."
 
 #: ../plug-ins/ifscompose/ifscompose.c:2529
-#, fuzzy
 msgid "Save as IFS Fraktal file"
-msgstr "Gorde IFS fitxategi gisa"
+msgstr "Gorde IFS fraktal-fitxategi gisa"
 
 #: ../plug-ins/ifscompose/ifscompose.c:2559
-#, fuzzy
 msgid "Open IFS Fraktal file"
-msgstr "Ireki IFS fitxategia"
+msgstr "Ireki IFS fraktal-fitxategia"
 
 #: ../plug-ins/imagemap/imap_about.c:43
-#, fuzzy
 msgid "Imagemap plug-in 2.2"
-msgstr "Imagemap 2.0 plugin-a "
+msgstr "Imagemap 2.2 plugin-a "
 
 #: ../plug-ins/imagemap/imap_about.c:44
-#, fuzzy
 msgid "Copyright(c) 1999-2004 by Maurits Rijk"
-msgstr "Copyright(c) 1999-2003, Maurits Rijk"
+msgstr "Copyright(c) 1999-2004, Maurits Rijk"
 
 #: ../plug-ins/imagemap/imap_about.c:46
-#, fuzzy
 msgid "Released under the GNU General Public License"
-msgstr "  GNU Lizentzia Publiko Orokorraren pean argitaratua  "
+msgstr "GNU Lizentzia Publiko Orokorraren pean argitaratua"
 
 #: ../plug-ins/imagemap/imap_circle.c:64
 msgid "C_ircle"
@@ -10670,7 +10025,6 @@ msgid "Resulting Guide Bounds: %d,%d to %d,%d (%d areas)"
 msgstr "Gida-mugen emaitzak: %d,%d to %d,%d (%d area)"
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:142
-#, fuzzy
 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 "
@@ -10679,7 +10033,7 @@ msgid ""
 msgstr ""
 "Gidak irudia estaltzen duten aurrez zehazturiko laukizuzenak dira. "
 "Zabalera,\n"
-"altuera eta elkarrengandiko tartearen arabera zehazten dira gidak. Horrela,\n"
+"altuera eta elkarrengandiko tartearen arabera zehazten dituzu. Horrela,\n"
 "irudi-maparen mota arruntena bizkor sortu ahal izango duzu -\n"
 "\"koadro txikien\" irudi-bilduma, nabigazio-barretarako egokia."
 
@@ -10882,16 +10236,12 @@ msgid "Load Imagemap"
 msgstr "Kargatu irudi-mapa"
 
 #: ../plug-ins/imagemap/imap_file.c:117
-#, fuzzy
 msgid "File already exists"
-msgstr "Fitxategia badago!"
+msgstr "Fitxategia badago"
 
 #: ../plug-ins/imagemap/imap_file.c:118
-#, fuzzy
 msgid "Do you really want to overwrite?"
-msgstr ""
-"Fitxategi hori badago lehendik.\n"
-"  Ziur zaude gainidatzi nahi duzula?  "
+msgstr "Ziur zaude gainidatzi nahi duzula?"
 
 #: ../plug-ins/imagemap/imap_file.c:166
 msgid "Save Imagemap"
@@ -10950,9 +10300,8 @@ msgid "_Preview"
 msgstr "_Aurrebista"
 
 #: ../plug-ins/imagemap/imap_main.c:128
-#, fuzzy
 msgid "_ImageMap..."
-msgstr "ImageMap-i buruz..."
+msgstr "_ImageMap-i buruz..."
 
 #: ../plug-ins/imagemap/imap_main.c:594
 #: ../plug-ins/imagemap/imap_settings.c:171
@@ -10998,7 +10347,6 @@ msgid "_File"
 msgstr "_Fitxategia"
 
 #: ../plug-ins/imagemap/imap_menu.c:187
-#, fuzzy
 msgid "Open recent"
 msgstr "Ireki oraintsukoa"
 
@@ -11017,17 +10365,14 @@ msgid "_Edit"
 msgstr "_Editatu"
 
 #: ../plug-ins/imagemap/imap_menu.c:271
-#, fuzzy
 msgid "Select _all"
-msgstr "Hautatu dena"
+msgstr "Hautatu _denak"
 
 #: ../plug-ins/imagemap/imap_menu.c:274
-#, fuzzy
 msgid "Deselect _all"
 msgstr "Desautatu _denak"
 
 #: ../plug-ins/imagemap/imap_menu.c:279
-#, fuzzy
 msgid "Edit area info..."
 msgstr "Editatu arearen informazioa..."
 
@@ -11036,7 +10381,6 @@ msgid "_View"
 msgstr "_Ikusi"
 
 #: ../plug-ins/imagemap/imap_menu.c:298
-#, fuzzy
 msgid "Area list"
 msgstr "Area-zerrenda"
 
@@ -11050,7 +10394,6 @@ msgid "Grayscale"
 msgstr "Gris-eskala"
 
 #: ../plug-ins/imagemap/imap_menu.c:328
-#, fuzzy
 msgid "Zoom to"
 msgstr "Zooma"
 
@@ -11063,42 +10406,36 @@ msgid "Arrow"
 msgstr "Gezia"
 
 #: ../plug-ins/imagemap/imap_menu.c:365
-#, fuzzy
 msgid "Select contiguous region"
-msgstr "Hautatu alboko eskualdeak"
+msgstr "Hautatu inguruko eskualdeak"
 
 #: ../plug-ins/imagemap/imap_menu.c:384
 msgid "_Tools"
-msgstr "Tresn_ak"
+msgstr "_Tresnak"
 
 #: ../plug-ins/imagemap/imap_menu.c:386
-#, fuzzy
 msgid "Grid settings..."
 msgstr "Saretaren ezarpenak..."
 
 #: ../plug-ins/imagemap/imap_menu.c:389
-#, fuzzy
 msgid "Use GIMP guides..."
 msgstr "Erabili GIMP-eko gidak..."
 
 #: ../plug-ins/imagemap/imap_menu.c:391
-#, fuzzy
 msgid "Create guides..."
 msgstr "Sortu gidak..."
 
 #: ../plug-ins/imagemap/imap_menu.c:399
 msgid "_Help"
-msgstr "L_aguntza"
+msgstr "_Laguntza"
 
 #: ../plug-ins/imagemap/imap_menu.c:401
-#, fuzzy
 msgid "_Contents"
-msgstr "Testuingurua"
+msgstr "_Edukia"
 
 #: ../plug-ins/imagemap/imap_menu.c:405
-#, fuzzy
 msgid "_About ImageMap"
-msgstr "ImageMap-i buruz..."
+msgstr "_ImageMap-i buruz..."
 
 #: ../plug-ins/imagemap/imap_object_popup.c:103
 msgid "Edit Area Info..."
@@ -11153,9 +10490,8 @@ msgid "Select Color"
 msgstr "Hautatu kolorea"
 
 #: ../plug-ins/imagemap/imap_preferences.c:443
-#, fuzzy
 msgid "General"
-msgstr "_Orokorra"
+msgstr "Orokorra"
 
 #: ../plug-ins/imagemap/imap_preferences.c:447
 msgid "Default Map Type"
@@ -11186,9 +10522,8 @@ msgid "_Use double-sized grab handles"
 msgstr "Era_bili tamaina bikoitzeko heldulekuak"
 
 #: ../plug-ins/imagemap/imap_preferences.c:484
-#, fuzzy
 msgid "Menu"
-msgstr "_Menua"
+msgstr "Menua"
 
 #: ../plug-ins/imagemap/imap_preferences.c:488
 msgid "Number of _Undo levels (1 - 99):"
@@ -11237,15 +10572,15 @@ msgstr "Editatu"
 
 #: ../plug-ins/imagemap/imap_selection.c:410
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: ../plug-ins/imagemap/imap_selection.c:439
 msgid "ALT Text"
-msgstr ""
+msgstr "ALT testua"
 
 #: ../plug-ins/imagemap/imap_selection.c:449
 msgid "Target"
-msgstr "helburua"
+msgstr "Helburua"
 
 #: ../plug-ins/imagemap/imap_settings.c:90
 msgid "Settings for this Mapfile"
@@ -11320,7 +10655,6 @@ msgid "Zoom out"
 msgstr "Zooma txikiagotu"
 
 #: ../plug-ins/imagemap/imap_toolbar.c:147
-#, fuzzy
 msgid "Edit map info"
 msgstr "Editatu maparen informazioa"
 
@@ -11367,22 +10701,19 @@ msgstr ""
 "ari da..."
 
 #: ../plug-ins/maze/maze.c:163
-#, fuzzy
 msgid "_Maze..."
-msgstr "Labirintoa marrazten..."
+msgstr "_Labirintoa..."
 
 #: ../plug-ins/maze/maze.c:450
 msgid "Drawing Maze..."
 msgstr "Labirintoa marrazten..."
 
 #: ../plug-ins/maze/maze.h:2
-#, fuzzy
 msgid "Maze"
-msgstr "Marmola"
+msgstr "Labirintoa"
 
 #. entscale == Entry and Scale pair function found in pixelize.c
 #: ../plug-ins/maze/maze_face.c:202
-#, fuzzy
 msgid "Width (pixels):"
 msgstr "Zabalera (pixeletan):"
 
@@ -11391,7 +10722,6 @@ msgid "Pieces:"
 msgstr "Piezak:"
 
 #: ../plug-ins/maze/maze_face.c:219
-#, fuzzy
 msgid "Height (pixels):"
 msgstr "Altuera (pixeletan):"
 
@@ -11404,12 +10734,10 @@ msgid "Offset (1):"
 msgstr "Desplazamendua (1):"
 
 #: ../plug-ins/maze/maze_face.c:287
-#, fuzzy
 msgid "Depth first"
 msgstr "Sakonera lehenik"
 
 #: ../plug-ins/maze/maze_face.c:288
-#, fuzzy
 msgid "Prim's algorithm"
 msgstr "Prim-en algoritmoa"
 
@@ -11422,9 +10750,8 @@ msgstr ""
 "Mosaiko bihur daitekeen labirintuaren funtzionamendua ez da perfektua izango."
 
 #: ../plug-ins/pagecurl/pagecurl.c:224
-#, fuzzy
 msgid "_Pagecurl..."
-msgstr "Kiribildu orrialdea..."
+msgstr "_Kiribildu orrialdea..."
 
 #: ../plug-ins/pagecurl/pagecurl.c:443
 msgid "Pagecurl Effect"
@@ -11435,22 +10762,18 @@ msgid "Curl Location"
 msgstr "Kiribilaren kokalekua"
 
 #: ../plug-ins/pagecurl/pagecurl.c:477
-#, fuzzy
 msgid "Lower right"
 msgstr "Behean eskuinean"
 
 #: ../plug-ins/pagecurl/pagecurl.c:478
-#, fuzzy
 msgid "Lower left"
 msgstr "Behean ezkerrean"
 
 #: ../plug-ins/pagecurl/pagecurl.c:479
-#, fuzzy
 msgid "Upper left"
 msgstr "Goian ezkerrean"
 
 #: ../plug-ins/pagecurl/pagecurl.c:480
-#, fuzzy
 msgid "Upper right"
 msgstr "Goian eskuinean"
 
@@ -11459,28 +10782,24 @@ msgid "Curl Orientation"
 msgstr "Kiribilaren orientazioa"
 
 #: ../plug-ins/pagecurl/pagecurl.c:564
-#, fuzzy
 msgid "_Shade under curl"
-msgstr "Kiribilaren azpiko itzala"
+msgstr "Kiribilaren azpiko _itzala"
 
 #: ../plug-ins/pagecurl/pagecurl.c:577
 msgid "Current gradient (reversed)"
-msgstr ""
+msgstr "Uneko gradientea (alderantzikatua)"
 
 #: ../plug-ins/pagecurl/pagecurl.c:582
-#, fuzzy
 msgid "Current gradient"
-msgstr "Gradiente pertsonalizatua"
+msgstr "Uneko gradientea"
 
 #: ../plug-ins/pagecurl/pagecurl.c:587
-#, fuzzy
 msgid "Foreground / background colors"
-msgstr "_Atzeko planoa eta aurreko planoa"
+msgstr "AurPl-aren eta AtzPL-aren koloreak"
 
 #: ../plug-ins/pagecurl/pagecurl.c:607
-#, fuzzy
 msgid "_Opacity:"
-msgstr "Opakutasuna:"
+msgstr "_Opakutasuna:"
 
 #: ../plug-ins/pagecurl/pagecurl.c:730
 msgid "Curl Layer"
@@ -11740,18 +11059,16 @@ msgid "PPD File:"
 msgstr "PPD fitxategia:"
 
 #: ../plug-ins/print/gimp_main_window.c:739
-#, fuzzy
 msgid "Enter the PPD filename for your printer"
-msgstr "Idatzi PPD fitxategi-izen zuzena zure inprimagailurako"
+msgstr "Sartu PPD fitxategi-izena zure inprimagailurako"
 
 #: ../plug-ins/print/gimp_main_window.c:742
 msgid "Browse"
 msgstr "Arakatu"
 
 #: ../plug-ins/print/gimp_main_window.c:748
-#, fuzzy
 msgid "Choose the PPD file for your printer"
-msgstr "Hautatu PPD fitxategi-izen zuzena zure inprimagailurako"
+msgstr "Aukeratu PPD fitxategi-izena zure inprimagailurako"
 
 #.
 #. * Print command.
@@ -11761,18 +11078,16 @@ msgid "Command:"
 msgstr "Komandoa:"
 
 #: ../plug-ins/print/gimp_main_window.c:771
-#, fuzzy
 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 fail!"
 msgstr ""
-"Idatzi zure inprimagailuan inprimatzeko komando zuzena. Oharra: Ez kendu `-"
-"l' edo `-oraw' komando-katetik, edo ziurrenik ezingo duzu inprimatu!"
+"Idatzi zure inprimagailuan inprimatzeko komandoa. Oharra: ez kendu `-l' edo "
+"`-oraw' komando-katetik, edo ziurrenik ezingo duzu inprimatu!"
 
 #: ../plug-ins/print/gimp_main_window.c:781
-#, fuzzy
 msgid "Choose PPD File"
-msgstr "PPD fitxategia?"
+msgstr "Aukeratu PPD fitxategia"
 
 #: ../plug-ins/print/gimp_main_window.c:802
 msgid "Define New Printer"
@@ -11780,9 +11095,8 @@ msgstr "Zehaztu inprimagailu berria"
 
 #: ../plug-ins/print/gimp_main_window.c:825
 #: ../plug-ins/print/gimp_main_window.c:920
-#, fuzzy
 msgid "Printer name:"
-msgstr "Inprimagailuaren izena:"
+msgstr "Inprimagailu-izena:"
 
 #: ../plug-ins/print/gimp_main_window.c:829
 msgid "Enter the name you wish to give this logical printer"
@@ -11853,15 +11167,13 @@ msgstr ""
 "inprimagailu-mota edo modeloa"
 
 #: ../plug-ins/print/gimp_main_window.c:926
-#, fuzzy
 msgid "Printer model:"
-msgstr "Inprimagailuaren modeloa:"
+msgstr "Inprimagailu-modeloa:"
 
 #.
 #. * Setup printer button
 #.
 #: ../plug-ins/print/gimp_main_window.c:937
-#, fuzzy
 msgid "Setup printer..."
 msgstr "Konfiguratu inprimagailua..."
 
@@ -11877,7 +11189,6 @@ msgstr ""
 #. * New printer button
 #.
 #: ../plug-ins/print/gimp_main_window.c:954
-#, fuzzy
 msgid "New printer..."
 msgstr "Inprimagailu berria..."
 
@@ -11894,13 +11205,12 @@ msgid "Size of paper that you wish to print to"
 msgstr "Zein paper-tamainan inprimatu nahi duzun"
 
 #: ../plug-ins/print/gimp_main_window.c:980
-#, fuzzy
 msgid "Media size:"
 msgstr "Euskarriaren tamaina:"
 
 #: ../plug-ins/print/gimp_main_window.c:989
 msgid "Dimensions:"
-msgstr "Neurriak:"
+msgstr "Dimentsioak:"
 
 #: ../plug-ins/print/gimp_main_window.c:1003
 msgid "Width of the paper that you wish to print to"
@@ -11915,7 +11225,6 @@ msgid "Type of media you're printing to"
 msgstr "Zein euskarri-motan inprimatuko duzun"
 
 #: ../plug-ins/print/gimp_main_window.c:1039
-#, fuzzy
 msgid "Media type:"
 msgstr "Euskarri-mota:"
 
@@ -11924,7 +11233,6 @@ msgid "Source (input slot) of media you're printing to"
 msgstr "Zein euskarri-iturburutan (sarrera-erretena) inprimatuko duzun"
 
 #: ../plug-ins/print/gimp_main_window.c:1055
-#, fuzzy
 msgid "Media source:"
 msgstr "Euskarri-iturburua:"
 
@@ -11933,7 +11241,6 @@ msgid "Type of ink in the printer"
 msgstr "Inprimagailuko tinta-mota"
 
 #: ../plug-ins/print/gimp_main_window.c:1071
-#, fuzzy
 msgid "Ink type:"
 msgstr "Tinta-mota:"
 
@@ -11950,9 +11257,8 @@ msgid "Set the scale (size) of the image"
 msgstr "Ezarri irudiaren eskala (tamaina)"
 
 #: ../plug-ins/print/gimp_main_window.c:1152
-#, fuzzy
 msgid "Scale by:"
-msgstr "Z eskala:"
+msgstr "Eslakatzea:"
 
 #: ../plug-ins/print/gimp_main_window.c:1157
 msgid ""
@@ -12004,7 +11310,7 @@ msgstr "Ezarri oinarrizko neurketa-unitatea hazbetetan"
 
 #: ../plug-ins/print/gimp_main_window.c:1258
 msgid "cm"
-msgstr "cm"
+msgstr "zm"
 
 #: ../plug-ins/print/gimp_main_window.c:1264
 msgid "Set the base unit of measurement to centimetres"
@@ -12030,7 +11336,6 @@ msgid "Image / Output Settings"
 msgstr "Irudiaren / Emaitzaren ezarpenak"
 
 #: ../plug-ins/print/gimp_main_window.c:1317
-#, fuzzy
 msgid "Image type:"
 msgstr "Irudi-mota:"
 
@@ -12039,16 +11344,14 @@ msgid "Optimize the output for the type of image being printed"
 msgstr "Optimizatu emaitza inprimatuko den irudi-motarako"
 
 #: ../plug-ins/print/gimp_main_window.c:1329
-#, fuzzy
 msgid "Line art"
-msgstr "Trazatua"
+msgstr "Diseinu artistikoa"
 
 #: ../plug-ins/print/gimp_main_window.c:1336
 msgid "Fastest and brightest color for text and line art"
 msgstr "Testu eta trazatuetarako kolore bizkorrena eta biziena"
 
 #: ../plug-ins/print/gimp_main_window.c:1343
-#, fuzzy
 msgid "Solid colors"
 msgstr "Kolore lisoak"
 
@@ -12069,7 +11372,6 @@ msgstr ""
 "jarraituko irudietarako eta argazkietarako"
 
 #: ../plug-ins/print/gimp_main_window.c:1389
-#, fuzzy
 msgid "Output type:"
 msgstr "Irteera-mota:"
 
@@ -12086,7 +11388,6 @@ msgid "Print in shades of gray using black ink"
 msgstr "Inprimatu tonu grisez, tinta beltza erabiliz"
 
 #: ../plug-ins/print/gimp_main_window.c:1424
-#, fuzzy
 msgid "Black and white"
 msgstr "Zuri-beltzean"
 
@@ -12098,26 +11399,22 @@ msgstr "Inprimatu zuri-beltzean (kolorerik eta tonu grisik gabe)"
 #. *  Color adjust button
 #.
 #: ../plug-ins/print/gimp_main_window.c:1442
-#, fuzzy
 msgid "Adjust output..."
 msgstr "Doitu irteera..."
 
 #: ../plug-ins/print/gimp_main_window.c:1449
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgid "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Doitu kolore-balantzea, distira, kontrastea, saturazioa eta bilbearen "
 "algoritmoa"
 
 #: ../plug-ins/print/gimp_main_window.c:1483
-#, fuzzy
 msgid "Print to File"
-msgstr "Fitxategian inprimatu?"
+msgstr "Inprimatu fitxategian"
 
 #: ../plug-ins/print/print.c:164
-#, fuzzy
 msgid "_Print..."
-msgstr "Inprimatzen..."
+msgstr "_Inprimatu..."
 
 #: ../plug-ins/print/print.c:694 ../plug-ins/print/print.c:695
 #: ../plug-ins/print/print.c:785 ../plug-ins/print/print.c:1124
@@ -12125,100 +11422,96 @@ msgid "File"
 msgstr "Fitxategia"
 
 #: ../plug-ins/rcm/rcm.c:106
-#, fuzzy
 msgid "Colormap _Rotation..."
-msgstr "Kolore-maparen biraketa"
+msgstr "Kolore-maparen _biraketa..."
 
 #: ../plug-ins/rcm/rcm.c:270
 msgid "Rotating the colormap..."
 msgstr "Kolore-mapa biratzen..."
 
-#: ../plug-ins/rcm/rcm_dialog.c:119
+#: ../plug-ins/rcm/rcm_dialog.c:122
 msgid "Original"
 msgstr "Originala"
 
-#: ../plug-ins/rcm/rcm_dialog.c:133
+#: ../plug-ins/rcm/rcm_dialog.c:140
 msgid "Rotated"
 msgstr "Biratuta"
 
-#: ../plug-ins/rcm/rcm_dialog.c:147
+#: ../plug-ins/rcm/rcm_dialog.c:158
 msgid "Continuous update"
 msgstr "Etengabeko eguneratzea"
 
-#: ../plug-ins/rcm/rcm_dialog.c:160
+#: ../plug-ins/rcm/rcm_dialog.c:171
 msgid "Area:"
 msgstr "Area:"
 
-#: ../plug-ins/rcm/rcm_dialog.c:164
+#: ../plug-ins/rcm/rcm_dialog.c:175
 msgid "Entire Layer"
 msgstr "Geruza osoa"
 
-#: ../plug-ins/rcm/rcm_dialog.c:166
+#: ../plug-ins/rcm/rcm_dialog.c:177
 msgid "Context"
 msgstr "Testuingurua"
 
 #. spinbutton 1
-#: ../plug-ins/rcm/rcm_dialog.c:291 ../plug-ins/rcm/rcm_dialog.c:369
+#: ../plug-ins/rcm/rcm_dialog.c:302 ../plug-ins/rcm/rcm_dialog.c:380
 msgid "From"
-msgstr "Nondik"
+msgstr "Nork"
 
 #. spinbutton 2
-#: ../plug-ins/rcm/rcm_dialog.c:317 ../plug-ins/rcm/rcm_dialog.c:370
+#: ../plug-ins/rcm/rcm_dialog.c:328 ../plug-ins/rcm/rcm_dialog.c:381
 msgid "To"
-msgstr "Nora"
+msgstr "Nori"
 
 #. * Gray: Operation-Mode *
-#: ../plug-ins/rcm/rcm_dialog.c:506
-#, fuzzy
+#: ../plug-ins/rcm/rcm_dialog.c:517
 msgid "Gray Mode"
-msgstr "Kolore-modua"
+msgstr "Gris-modua"
 
 #. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:515
+#: ../plug-ins/rcm/rcm_dialog.c:526
 msgid "Treat as this"
 msgstr "Tratatu hau bezala"
 
-#: ../plug-ins/rcm/rcm_dialog.c:527
+#: ../plug-ins/rcm/rcm_dialog.c:538
 msgid "Change to this"
 msgstr "Aldatu honetara"
 
 #. * Gray: What is gray? *
-#: ../plug-ins/rcm/rcm_dialog.c:540
-#, fuzzy
+#: ../plug-ins/rcm/rcm_dialog.c:551
 msgid "Gray Threshold"
-msgstr "Muga _berdea:"
+msgstr "Gris-muga"
 
 #. * Misc: Used unit selection *
-#: ../plug-ins/rcm/rcm_dialog.c:579 ../plug-ins/rcm/rcm_dialog.c:683
+#: ../plug-ins/rcm/rcm_dialog.c:590 ../plug-ins/rcm/rcm_dialog.c:694
 msgid "Units"
 msgstr "Unitateak"
 
 #. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:588
+#: ../plug-ins/rcm/rcm_dialog.c:599
 msgid "Radians"
 msgstr "Radianak"
 
-#: ../plug-ins/rcm/rcm_dialog.c:600
+#: ../plug-ins/rcm/rcm_dialog.c:611
 msgid "Radians/Pi"
 msgstr "Radian/Pi"
 
-#: ../plug-ins/rcm/rcm_dialog.c:612
+#: ../plug-ins/rcm/rcm_dialog.c:623
 msgid "Degrees"
 msgstr "Graduak"
 
 #. Create dialog
-#: ../plug-ins/rcm/rcm_dialog.c:645
+#: ../plug-ins/rcm/rcm_dialog.c:656
 msgid "Colormap Rotation"
 msgstr "Kolore-maparen biraketa"
 
-#: ../plug-ins/rcm/rcm_dialog.c:677
+#: ../plug-ins/rcm/rcm_dialog.c:688
 msgid "Main Options"
 msgstr "Aukera nagusiak"
 
-#: ../plug-ins/rcm/rcm_dialog.c:680
-#, fuzzy
+#: ../plug-ins/rcm/rcm_dialog.c:691
 msgid "Gray Options"
-msgstr "Aukera orokorrak"
+msgstr "Gris-aukerak"
 
 #: ../plug-ins/rcm/rcm_stock.c:35
 msgid "Switch to clockwise"
@@ -12251,7 +11544,7 @@ msgstr "Hautapena bide-izenera: ezarpen aurreratuak"
 
 #: ../plug-ins/sgi/sgi.c:122 ../plug-ins/sgi/sgi.c:142
 msgid "Silicon Graphics IRIS image"
-msgstr ""
+msgstr "Silicon Graphics IRIS irudia"
 
 #: ../plug-ins/sgi/sgi.c:540
 #, c-format
@@ -12263,22 +11556,18 @@ msgid "Save as SGI"
 msgstr "Gorde SGI gisa"
 
 #: ../plug-ins/sgi/sgi.c:631
-#, fuzzy
 msgid "Compression type"
 msgstr "Konprimatze-mota"
 
 #: ../plug-ins/sgi/sgi.c:635
-#, fuzzy
 msgid "No compression"
 msgstr "Konprimatzerik ez"
 
 #: ../plug-ins/sgi/sgi.c:637
-#, fuzzy
 msgid "RLE compression"
-msgstr "_RLE konprimatzea"
+msgstr "RLE konprimatzea"
 
 #: ../plug-ins/sgi/sgi.c:639
-#, fuzzy
 msgid ""
 "Aggressive RLE\n"
 "(not supported by SGI)"
@@ -12288,15 +11577,15 @@ msgstr ""
 
 #: ../plug-ins/twain/twain.c:313
 msgid "TWAIN (Dump)..."
-msgstr ""
+msgstr "TWAIN (irauli)..."
 
 #: ../plug-ins/twain/twain.c:332
 msgid "TWAIN (Read)..."
-msgstr ""
+msgstr "TWAIN (irakurri)..."
 
 #: ../plug-ins/twain/twain.c:352
 msgid "_TWAIN..."
-msgstr ""
+msgstr "_TWAIN..."
 
 #. Initialize our progress dialog
 #: ../plug-ins/twain/twain.c:489
@@ -12305,41 +11594,42 @@ msgstr "TWAIN datuak transferitzen..."
 
 #: ../plug-ins/winicon/icodialog.c:89
 msgid "1 bpp, 1-bit alpha, 2-slot palette"
-msgstr ""
+msgstr "1 bpp, 1-bit alfa, 2-slot paleta"
 
 #: ../plug-ins/winicon/icodialog.c:90
 msgid "4 bpp, 1-bit alpha, 16-slot palette"
-msgstr ""
+msgstr "4 bpp, 1-bit alfa, 16-slot paleta"
 
 #: ../plug-ins/winicon/icodialog.c:91
 msgid "8 bpp, 1-bit alpha, 256-slot palette"
-msgstr ""
+msgstr "8 bpp, 1-bit alfa, 256-slot paleta"
 
 #: ../plug-ins/winicon/icodialog.c:92
 msgid "32 bpp, 8-bit alpha, no palette"
-msgstr ""
+msgstr "32 bpp, 8-bit alfa, paletarik gabe"
 
 #: ../plug-ins/winicon/icodialog.c:117
 msgid "GIMP Windows Icon Plugin"
-msgstr ""
+msgstr "GIMP Windows-eko ikonoen plugin-a"
 
 #: ../plug-ins/winicon/icodialog.c:138
-#, fuzzy
 msgid "Icon details"
-msgstr "Bildumaren xehetasunak"
+msgstr "Ikonoaren xehetasunak"
 
 #: ../plug-ins/winicon/icoload.c:340
 #, c-format
 msgid "Icon #%i"
-msgstr ""
+msgstr "Ikonoa: #%i"
 
 #: ../plug-ins/winicon/icosave.c:969
 msgid "Windows icons cannot be higher or wider than 255 pixels."
 msgstr ""
+"Windows-eko ikonoen zabalerak edo altuerak ezin du  255 pixel baino "
+"handiagoa izan."
 
 #: ../plug-ins/winicon/main.c:88 ../plug-ins/winicon/main.c:107
 msgid "Microsoft Windows icon"
-msgstr ""
+msgstr "Microsoft Windows ikonoa"
 
 #: ../plug-ins/winsnap/winsnap.c:877
 msgid "Grab a single window"
@@ -12354,7 +11644,6 @@ msgid "after"
 msgstr "geroago"
 
 #: ../plug-ins/winsnap/winsnap.c:919
-#, fuzzy
 msgid "Seconds delay"
 msgstr "segundo"
 
@@ -12368,7 +11657,7 @@ msgstr "Ez da daturik kapturatu"
 
 #: ../plug-ins/xjt/xjt.c:475 ../plug-ins/xjt/xjt.c:493
 msgid "GIMP compressed XJT image"
-msgstr ""
+msgstr "GIMPeko XJT irudi-konprimatua"
 
 #: ../plug-ins/xjt/xjt.c:714
 #, c-format
@@ -12405,7 +11694,6 @@ msgid "Save as XJT"
 msgstr "Gorde XJT gisa"
 
 #: ../plug-ins/xjt/xjt.c:870
-#, fuzzy
 msgid "Clear transparent"
 msgstr "Garbitu gardena"
 
@@ -12432,1415 +11720,3 @@ msgstr "Errorea: Ezin da %s XJT propietate-fitxategia irakurri"
 msgid "Error: XJT property file '%s' is empty."
 msgstr "Errorea: %s XJT propietate-fitxategia hutsik dago"
 
-#~ msgid "Before and After"
-#~ msgstr "Aurretik eta ondoren"
-
-#, fuzzy
-#~ msgid "Gfig layer %d"
-#~ msgstr "%d Gfig geruza "
-
-#, fuzzy
-#~ msgid "TIFF images"
-#~ msgstr "TIFF kanala"
-
-#~ msgid "Paint"
-#~ msgstr "Margotu"
-
-#~ msgid "All"
-#~ msgstr "Denak"
-
-#~ msgid "Clockwise"
-#~ msgstr "Erlojuaren noranzkoan"
-
-#~ msgid "Anti-Clockwise"
-#~ msgstr "Erlojuaren noranzkoaren aurka"
-
-#, fuzzy
-#~ msgid "Ifs_Compose..."
-#~ msgstr "IfsCompose"
-
-#~ msgid "IfsCompose: Target"
-#~ msgstr "IfsCompose: helburua"
-
-#~ msgid "IfsCompose: Red"
-#~ msgstr "IfsCompose: Gorria"
-
-#~ msgid "IfsCompose: Green"
-#~ msgstr "IfsCompose: Berdea"
-
-#~ msgid "IfsCompose: Blue"
-#~ msgstr "IfsCompose: Urdina"
-
-#~ msgid "IfsCompose: Black"
-#~ msgstr "IfsCompose: Beltza"
-
-#~ msgid "IfsCompose"
-#~ msgstr "IfsCompose"
-
-#, fuzzy
-#~ msgid "Rotate/scale"
-#~ msgstr "Biratu/Eskalatu"
-
-#~ msgid "/Move"
-#~ msgstr "/Lekuz aldatu"
-
-#~ msgid "/Stretch"
-#~ msgstr "/Tiratu"
-
-#~ msgid "/New"
-#~ msgstr "/Berria"
-
-#~ msgid "/Delete"
-#~ msgstr "/Ezabatu"
-
-#~ msgid "/Undo"
-#~ msgstr "/Desegin"
-
-#~ msgid "/Redo"
-#~ msgstr "/Berregin"
-
-#~ msgid "/Select All"
-#~ msgstr "/Hautatu dena"
-
-#~ msgid "IfsCompose Options"
-#~ msgstr "IfsCompose-ren aukerak"
-
-#~ msgid "Opening %s"
-#~ msgstr "%s irekitzen"
-
-#~ msgid "See %s"
-#~ msgstr "Ikus %s"
-
-#, fuzzy
-#~ msgid "Loading %s:"
-#~ msgstr "%s gordetzen:"
-
-#~ msgid "Saving %s:"
-#~ msgstr "%s gordetzen:"
-
-#~ msgid "Despeckling..."
-#~ msgstr "Parasitoak kentzen..."
-
-#~ msgid "Rendering %s"
-#~ msgstr "%s errendatzen"
-
-#~ msgid "Scale (log 2):"
-#~ msgstr "Eskalatu (log 2):"
-
-#~ msgid "Bezier Settings"
-#~ msgstr "Bezier ezarpenak"
-
-#~ msgid "Number of Sides/Points/Turns:"
-#~ msgstr "Alde/Puntu/Angeluen kopurua:"
-
-#~ msgid "Could not locate help document"
-#~ msgstr "Ezin izan da aurkitu laguntzako dokumentua"
-
-#~ 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 "
-#~ "installation is not complete. Ensure that your installation is complete "
-#~ "before reporting this error as a bug."
-#~ msgstr ""
-#~ "Eskatutako dokumentua ezin izan da GIMPen laguntzako bide-izenean "
-#~ "aurkitu. Hau da, gaia oraindik ez dela idatiz edo instalazioa ez dela "
-#~ "erabatekoa izan. Ziurtatu instalazioa osatu dela errore honi buruz berri-"
-#~ "eman aurretik."
-
-#, fuzzy
-#~ msgid "/Filters/Render"
-#~ msgstr "/Iragazkiak/Errendatuak/_Gfig..."
-
-#, fuzzy
-#~ msgid "/Filters/Light Effects"
-#~ msgstr "/Iragazkiak/Argi-efektuak/_GFlare..."
-
-#, fuzzy
-#~ msgid "/Filters/Map"
-#~ msgstr "/Iragazkiak/Mapa/_Okertu..."
-
-#, fuzzy
-#~ msgid "/Filters/Colors/Map"
-#~ msgstr "/Iragazkiak/Koloreak/_Gehienezko RGB..."
-
-#, fuzzy
-#~ msgid "/Filters/Render/Pattern"
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Labirintoa..."
-
-#, fuzzy
-#~ msgid "/Filters/Animation"
-#~ msgstr "/Iragazkiak/Animazioa/_DesOptimizatu"
-
-#, fuzzy
-#~ msgid "/Filters/Glass Effects"
-#~ msgstr "/Iragazkiak/Beira-efektuak/Beirazko _mosaikoa..."
-
-#, fuzzy
-#~ msgid "/Image/Crop"
-#~ msgstr "/Irudia/Eraldaketak/_Mozketa automatikoa"
-
-#, fuzzy
-#~ msgid "/Layer/Crop"
-#~ msgstr "/Geruza/Eraldaketak/_Kontuz moztu"
-
-#, fuzzy
-#~ msgid "/Layer/Colors/Auto"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/_Normalizatu"
-
-#, fuzzy
-#~ msgid "/Filters/Distorts"
-#~ msgstr "/Iragazkiak/Distortsioak/_Haizea..."
-
-#, fuzzy
-#~ msgid "/Filters/Blur"
-#~ msgstr "/Iragazkiak/Lausotuak/_Lausotu..."
-
-#, fuzzy
-#~ msgid "/Filters/Colors"
-#~ msgstr "/Iragazkiak/Koloreak/_Beroa..."
-
-#, fuzzy
-#~ msgid "/Layer/Colors/Info"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/_Normalizatu"
-
-#, fuzzy
-#~ msgid "/Layer/Transparency/Modify"
-#~ msgstr "/Geruza/Gardentasuna/_Alfa muga..."
-
-#, fuzzy
-#~ msgid "/Image/Mode"
-#~ msgstr "/Irudia/Eraldatuak/_Gillotina"
-
-#, fuzzy
-#~ msgid "/Filters/Generic"
-#~ msgstr "/Iragazkiak/Generikoa/_Higatu"
-
-#, fuzzy
-#~ msgid "/Filters/Artistic"
-#~ msgstr "/Iragazkiak/Artistikoa/_Kubismoa..."
-
-#, fuzzy
-#~ msgid "/Filters/Enhance"
-#~ msgstr "/Iragazkiak/Hobetuak/En_fokatu..."
-
-#, fuzzy
-#~ msgid "/Filters/Combine"
-#~ msgstr "/Iragazkiak/Konbinatuak/_Filma..."
-
-#, fuzzy
-#~ msgid "/Filters/Edge-Detect"
-#~ msgstr "/Iragazkiak/Detektatu ertzak/_Laplace"
-
-#, fuzzy
-#~ msgid "/Filters/Toys"
-#~ msgstr "/Iragazkiak/Jostailuak/Gee-_Zoom"
-
-#, fuzzy
-#~ msgid "/Image/Transform"
-#~ msgstr "/Irudia/Eraldaketak/_Mozketa automatikoa"
-
-#, fuzzy
-#~ msgid "/File/Send"
-#~ msgstr "/Fitxategia/_Inprimatu"
-
-#, fuzzy
-#~ msgid "_Do preview"
-#~ msgstr "_Egin aurrebista"
-
-#, fuzzy
-#~ msgid "/Filters/Noise"
-#~ msgstr "/Iragazkiak/Zarata/_Urtu..."
-
-#, fuzzy
-#~ msgid "/Filters/Render/Clouds"
-#~ msgstr "/Iragazkiak/Errendatuak/Hodeiak/_Plasma..."
-
-#, fuzzy
-#~ msgid "/File/Acquire"
-#~ msgstr "/Fitxategia/Eskuratu/_TWAIN..."
-
-#~ msgid "Pos X:"
-#~ msgstr "X posizioa:"
-
-#~ msgid "Pos Y:"
-#~ msgstr "Y posizioa:"
-
-#~ msgid "Pos Z:"
-#~ msgstr "Z posizioa:"
-
-#, fuzzy
-#~ msgid "/Xtns/Extensions"
-#~ msgstr "/Luzp/_Unitate-editorea"
-
-#, fuzzy
-#~ msgid "/Edit"
-#~ msgstr "/Fitxategia/_Inprimatu"
-
-#, fuzzy
-#~ msgid "/Filters/Render/Nature"
-#~ msgstr "/Iragazkiak/Errendatuak/Natura/_Sugarra..."
-
-#, fuzzy
-#~ msgid "/Filters/Web"
-#~ msgstr "/Iragazkiak/Web/_Irudi-mapa..."
-
-#, fuzzy
-#~ msgid "Source"
-#~ msgstr "1 sorburua:"
-
-#, fuzzy
-#~ msgid "Do pre_view"
-#~ msgstr "Sortu _aurrebista"
-
-#, fuzzy
-#~ msgid "_Plugin Details"
-#~ msgstr "Plugin-deskribapenak"
-
-#~ msgid "Details <<"
-#~ msgstr "Xehetasunak <<"
-
-#~ msgid "Details >>"
-#~ msgstr "Xehetasunak >>"
-
-#~ msgid "Name:"
-#~ msgstr "Izena:"
-
-#~ msgid "Blurb:"
-#~ msgstr "Deskribapena:"
-
-#~ msgid "Help:"
-#~ msgstr "Laguntza:"
-
-#~ msgid "Plugin Descriptions"
-#~ msgstr "Plugin-deskribapenak"
-
-#~ msgid "Search by Name"
-#~ msgstr "Bilatu izenaren arabera"
-
-#, fuzzy
-#~ msgid "Ins date"
-#~ msgstr "Inst. data"
-
-#, fuzzy
-#~ msgid "Menu path"
-#~ msgstr "Menuaren bide-izena"
-
-#~ msgid "Search:"
-#~ msgstr "Bilatu:"
-
-#~ msgid "In:"
-#~ msgstr "Sarrera:"
-
-#~ msgid "Out:"
-#~ msgstr "Irteera:"
-
-#, fuzzy
-#~ msgid "_Spherical"
-#~ msgstr "Esferikoa"
-
-#, fuzzy
-#~ msgid "S_inusoidal"
-#~ msgstr "Sinusoidala"
-
-#~ msgid "EOF encountered on "
-#~ msgstr "EOF aurkitu da hemen: "
-
-#~ msgid "No memory for mapping colors"
-#~ msgstr "Ez dago memoriarik koloreak mapatzeko"
-
-#~ msgid "Selection:"
-#~ msgstr "Hautapena:"
-
-#, fuzzy
-#~ msgid "E_nable antialiasing"
-#~ msgstr "_Gaitu antialiasing-a"
-
-#~ msgid "T_hreshold:"
-#~ msgstr "_Muga:"
-
-#, fuzzy
-#~ msgid "L_ight yype:"
-#~ msgstr "Argi-m_ota:"
-
-#, fuzzy
-#~ msgid "Lig_ht color:"
-#~ msgstr "_Argiaren kolorea:"
-
-#~ msgid "_Ambient:"
-#~ msgstr "_Giroa:"
-
-#~ msgid "_Diffuse:"
-#~ msgstr "_Lausoa:"
-
-#~ msgid "D_iffuse:"
-#~ msgstr "_Lausoa:"
-
-#~ msgid "_Specular:"
-#~ msgstr "_Izpilua:"
-
-#~ msgid "_Highlight:"
-#~ msgstr "_Isla:"
-
-#~ msgid "Parameters were Saved to '%s'"
-#~ msgstr "Parametroak hemen gorde dira: '%s'"
-
-#~ msgid "'%s' is not a HRZ file"
-#~ msgstr "'%s' ez da HRZ fitxategia."
-
-#~ msgid "Image must be 256x240"
-#~ msgstr "Irudiak 256x240 eduki behar du"
-
-#~ msgid "Image must be RGB or GRAY"
-#~ msgstr "Irudiak RGB edo GRISA izan behar du"
-
-#~ msgid "Brush"
-#~ msgstr "Brotxa"
-
-#~ msgid "Airbrush"
-#~ msgstr "Aerografoa"
-
-#~ msgid "Pencil"
-#~ msgstr "Arkatza"
-
-#, fuzzy
-#~ msgid ""
-#~ "Use the brush/pencil or the airbrush when drawing on the image. Pattern "
-#~ "paints with currently selected brush with a pattern. Only applies to "
-#~ "circles/ellipses if the \"Approx. Circles/Ellipses\" toggle is set."
-#~ msgstr ""
-#~ "Erabili brotxa/arkatza edo aerografoa irudian marraztean. Ereduak une "
-#~ "horretan hautatuta dagoen brotxarekin eta eredu batekin margotzen du. "
-#~ "Zirkulu eta elipseeiaplikatzeko, 'Gutxi gorabeherako zirkuluak/elipseak' "
-#~ "aukerak ezarrita egon behar du."
-
-#~ msgid "New"
-#~ msgstr "Berria"
-
-#~ msgid "Multiple"
-#~ msgstr "Anizkoitza"
-
-#, fuzzy
-#~ msgid ""
-#~ "Draw all objects on one layer (original or new) or one object per layer."
-#~ msgstr ""
-#~ "Marraztu objektu guztiak geruza batean (jatorrizkoan nahiz berrian) edo "
-#~ "objektu bat geruza bakoitzean"
-
-#~ msgid "Draw on:"
-#~ msgstr "Marraztu hemen:"
-
-#~ msgid "Selection+Fill"
-#~ msgstr "Hautapena+Bete"
-
-#, fuzzy
-#~ msgid ""
-#~ "Draw type. Either a brush or a selection. See brush page or selection "
-#~ "page for more options."
-#~ msgstr ""
-#~ "Marrazki-mota. Brotxa edo hautapena. Ikusi brotxaren orria edo "
-#~ "hautapenaren orria aukera gehiago ikusteko"
-
-#~ msgid "Using:"
-#~ msgstr "Erabiltzen:"
-
-#, fuzzy
-#~ msgid "Reverse line"
-#~ msgstr "Alderantzizko marra"
-
-#~ msgid "Draw lines in reverse order"
-#~ msgstr "Marraztu marrak alderantzizko ordenean"
-
-#, fuzzy
-#~ msgid "Scale to image"
-#~ msgstr "Eskalatu irudira"
-
-#~ msgid "Scale drawings to images size"
-#~ msgstr "Eskalatu irudiak irudien tamainara"
-
-#, fuzzy
-#~ msgid "Approx. circles/ellipses"
-#~ msgstr "Gutxi gorabeherako zirkuluak/elipseak"
-
-#~ msgid ""
-#~ "Approx. circles & ellipses using lines. Allows the use of brush fading "
-#~ "with these types of objects."
-#~ msgstr ""
-#~ "Gutxi gorabeherako zirkuluak eta elipseak marren bidez. Objektu-mota "
-#~ "hauekin brotxa-iraungitzea erabiltzeko aukera ematen du."
-
-#~ msgid "Gfig Brush Selection"
-#~ msgstr "Gfig brotxa-hautapena"
-
-#~ msgid "Fade out:"
-#~ msgstr "Iraungi:"
-
-#~ msgid "Gradient:"
-#~ msgstr "Gradientea:"
-
-#~ msgid "Pressure:"
-#~ msgstr "Presioa:"
-
-#, fuzzy
-#~ msgid "No options..."
-#~ msgstr "Aukerarik ez..."
-
-#, fuzzy
-#~ msgid "Set brush..."
-#~ msgstr "Ezarri brotxa..."
-
-#~ msgid "Add"
-#~ msgstr "Gehitu"
-
-#~ msgid "Subtract"
-#~ msgstr "Kendu"
-
-#~ msgid "Intersect"
-#~ msgstr "Ebaki"
-
-#, fuzzy
-#~ msgid "Fill type:"
-#~ msgstr "Betegarri-mota:"
-
-#~ msgid "Fill Opacity:"
-#~ msgstr "Betegarriaren opakutasuna:"
-
-#, fuzzy
-#~ msgid "Each selection"
-#~ msgstr "Hautapen bakoitza"
-
-#, fuzzy
-#~ msgid "All selections"
-#~ msgstr "Hautapen guztiak"
-
-#~ msgid "Fill after:"
-#~ msgstr "Bete honen ondoren:"
-
-#~ msgid "Segment"
-#~ msgstr "Segmentua"
-
-#~ msgid "Sector"
-#~ msgstr "Sektorea"
-
-#~ msgid "Arc as:"
-#~ msgstr "Arkua honela:"
-
-#, fuzzy
-#~ msgid "Reload image"
-#~ msgstr "Birkargatu irudia"
-
-#, fuzzy
-#~ msgid "Lock on grid"
-#~ msgstr "Blokeatu sareta"
-
-#~ msgid "Object"
-#~ msgstr "Objektua"
-
-#~ msgid "Create a new Gfig object collection for editing"
-#~ msgstr "Sortu Gfig objektu-bilduma berria editatzeko"
-
-#~ msgid "Load a single Gfig object collection"
-#~ msgstr "Kargatu Gfig objektu-bilduma soila"
-
-#~ msgid "Edit Gfig object collection"
-#~ msgstr "Editatu Gfig objektu-bilduma"
-
-#~ msgid "_Merge"
-#~ msgstr "_Batu"
-
-#, fuzzy
-#~ msgid "Merge Gfig Ooject collection into the current edit session"
-#~ msgstr "Batu Gfig objektu-bilduma uneko editatze-saioan"
-
-#~ msgid "Delete currently selected Gfig Object collection"
-#~ msgstr "Ezabatu unean hautatutako Gfig objektu-bilduma"
-
-#~ msgid "Select folder and rescan Gfig object collections"
-#~ msgstr "Hautatu karpeta eta bilatu berriro Gfig objektu-bilduma"
-
-#~ msgid "%d unsaved Gfig objects. Continue with exiting?"
-#~ msgstr "Gorde gabeko %d Gfig objektu daude. Irten egin nahi duzu?"
-
-#, fuzzy
-#~ msgid "Enter Gfig object name"
-#~ msgstr "Idatzi Gfig objektuaren izena"
-
-#, fuzzy
-#~ msgid "Gfig object name:"
-#~ msgstr "Gfig objektuaren izena:"
-
-#, fuzzy
-#~ msgid "Rescan for Gfig objects"
-#~ msgstr "Bilatu berriro Gfig objektuak"
-
-#, fuzzy
-#~ msgid "Add Gfig path"
-#~ msgstr "Gehitu Gfig-ren bide-izena"
-
-#~ msgid "Error in copy layer for onlayers"
-#~ msgstr "Errorea onlayers-erako geruza kopiatzean"
-
-#~ msgid "About Gfig"
-#~ msgstr "Gfig-i buruz"
-
-#~ msgid "Gfig - GIMP plug-in"
-#~ msgstr "Gfig - GIMP plugin-a"
-
-#~ msgid "Release 2.0"
-#~ msgstr "2.0 bertsioa"
-
-#~ msgid "New Gfig Object"
-#~ msgstr "Gfig objetku berria"
-
-#, fuzzy
-#~ msgid "Delete Gfig drawing"
-#~ msgstr "Ezabatu Gfig marrazkia"
-
-#~ msgid "%s copy"
-#~ msgstr "%s kopia"
-
-#~ msgid "Collection Details"
-#~ msgstr "Bildumaren xehetasunak"
-
-#, fuzzy
-#~ msgid "Draw name:"
-#~ msgstr "Marrazkiaren izena:"
-
-#~ msgid "(none)"
-#~ msgstr "(bat ere ez)"
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "Curl Opacity"
-#~ msgstr "Kiribilaren opakutasuna"
-
-#, fuzzy
-#~ msgid ""
-#~ "Use current gradient\n"
-#~ "instead of FG/BG-color"
-#~ msgstr ""
-#~ "Erabili uneko gradientea\n"
-#~ "AurrPl/AtzPl-ko kolorearen ordez"
-
-#~ msgid "Random Seed"
-#~ msgstr "Ausazko hazia"
-
-#, fuzzy
-#~ msgid "_Blur..."
-#~ msgstr "Lausotzen..."
-
-#~ msgid "R_andomization %:"
-#~ msgstr "A_usaz nahastea (%):"
-
-#~ msgid "You must specify either horizontal or vertical (or both)"
-#~ msgstr "Horizontala edo bertikala zehaztu behar duzu (edo biak)"
-
-#~ msgid "Blur Horizontally"
-#~ msgstr "Lausotu horizontalki"
-
-#~ msgid "Blur Vertically"
-#~ msgstr "Lausotu bertikalki"
-
-#~ msgid "Blur Radius:"
-#~ msgstr "Lausotze-erradioa:"
-
-#, fuzzy
-#~ msgid "Gaussian Blur (_RLE)..."
-#~ msgstr "/Iragazkiak/Lausotuak/Gauss-en _lausotzea (_RLE)..."
-
-#~ msgid "RLE Gaussian Blur"
-#~ msgstr "RLE Gauss-en lausotzea"
-
-#~ msgid "Image Preview"
-#~ msgstr "Irudiaren aurrebista"
-
-#~ msgid "Force baseline JPEG (Readable by all decoders)"
-#~ msgstr "Behartu oinarri-lerroko JPEG (dekodetzaile guztiek irakur dezakete)"
-
-#~ msgid "DCT method (Speed/quality tradeoff):"
-#~ msgstr "DCT metodoa (abiadura/kalitatea erlazioa):"
-
-#~ msgid "Tile _Height:"
-#~ msgstr "Mosaikoaren al_tuera:"
-
-#~ msgid "C_ell Size:"
-#~ msgstr "Gela_xkaren tamaina:"
-
-#, fuzzy
-#~ msgid "_Noisify..."
-#~ msgstr "Gehitu zarata"
-
-#~ msgid "Noisify"
-#~ msgstr "Gehitu zarata"
-
-#~ msgid "Random _Seed:"
-#~ msgstr "Ausazko _hazia:"
-
-#~ msgid "Save Color _Values From Transparent Pixels"
-#~ msgstr "Gorde kolorearen balioak pixel gardenetatik"
-
-#~ msgid "_X Offset:"
-#~ msgstr "_X desplazamendua:"
-
-#~ msgid "_Y Offset:"
-#~ msgstr "_Y desplazamendua:"
-
-#~ msgid "_Random Seed:"
-#~ msgstr "_Ausazko hazia:"
-
-#~ msgid "R_andom Seed:"
-#~ msgstr "_Ausazko hazia:"
-
-#~ msgid "Snap to Grid"
-#~ msgstr "Atxiki saretari"
-
-#~ msgid "Select Contiguous Region"
-#~ msgstr "Hautatu alboko eskualdea"
-
-#~ msgid "RLE Compression"
-#~ msgstr "RLE konprimatzea"
-
-#~ msgid "Save: No filename given"
-#~ msgstr "Gorde: Ez da fitxategi-izenik adierazi"
-
-#~ msgid "Cannot save to a folder."
-#~ msgstr "Ezin da karpeta batean gorde."
-
-#~ msgid "/Filters/Render/_Fractal Explorer..."
-#~ msgstr "/Iragazkiak/Errendatuak/_Fraktal-esploradorea..."
-
-#~ msgid "/Filters/Light Effects/_Lighting Effects..."
-#~ msgstr "/Iragazkiak/Argi-efektuak/_Argiztatze-efektuak..."
-
-#~ msgid "Preview Options"
-#~ msgstr "Aurrebistaren aukerak"
-
-#~ msgid "/Filters/Map/Map _Object..."
-#~ msgstr "/Iragazkiak/Mapa/Mapatu _objektua..."
-
-#~ msgid "Save Options"
-#~ msgstr "Gorde aukerak"
-
-#~ msgid "/Filters/Colors/Map/_Alien Map..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Alien Map..."
-
-#~ msgid "AlienMap: Transforming..."
-#~ msgstr "AlienMap: Eraldatzen..."
-
-#~ msgid "AlienMap"
-#~ msgstr "AlienMap"
-
-#~ msgid "Change intensity of the red channel"
-#~ msgstr "Aldatu kanal gorriaren intentsitatea"
-
-#~ msgid "Change intensity of the green channel"
-#~ msgstr "Aldatu kanal berdearen intentsitatea"
-
-#~ msgid "Change intensity of the blue channel"
-#~ msgstr "Aldatu kanal urdinaren intentsitatea"
-
-#~ msgid "Cos_ine"
-#~ msgstr "Kos_inua"
-
-#~ msgid "Use sine-function for red component."
-#~ msgstr "Erabili sinu-funtzioa osagai gorrirako."
-
-#~ msgid "Use cosine-function for red component."
-#~ msgstr "Erabili kosinu-funtzioa osagai gorrirako."
-
-#~ msgid ""
-#~ "Red channel: use linear mapping instead of any trigonometrical function"
-#~ msgstr ""
-#~ "Kanal gorria: erabili mapatze lineala funtzio trigonometrikoen ordez"
-
-#~ msgid "Use sine-function for green component."
-#~ msgstr "Erabili sinu-funtzioa osagai berderako."
-
-#~ msgid "Use cosine-function for green component."
-#~ msgstr "Erabili kosinu-funtzioa osagai berderako."
-
-#~ msgid ""
-#~ "Green channel: use linear mapping instead of any trigonometrical function"
-#~ msgstr ""
-#~ "Kanal berdea: erabili mapatze lineala funtzio trigonometrikoen ordez"
-
-#~ msgid "Use sine-function for blue component."
-#~ msgstr "Erabili sinu-funtzioa osagai urdinerako."
-
-#~ msgid "Use cosine-function for blue component."
-#~ msgstr "Erabili kosinu-funtzioa osagai urdinerako."
-
-#~ msgid ""
-#~ "Blue channel: use linear mapping instead of any trigonometrical function"
-#~ msgstr ""
-#~ "Kanal urdina: erabili mapatze lineala funtzio trigonometrikoen ordez"
-
-#~ msgid "About AlienMap"
-#~ msgstr "AlienMap-i buruz"
-
-#~ msgid "/Filters/Colors/Map/Alien Map _2..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/Alien Map _2..."
-
-#~ msgid "Change frequency of the red/hue channel"
-#~ msgstr "Aldatu kanal gorriaren/�barduraren intentsitatea"
-
-#~ msgid "Change angle of the red/hue channel"
-#~ msgstr "Aldatu kanal gorriaren/�barduraren angelua"
-
-#~ msgid "Change frequency of the green/saturation channel"
-#~ msgstr "Aldatu kanal berdearen/saturazioaren maiztasuna"
-
-#~ msgid "Change angle of the green/saturation channel"
-#~ msgstr "Aldatu kanal berdearen/saturazioaren angelua"
-
-#~ msgid "Change frequency of the blue/luminance channel"
-#~ msgstr "Aldatu kanal urdinaren/luminantziaren maiztasuna"
-
-#~ msgid "Change angle of the blue/luminance channel"
-#~ msgstr "Aldatu kanal urdinaren/luminantziaren angelua"
-
-#~ msgid "Use function for red/hue component"
-#~ msgstr "Erabili funtzioa osagai gorri/�bardurarentzat"
-
-#~ msgid "Use function for green/saturation component"
-#~ msgstr "Erabili funtzioa osagai berde/saturaziorako"
-
-#~ msgid "Use function for blue/luminance component"
-#~ msgstr "Erabili funtzioa urdin/luminantzia osagaiarentzat"
-
-#~ msgid "About AlienMap2"
-#~ msgstr "AlienMap2-ri buruz"
-
-#~ msgid "/Filters/Render/Pattern/CML _Explorer..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/CML _esploradorea..."
-
-#~ msgid "NULL"
-#~ msgstr "NULL"
-
-#~ msgid "The Graph"
-#~ msgstr "Grafikoa"
-
-#~ msgid "CML File Operation Warning"
-#~ msgstr "CML fitxategiaren jardunari buruzko abisua"
-
-#~ msgid "/Layer/Align _Visible Layers..."
-#~ msgstr "/Geruza/Lerrokatu ge_ruza ikusgaiak..."
-
-#~ msgid "Parameter Settings"
-#~ msgstr "Parametroaren ezarpenak"
-
-#~ msgid "/Filters/Animation/_Playback..."
-#~ msgstr "/Iragazkiak/Animazioa/_Erreproduzitu..."
-
-#~ msgid "/Filters/Animation/Optimize (for _GIF)"
-#~ msgstr "/Iragazkiak/Animazioa/Optimizatu (_GIF)"
-
-#~ msgid "/Filters/Animation/_Remove Backdrop"
-#~ msgstr "/Iragazkiak/Animazioa/_Kendu atzeko planoa"
-
-#~ msgid "/Filters/Animation/_Find Backdrop"
-#~ msgstr "/Iragazkiak/Animazioa/_Aurkitu atzeko planoa"
-
-#~ msgid "/Filters/Glass Effects/Apply _Lens..."
-#~ msgstr "/Iragazkiak/Beira-efektuak/Aplikatu _lentea..."
-
-#~ msgid "/Layer/Colors/Auto/Stretch _HSV"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/Tiratu _HSV"
-
-#~ msgid "/Filters/Distorts/_Blinds..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Pertsianak..."
-
-#~ msgid "/Filters/Colors/_Border Average..."
-#~ msgstr "/Iragazkiak/Koloreak/_Ertzaren batezbestekoa..."
-
-#~ msgid "1 (nonsense?)"
-#~ msgstr "1 (zentzurik ez?)"
-
-#~ msgid "256 (nonsense?)"
-#~ msgstr "256 (zentzurik ez?)"
-
-#~ msgid "/Filters/Map/_Bump Map..."
-#~ msgstr "/Iragazkiak/Mapa/Erliebe-_mapa..."
-
-#~ msgid "_Linear Map"
-#~ msgstr "Mapa _lineala"
-
-#~ msgid "_Spherical Map"
-#~ msgstr "Mapa es_ferikoa"
-
-#~ msgid "S_inuosidal Map"
-#~ msgstr "Mapa s_inusoidala"
-
-#~ msgid "/Layer/Colors/Auto/_Stretch Contrast"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/Tiratu _kontrastea"
-
-#~ msgid "/Filters/Colors/Colorcube A_nalysis..."
-#~ msgstr "/Iragazkiak/Koloreak/K_olore-analisia..."
-
-#~ msgid "Results"
-#~ msgstr "Emaitzak"
-
-#~ msgid "/Filters/Colors/Channel Mi_xer.."
-#~ msgstr "/Iragazkiak/Koloreak/Kanal-nahastailea..."
-
-#~ msgid "/Filters/Render/Pattern/_Checkerboard..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Xake-taula..."
-
-#~ msgid "/Layer/Colors/Auto/_Color Enhance"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/Ko_lore-hobekuntza"
-
-#~ msgid "/Filters/Colors/_Colorify..."
-#~ msgstr "/Iragazkiak/Koloreak/_Koloreztatu..."
-
-#~ msgid "/Filters/Colors/Color to _Alpha..."
-#~ msgstr "/Iragazkiak/Koloreak/Kolorea al_fara..."
-
-#~ msgid "/Filters/Colors/C_ompose..."
-#~ msgstr "/Iragazkiak/Koloreak/_Konposatu..."
-
-#~ msgid "/Filters/Generic/_Convolution Matrix..."
-#~ msgstr "/Iragazkiak/Generikoa/_Konboluzio-matrizea..."
-
-#~ msgid "/Filters/Distorts/_Curve Bend..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Tolestu kurbaren arabera..."
-
-#~ msgid "/Filters/Colors/_Decompose..."
-#~ msgstr "/Iragazkiak/Koloreak/_Deskonposatu..."
-
-#~ msgid "/Filters/Enhance/_Deinterlace..."
-#~ msgstr "/Iragazkiak/Hobetuak/Gurutzelarkatuak _bereizi..."
-
-#~ msgid "/Filters/Combine/_Depth Merge..."
-#~ msgstr "/Iragazkiak/Konbinatuak/_Batze sakona..."
-
-#~ msgid "/Filters/Enhance/Des_peckle..."
-#~ msgstr "/Iragazkiak/Hobetuak/_Parasitak kendu..."
-
-#~ msgid "/Filters/Enhance/Des_tripe..."
-#~ msgstr "/Iragazkiak/Hobetuak/_Kendu marrak..."
-
-#~ msgid "/Filters/Render/Pattern/_Diffraction Patterns..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/Di_frakzio-ereduak..."
-
-#~ msgid "/Filters/Map/_Displace..."
-#~ msgstr "/Iragazkiak/Mapa/_Desplazatu..."
-
-#~ msgid "Displace Options"
-#~ msgstr "Desplazamendu-aukerak"
-
-#~ msgid "/Filters/Edge-Detect/_Edge..."
-#~ msgstr "/Iragazkiak/Detektatu ertzak/_Ertza..."
-
-#~ msgid "/Filters/Distorts/_Emboss..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Bozeldu..."
-
-#~ msgid "/Filters/Distorts/En_grave..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Grabatu..."
-
-#~ msgid "/Filters/Colors/Map/_Color Exchange..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Kolore-trukatzea..."
-
-#~ msgid "_Selection"
-#~ msgstr "_Hautapena"
-
-#~ msgid "/Filters/Light Effects/_FlareFX..."
-#~ msgstr "/Iragazkiak/Argi-efektuak/_Erlantz-efektua..."
-
-#~ msgid "/Filters/Map/_Fractal Trace..."
-#~ msgstr "/Iragazkiak/Mapa/_Arrasto fraktala..."
-
-#~ msgid "/Filters/Toys/Gee-_Slime"
-#~ msgstr "/Iragazkiak/Jostailuak/_Lingirda"
-
-#~ msgid "GEE-ZOOM: The Plug-In Formerly Known As \"The GIMP E'er Egg\""
-#~ msgstr "GEE-ZOOM: Lehen \"The GIMP E'er Egg\" izena zuen plugin-a"
-
-#~ msgid "Save as GIcon"
-#~ msgstr "Gorde Gicon gisa"
-
-#~ msgid "Icon Name:"
-#~ msgstr "Ikono-izena:"
-
-#~ msgid "Milliseconds"
-#~ msgstr "milisegundo"
-
-#~ msgid "/Filters/Render/Pattern/_Qbist..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Qbist..."
-
-#~ msgid "/Filters/Colors/Map/_Gradient Map"
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Gradiente-mapa..."
-
-#~ msgid "/Filters/Render/Pattern/_Grid..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Sareta..."
-
-#~ msgid "/Filters/Map/_Illusion..."
-#~ msgstr "/Iragazkiak/Mapa/_Ilusioa..."
-
-#~ msgid "/Filters/Distorts/_IWarp..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Okertze interaktiboa..."
-
-#~ msgid "/Filters/Render/Pattern/_Jigsaw..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Puzzlea..."
-
-#~ msgid "Preview (in image window, will modify image's undo history!)"
-#~ msgstr ""
-#~ "Aurrebista (irudiaren leihoan, irudiaren desegite-historia aldatuko du!)"
-
-#~ msgid "Image comments"
-#~ msgstr "Irudien iruzkinak"
-
-#~ msgid "/Filters/Map/_Van Gogh (LIC)..."
-#~ msgstr "/Iragazkiak/Mapa/_Van Gogh (LIC)..."
-
-#~ msgid "/Filters/Colors/Map/Adjust _FG-BG"
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/D_oitu AurPl/AtzPl"
-
-#~ msgid "/Filters/Colors/Map/Color Range _Mapping..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Kolore-barrutiaren mapatzea..."
-
-#~ msgid "/Filters/Blur/_Motion Blur..."
-#~ msgstr "/Iragazkiak/Lausotuak/_Mugimendu-lausotzea..."
-
-#~ msgid "/Filters/Distorts/_Mosaic..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Mosaikoa..."
-
-#~ msgid "/Filters/Distorts/Newsprin_t..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Prentsa-papera..."
-
-#~ msgid "/Filters/Enhance/_NL Filter..."
-#~ msgstr "/Iragazkiak/Hobetuak/_NL iragazkia..."
-
-#~ msgid "/Filters/Noise/_Noisify..."
-#~ msgstr "/Iragazkiak/Zarata/_Gehitu zarata..."
-
-#~ msgid "/Filters/Light Effects/Su_perNova..."
-#~ msgstr "/Iragazkiak/Argi-efektuak/Su_perNova..."
-
-#~ msgid "/Filters/Artistic/Oili_fy..."
-#~ msgstr "/Iragazkiak/Artistikoa/_Olioz pintatu..."
-
-#~ msgid "/Filters/Map/_Paper Tile..."
-#~ msgstr "/Iragazkiak/Mapa/_Paperezko mosaikoa..."
-
-#~ msgid "/Filters/Blur/_Pixelize..."
-#~ msgstr "/Iragazkiak/Lausotuak/_Pixelizatu..."
-
-#~ msgid "/Xtns/_Plugin Details"
-#~ msgstr "/Luzp/_Plugin-aren xehetasunak"
-
-#~ msgid "/Filters/Distorts/P_olar Coords..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Koordenatu polarrak..."
-
-#~ msgid "write error occured"
-#~ msgstr "errorea gertatu da idaztean"
-
-#~ msgid "_X-Offset:"
-#~ msgstr "_X desplazamendua:"
-
-#~ msgid "_Y-Offset:"
-#~ msgstr "_Y desplazamendua:"
-
-#~ msgid "/Filters/Noise/_Hurl..."
-#~ msgstr "/Iragazkiak/Zarata/_Jaurti..."
-
-#~ msgid "/Filters/Noise/_Pick..."
-#~ msgstr "/Iragazkiak/Zarata/_Jaso..."
-
-#~ msgid "/Filters/Distorts/_Ripple..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Izurtu..."
-
-#~ msgid "/Filters/Colors/Map/_Sample Colorize..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Laginaren arabera koloreztatu..."
-
-#~ msgid "/Filters/Noise/S_catter HSV..."
-#~ msgstr "/Iragazkiak/Zarata/Barreiatu HS_V..."
-
-#~ msgid "Preview (1:4) - Right Click to Jump"
-#~ msgstr "Aurrebista (1:4) - Egin klik eskuineko botoiaz jauzi egiteko"
-
-#~ msgid "/File/Acquire/_Screen Shot..."
-#~ msgstr "/Fitxategia/Eskuratu/_Pantaila-argazkia..."
-
-#~ msgid "/Filters/Blur/_Selective Gaussian Blur..."
-#~ msgstr "/Iragazkiak/Lausotuak/_Gauss-en lausotzea selektiboa..."
-
-#~ msgid "/Filters/Colors/_Semi-Flatten"
-#~ msgstr "/Iragazkiak/Koloreak/_Erdizka berdindu..."
-
-#~ msgid "/Filters/Distorts/_Shift..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Desplazatu..."
-
-#~ msgid "/Filters/Render/Pattern/_Sinus..."
-#~ msgstr "/Iragazkiak/Errendatuak/Eredua/_Sinus..."
-
-#~ msgid "/Filters/Colors/Smoo_th Palette..."
-#~ msgstr "/Iragazkiak/Koloreak/_Paleta leuna..."
-
-#~ msgid "/Filters/Render/Clouds/_Solid Noise..."
-#~ msgstr "/Iragazkiak/Errendatuak/Hodeiak/_Zarata solidoa..."
-
-#~ msgid "/Filters/Edge-Detect/_Sobel..."
-#~ msgstr "/Iragazkiak/Detektatu ertzak/_Sobel..."
-
-#~ msgid "/Filters/Light Effects/_Sparkle..."
-#~ msgstr "/Iragazkiak/Argi-efektuak/T_xinpartak..."
-
-#~ msgid "/Filters/Render/Sphere _Designer..."
-#~ msgstr "/Iragazkiak/Errendatuak/Es_fera-diseinatzailea..."
-
-#~ msgid "/Filters/Noise/Sp_read..."
-#~ msgstr "/Iragazkiak/Zarata/_Sakabanatu..."
-
-#~ msgid "/Filters/Artistic/_Apply Canvas..."
-#~ msgstr "/Iragazkiak/Artistikoa/_Aplikatu oihala..."
-
-#~ msgid "Open SVG"
-#~ msgstr "Ireki SVG"
-
-#~ msgid "Ratio _X:"
-#~ msgstr "_X erlazioa:"
-
-#~ msgid "Targa Options"
-#~ msgstr "Targa aukerak"
-
-#~ msgid "/Filters/Map/_Tile..."
-#~ msgstr "/Iragazkiak/Mapa/_Mosaikoa..."
-
-#~ msgid "/Filters/Map/_Small Tiles..."
-#~ msgstr "/Iragazkiak/Mapa/_Lauza txikiak..."
-
-#~ msgid "Flipping"
-#~ msgstr "Iraultzen"
-
-#~ msgid "Applied to Tile"
-#~ msgstr "Mosaikoari aplikatuta"
-
-#~ msgid "Segment Setting"
-#~ msgstr "Segmentu-ezarpena"
-
-#~ msgid "/Filters/Map/_Make Seamless"
-#~ msgstr "/Iragazkiak/Mapa/_Homogeneo egin..."
-
-#~ msgid "/Filters/Enhance/_Unsharp Mask..."
-#~ msgstr "/Iragazkiak/Hobetuak/_Desenfokatze-maskara..."
-
-#~ msgid "/Filters/Distorts/Vi_deo..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Bideoa..."
-
-#~ msgid "/Filters/Colors/_Value Invert"
-#~ msgstr "/Iragazkiak/Koloreak/_Alderantzikatu balioa..."
-
-#~ msgid "/Filters/Distorts/_Value Propagate..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Balioa hedatu..."
-
-#~ msgid "/Filters/Generic/_Dilate"
-#~ msgstr "/Iragazkiak/Generikoa/_Zabaldu"
-
-#~ msgid "Secondary Options"
-#~ msgstr "Bigarren mailako aukerak"
-
-#~ msgid "Use Mag Map"
-#~ msgstr "Erabili magniture-mapa"
-
-#~ msgid "Other Options"
-#~ msgstr "Beste aukera batzuk"
-
-#~ msgid "/Filters/Distorts/_Waves..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Uhinak..."
-
-#~ msgid "/Filters/Distorts/W_hirl and Pinch..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Bihurritu eta tira..."
-
-#~ msgid "/File/Acquire/From Clipboard"
-#~ msgstr "/Fitxategia/Eskuratu/_Arbeletik..."
-
-#~ msgid "/Xtns/_DB Browser"
-#~ msgstr "/Luzp/_Datu-base arakatzailea"
-
-#~ msgid "/Filters/Colors/_Filter Pack..."
-#~ msgstr "/Iragazkiak/Koloreak/_Iragazki-paketea..."
-
-#~ msgid "Display"
-#~ msgstr "Bistaratzea"
-
-#~ msgid "Lighter And Darker"
-#~ msgstr "Argiago eta ilunago"
-
-#~ msgid "Miscellaneous Options"
-#~ msgstr "Askotariko aukerak"
-
-#~ msgid "With BG of:"
-#~ msgstr "Horrelako AtzPl-rekin:"
-
-#~ msgid "Selection Type:"
-#~ msgstr "Hautapen-mota:"
-
-#~ msgid "none"
-#~ msgstr "bat ere ez"
-
-#~ msgid "Not found \"%s\": used \"%s\" instead"
-#~ msgstr "Ez da \"%s\" aurkitu: \"%s\" erabili da horren ordez"
-
-#~ msgid "Brush Preview:"
-#~ msgstr "Brotxaren aurrebista:"
-
-#~ msgid "/Filters/Artistic/_GIMPressionist..."
-#~ msgstr "/Iragazkiak/Artistikoa/_GIMPressionist..."
-
-#~ msgid "Paper Preview:"
-#~ msgstr "Paperaren aurrebista:"
-
-#~ msgid "(Desc)"
-#~ msgstr "(beherantz)"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you come up with some nice Presets,\n"
-#~ "(or Brushes and Papers for that matter)\n"
-#~ "feel free to send them to me \n"
-#~ "for inclusion into the next release!\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Aurrezarpen onak badituzu\n"
-#~ "(edo brotxak eta paperak),\n"
-#~ "niri bidal diezazkidakezu \n"
-#~ "hurrengo bertsioan sartzeko!\n"
-
-#~ msgid "/Filters/Render/Nature/Ifs_Compose..."
-#~ msgstr "/Iragazkiak/Errendatuak/Natura/Ifs_Compose..."
-
-#~ msgid "lpeek.mrijk@consunet.nl"
-#~ msgstr "lpeek.mrijk@consunet.nl"
-
-#~ msgid ""
-#~ "Generates a maze using either the depth-first search method or Prim's "
-#~ "algorithm.  Can make tileable mazes too.  See %s for more help."
-#~ msgstr ""
-#~ "Labirinto ba sortzen du lehenbizikoaren bilaketa-sakonaren edo Prim-en "
-#~ "algoritmoa erabiliz. Labirintoa mosaikoan bihur daiteke. Ikus %s "
-#~ "xehetasun gehiagorako."
-
-#~ msgid "Draws a maze."
-#~ msgstr "Labirintoa marrazten du."
-
-#~ msgid "Selection is %dx%d"
-#~ msgstr "Hautapena: %dx%d"
-
-#~ msgid "/Filters/Distorts/_Pagecurl..."
-#~ msgstr "/Iragazkiak/Distortsioak/_Kiribildu..."
-
-#~ msgid "/File/_Print..."
-#~ msgstr "/Fitxategia/_Inprimatu..."
-
-#~ msgid "/Filters/Colors/Map/Colormap _Rotation..."
-#~ msgstr "/Iragazkiak/Koloreak/Mapa/_Kolore-maparen biraketa..."
-
-#~ msgid "What is Gray?"
-#~ msgstr "Zer da grisa?"
-
-#~ msgid "Main"
-#~ msgstr "Nagusia"
-
-#~ msgid "Misc"
-#~ msgstr "Hainbat"
-
-#~ msgid "Click here to load your file"
-#~ msgstr "Egin klik hemen fitxategia kargatzeko"
-
-#~ msgid "Click here to cancel load procedure"
-#~ msgstr "Egin klik hemen kargatze-prozedura bertan behera uzteko"
-
-#~ msgid "Click here to save your file"
-#~ msgstr "Egin klik hemen fitxategia gordetzeko"
-
-#~ msgid "Click here to cancel save procedure"
-#~ msgstr "Egin klik hemen gordetze-prozedura bertan behera uzteko"
-
-#~ msgid ""
-#~ "Can't open '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin da '%s' ireki:\n"
-#~ "%s"
-
-#~ msgid "M_inimum Height:"
-#~ msgstr "G_utxieneko altuera:"
-
-#~ msgid "Minimum height for bumps"
-#~ msgstr "Erliebeen gutxieneko altuera"
-
-#~ msgid "Auto_stretch to Fit Value Range"
-#~ msgstr "Auto_matikoki doitu balio-barrutian sartzeko"
-
-#~ msgid "Fit into value range"
-#~ msgstr "Sartu balio-barrutian"
-
-#~ msgid "Cannot operate on unknown image types or alpha images"
-#~ msgstr "Ezin da irudi-mota ezezagunekin edo alfa irudiekin jardun"
-
-#~ msgid "About..."
-#~ msgstr "Honi buruz..."
-
-#~ msgid "Only an indexed-alpha image can be saved in CEL format"
-#~ msgstr "Indexatutako alfa irudiak bakarrik gorde daitezke CEL formatuan"
-
-#~ msgid "Align Visible Layers: there are too few layers."
-#~ msgstr "Lerrokatu geruza ikusgaiak: geruza gutxiegi daude."
-
-#~ msgid "Not enough memory to allocate buffers for optimization.\n"
-#~ msgstr "Ez dago nahikoa memoria bufferrak optimizazioari esleitzeko.\n"
-
-#~ msgid "Image dimensions: %dx%d"
-#~ msgstr "Irudi-dimentsioak: %dx%d"
-
-#~ msgid ""
-#~ "Failed to write file '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin izan da '%s' fitxategian idatzi:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Failed to open file '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin izan da '%s' fitxategia ireki:\n"
-#~ "%s"
-
-#~ msgid "gauss_iir: you must specify either horizontal or vertical (or both)"
-#~ msgstr "gauss_iir: horizontala edo bertikala zehaztu behar duzu (edo biak)"
-
-#~ msgid "Width: "
-#~ msgstr "Zabalera: "
-
-#~ msgid "Spacing: "
-#~ msgstr "Tartea: "
-
-#~ msgid "Offset: "
-#~ msgstr "Desplazamendua: "
-
-#~ msgid ""
-#~ "Color Mapping / Adjust FG/BG:\n"
-#~ "Cannot operate on gray/indexed images"
-#~ msgstr ""
-#~ "Kolore-mapatzea / Doitu AurPl/AtzPl:\n"
-#~ "Ezin da irudi gris edo indexatuekin lan egin"
-
-#~ msgid ""
-#~ "Can't save layers with alpha.\n"
-#~ "Flatten your image"
-#~ msgstr ""
-#~ "Ezin da geruzarik gorde alfarekin.\n"
-#~ "Berdindu irudia"
-
-#~ msgid ""
-#~ "'%s':\n"
-#~ "PNG error. File corrupted?"
-#~ msgstr ""
-#~ "'%s':\n"
-#~ "PNG errorea. Fitxategia hondatuta?"
-
-#~ msgid ""
-#~ "'%s':\n"
-#~ "Unknown PNG color model"
-#~ msgstr ""
-#~ "'%s':\n"
-#~ "PNG kolore-eredu ezezaguna"
-
-#~ msgid ""
-#~ "'%s':\n"
-#~ "PNG error. Couldn't save image"
-#~ msgstr ""
-#~ "'%s':\n"
-#~ "PNG errorea. Ezin izan da irudia gorde"
-
-#~ msgid "** From GRADIENT **"
-#~ msgstr "** GRADIENTEtik **"
-
-#~ msgid "** From INVERSE GRADIENT **"
-#~ msgstr "** GRADIENTE ALDERANTZIKATUtik **"
-
-#~ msgid "_after"
-#~ msgstr "_atzerapen honekin:"
-
-#~ msgid "sel_gauss: Cannot operate on indexed color images"
-#~ msgstr "sel_gauss: Ezin da kolore-irudi indexatuekin erabili"
-
-#~ msgid "/Filters/Render/_Sinus..."
-#~ msgstr "/Iragazkiak/Errendatuak/_Sinua..."
-
-#~ msgid "Interpreting %s:"
-#~ msgstr "%s interpretatzen:"
-
-#~ msgid "Can't open file as XWD file"
-#~ msgstr "Ezin da fitxategia XWD fitxategi gisa ireki"
-
-#~ msgid "XWD save cannot handle images with alpha channels"
-#~ msgstr "Alfa kanalak dituzten irudiak ezin dira XWD gisa gorde."
-
-#~ msgid "cannot operate on unknown image types"
-#~ msgstr "ezin da irudi-mota ezezagunekin lan egin"
-
-#~ msgid "Saving '%s':"
-#~ msgstr "'%s' gordetzen:"
-
-#~ msgid "Can't open '%s': %s"
-#~ msgstr "Ezin da '%s' ireki: %s"
-
-#~ msgid "Display Grid"
-#~ msgstr "Bistaratu sareta"
-
-#~ msgid "GFlare: cannot operate on indexed color images"
-#~ msgstr "GFlare: ezin da kolore-irudi indexatuekin erabili"
-
-#~ msgid "untitled"
-#~ msgstr "izenbururik ez"
-
-#~ msgid "A_bout..."
-#~ msgstr "Ho_ni buruz..."
-
-#~ msgid ""
-#~ "Cannot save file '%s'.\n"
-#~ "Check the path and permissions."
-#~ msgstr ""
-#~ "Ezin da '%s' fitxategia gorde.\n"
-#~ "Egiaztatu bide-izena eta baimenak."
-
-#~ msgid "Load failed"
-#~ msgstr "Ezin izan da kargatu"
-
-#~ msgid "Load IFS file"
-#~ msgstr "Kargatu IFS fitxategia"
-
-#~ msgid "Help"
-#~ msgstr "Laguntza"
-
-#~ msgid "/Xtns/Web Browser/Open URL..."
-#~ msgstr "/Luzp/Web arakatzailea/Ireki URLa..."
-
-#~ msgid "Open URL"
-#~ msgstr "Ireki URLa"
-
-#~ msgid "URL:"
-#~ msgstr "URLa:"
-
-#~ msgid "Window:"
-#~ msgstr "Leihoa:"
-
-#~ msgid "Current"
-#~ msgstr "Unekoa"
-
-#~ msgid "/File/Acquire/Screen Shot..."
-#~ msgstr "/Fitxategia/Eskuratu/Pantaila-argazkia..."
-
-#~ msgid "Can't open (write): %s"
-#~ msgstr "Ezin da ireki (idatzi): %s"
-
-#~ msgid "xjt: cannot operate on unknown image types"
-#~ msgstr "xjt: ezin da irudi-mota ezezagunekin lan egin"
-
-#~ msgid "Can't open: %s"
-#~ msgstr "Ezin da ireki: %s"
-
-#~ msgid "Can't open (read): %s"
-#~ msgstr "Ezin da ireki (irakurri): %s"
diff --git a/po-script-fu/ChangeLog b/po-script-fu/ChangeLog
index 1b4d10f6a4..d31d20c07b 100644
--- a/po-script-fu/ChangeLog
+++ b/po-script-fu/ChangeLog
@@ -1,7 +1,23 @@
+2005-06-09  Jakub Friedl  
+
+	* cs.po: Minor Czech fix.
+
+2005-06-09  Jakub Friedl  
+
+	* cs.po: Updated Czech translation.
+
+2006-04-24  Francisco Javier F. Serrador  
+
+	* es.po: Updated Spanish translation.
+
+2006-04-20  Inaki Larranaga  
+
+	* eu.po: Updated Basque translation.
+
 2005-10-30  Takeshi AIHANA 
 
-        * ja.po: Updated Japanese translation by
-                OKANO Takayoshi .
+	* ja.po: Updated Japanese translation by
+	        OKANO Takayoshi .
 
 2005-09-17  Takeshi AIHANA 
 
diff --git a/po-script-fu/cs.gmo b/po-script-fu/cs.gmo
index 38c2f216826ad81d837aa4d01c278161b0f57c3a..8a659d27461488aabc5a71fc4c49cb91e33fc04e 100644
GIT binary patch
delta 12080
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

delta 11213
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
 # Stanislav Brabec , 2000-2001.
 # Michal Bukovjan , 2003.
 # Miloslav Trmac , 2003, 2004.
-# Jakub Friedl , 2005.
+# Jakub Friedl , 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-09 21:56+0200\n"
-"PO-Revision-Date: 2005-04-28 21:02+0200\n"
+"POT-Creation-Date: 2006-06-09 12:55+0200\n"
+"PO-Revision-Date: 2006-06-09 13:00+0200\n"
 "Last-Translator: Jakub Friedl \n"
 "Language-Team:  \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../plug-ins/script-fu/script-fu-console.c:129
 #: ../plug-ins/script-fu/script-fu-text-console.c:66
@@ -116,22 +119,22 @@ msgstr "Průběh skriptu"
 msgid "(none)"
 msgstr "(žádné)"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1058
+#: ../plug-ins/script-fu/script-fu-interface.c:1061
 #: ../plug-ins/dbbrowser/gimpprocview.c:198
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1065
+#: ../plug-ins/script-fu/script-fu-interface.c:1068
 #: ../plug-ins/dbbrowser/gimpprocview.c:220
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1072
+#: ../plug-ins/script-fu/script-fu-interface.c:1075
 #: ../plug-ins/dbbrowser/gimpprocview.c:209
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1081
+#: ../plug-ins/script-fu/script-fu-interface.c:1084
 msgid "Image Types:"
 msgstr "Typy obrázku:"
 
@@ -146,15 +149,15 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: ../plug-ins/script-fu/script-fu-server.c:642
+#: ../plug-ins/script-fu/script-fu-server.c:648
 msgid "Script-Fu Server Options"
 msgstr "Volby serveru Skript-fu"
 
-#: ../plug-ins/script-fu/script-fu-server.c:670
+#: ../plug-ins/script-fu/script-fu-server.c:676
 msgid "Server Port:"
 msgstr "Port serveru:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:676
+#: ../plug-ins/script-fu/script-fu-server.c:682
 msgid "Server Logfile:"
 msgstr "Žurnálový soubor serveru:"
 
@@ -301,7 +304,6 @@ msgstr "/Skript-fu/Alfa do loga"
 #: ../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
 msgid "/Xtns/Script-Fu/Logos"
@@ -350,7 +352,7 @@ msgstr "Implicitní nastavení mapy vyvýšení"
 #: ../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/text-circle.scm.h:3
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:2
 msgid "Font"
@@ -389,7 +391,7 @@ msgstr "Písmo"
 #: ../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/text-circle.scm.h:4
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:3
 msgid "Font size (pixels)"
@@ -460,7 +462,7 @@ msgstr "Poloměr rozostření stínu"
 #: ../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/text-circle.scm.h:7
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:5
 msgid "Text"
@@ -661,12 +663,10 @@ msgid "_Arrow..."
 msgstr "_Šipka..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:3
-#, fuzzy
 msgid "Bar height"
 msgstr "Výška kusu"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
-#, fuzzy
 msgid "Bar length"
 msgstr "Délka kusu"
 
@@ -676,7 +676,7 @@ msgid "_Hrule..."
 msgstr "_Vodorovné pravítko..."
 
 #: ../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/text-circle.scm.h:5
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:6
 msgid "Radius"
 msgstr "Poloměr"
@@ -974,9 +974,8 @@ msgstr "_Kamufláž..."
 
 #: ../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 "/Skript-fu/Stín/Šablony/_Vyřezat..."
+msgstr "/Skript-fu/Šablony/"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 msgid "C_arve-It..."
@@ -2014,9 +2013,8 @@ msgid "Smear"
 msgstr "Zašpinění"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:7
-#, fuzzy
 msgid "Wrap"
-msgstr "Zborcení"
+msgstr "Ohýbání"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:8
 msgid "_Rippling..."
@@ -2148,19 +2146,20 @@ msgid "Circle"
 msgstr "Kruh"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:6
-#, fuzzy
 msgid "Color method"
-msgstr "_Barevné schéma"
+msgstr "Barevná metoda"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:7
 msgid ""
 "Draws Spirographs, Epitrochoids and Lissajous Curves. More info at http://"
 "netword.com/*spyrogimp"
 msgstr ""
+"Vykresluje hypotrochoidy, epitrochoidy a Lissajousovy křivky.Více informací "
+"viz http://netword.com/*spyrogimp"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:8
 msgid "Epitrochoid"
-msgstr ""
+msgstr "Epitrochoida"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:9
 msgid "Frame"
@@ -2168,11 +2167,11 @@ msgstr "Políčko"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:11
 msgid "Gradient: Loop Sawtooth"
-msgstr ""
+msgstr "Přechod: pilovitá vlna"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:12
 msgid "Gradient: Loop Triangle"
-msgstr ""
+msgstr "Přechod: trojúhelníkovitá vlna"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:13
 msgid "Hexagon"
@@ -2232,14 +2231,14 @@ msgstr "Jednolitá barva"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:27
 msgid "Spyrograph"
-msgstr ""
+msgstr "Hypotrochoida"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:28
 msgid "Square"
 msgstr "Čtverec"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:29
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:7
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:6
 msgid "Start angle"
 msgstr "Počáteční úhel"
 
@@ -2257,7 +2256,7 @@ msgstr "Typ"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:33
 msgid "_Spyrogimp..."
-msgstr ""
+msgstr "_Spyrogimp..."
 
 #: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:4
 msgid "Burst color"
@@ -2323,17 +2322,17 @@ msgstr "Poměrná četnost"
 msgid "_Particle Trace..."
 msgstr "Stopa _částic..."
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:1
 msgid "Antialias"
 msgstr "Vyhlazování"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
 msgid "Fill angle"
 msgstr "Úhel vyplňování"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:9
-msgid "Text Circle..."
-msgstr "Textový kruh..."
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
+msgid "Text C_ircle..."
+msgstr "Textový _kruh..."
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
 msgid "Ending blend"
@@ -2413,7 +2412,7 @@ msgstr "Velikost masky"
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:4
 msgid "_Unsharp Mask..."
-msgstr "_Rozostřit masku..."
+msgstr "_Maskování neostrosti..."
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2
 msgid "Amplitude"
@@ -2461,7 +2460,7 @@ msgstr "Délka vlákna"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:9
 msgid "_Weave..."
-msgstr ""
+msgstr "_Tkát..."
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:1
 msgid "/Help/The GIMP Online"
@@ -2514,3 +2513,4 @@ msgstr "Krytí světel"
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
 msgstr "Efekt _Xach..."
+
diff --git a/po-script-fu/es.gmo b/po-script-fu/es.gmo
index b12958ccf1da6fc22b817b1de582f049620de3ab..a1b7b583fbca76863c0574e0c573de7b77f501c6 100644
GIT binary patch
delta 5127
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
Zn4Ca%Zhj8)a@x9P&Pi*VTDPay{{c3ndyfDB

diff --git a/po-script-fu/es.po b/po-script-fu/es.po
index 8657d38060..f4ee145ce8 100644
--- a/po-script-fu/es.po
+++ b/po-script-fu/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-09 21:56+0200\n"
-"PO-Revision-Date: 2004-12-31 02:16+0100\n"
+"POT-Creation-Date: 2006-04-24 17:36+0200\n"
+"PO-Revision-Date: 2006-04-24 17:36+0200\n"
 "Last-Translator: \n"
 "Language-Team:  \n"
 "MIME-Version: 1.0\n"
@@ -122,22 +122,22 @@ msgstr "Progreso del script"
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1058
+#: ../plug-ins/script-fu/script-fu-interface.c:1061
 #: ../plug-ins/dbbrowser/gimpprocview.c:198
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1065
+#: ../plug-ins/script-fu/script-fu-interface.c:1068
 #: ../plug-ins/dbbrowser/gimpprocview.c:220
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1072
+#: ../plug-ins/script-fu/script-fu-interface.c:1075
 #: ../plug-ins/dbbrowser/gimpprocview.c:209
 msgid "Date:"
 msgstr "Fecha:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1081
+#: ../plug-ins/script-fu/script-fu-interface.c:1084
 msgid "Image Types:"
 msgstr "Tipos de imagen:"
 
@@ -152,15 +152,15 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: ../plug-ins/script-fu/script-fu-server.c:642
+#: ../plug-ins/script-fu/script-fu-server.c:648
 msgid "Script-Fu Server Options"
 msgstr "Opciones de servidor de Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu-server.c:670
+#: ../plug-ins/script-fu/script-fu-server.c:676
 msgid "Server Port:"
 msgstr "Puerto del servidor:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:676
+#: ../plug-ins/script-fu/script-fu-server.c:682
 msgid "Server Logfile:"
 msgstr "Archivo de registro del servidor: "
 
@@ -307,7 +307,6 @@ msgstr "/Script-Fu/Alfa a logo"
 #: ../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
 msgid "/Xtns/Script-Fu/Logos"
@@ -356,7 +355,7 @@ msgstr "Ajustes predeterminados del mapa de relieve"
 #: ../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/text-circle.scm.h:3
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:2
 msgid "Font"
@@ -395,7 +394,7 @@ msgstr "Tipografía"
 #: ../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/text-circle.scm.h:4
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:3
 msgid "Font size (pixels)"
@@ -466,7 +465,7 @@ msgstr "Radio de desenfoque de la sombra"
 #: ../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/text-circle.scm.h:7
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:5
 msgid "Text"
@@ -680,7 +679,7 @@ msgid "_Hrule..."
 msgstr "_Regla horizontal..."
 
 #: ../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/text-circle.scm.h:5
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:6
 msgid "Radius"
 msgstr "Radio"
@@ -2257,7 +2256,7 @@ msgid "Square"
 msgstr "Cuadrado"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:29
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:7
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:6
 msgid "Start angle"
 msgstr "Ángulo inicial"
 
@@ -2344,17 +2343,17 @@ msgstr "Tasa de choques"
 msgid "_Particle Trace..."
 msgstr "_Trazado de partículas..."
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:1
 msgid "Antialias"
 msgstr "Alisado"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
 msgid "Fill angle"
 msgstr "Ángulo de relleno"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:9
-msgid "Text Circle..."
-msgstr "Texto circular..."
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
+msgid "Text C_ircle..."
+msgstr "Texto _circular..."
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
 msgid "Ending blend"
diff --git a/po-script-fu/eu.gmo b/po-script-fu/eu.gmo
index 06068f698e7655143d8dea05ccdc2a4369743aa2..043db1d2f4e27d12dc3ca422697f04ce74d0be74 100644
GIT binary patch
literal 30419
zcmb8134C2ey~mI2lzrdfpq8e;i9xTf@8IcJN-f6MVq%K;U2Kp7(vyi3ipH;K|OyB
z)N}u7;aj2V`8kXK8r+@m_n^xACEOD}3pHN{7-J!<+5U6@Dgc|>ojorqTQ2Ezd
zcmV2s7g%`Q!k0m{;~J>^{{dBxk3iM;4%iLvhsw9hG5)>#L-qHe#yM~=!lyvxTLVvm
z=Rwu;dZ=-KKU971fP2ILg6f|iLgjk`>ixfks?YOKa=qQLzF&8P+Ymkgs(%iJuYvQR
z%DEQq4c}+{G?YI0I#j~wD7`lqs=X_q`r!PVz5-S515oYwo~8d5s-Ay=dQM7E_1G1v|Mr3^
zXBN~r%!eAcZm4#g3004Cq4JGD$#E4*Z%she``u9Qxfv?oXQ2A!ZVP`Ks+>pQzVO#j
z^?eEIz1yAO-+KVukMNPkE~w|uhI($;c#*|lXM8_Yy*>ujPoIV=|4UHif7SRSDEWB`
zs(vq8c;^nE|4``q!#E#m-8&hoeVxWtmVORY`-h?GS-14dEPOST{<+@5cR|(X8&LiK
zC{%m@1T{W8oao!JFVr|30#(mB##5l)w+iZg=Ru8U0#$Aas+`N9`s1xo^6^d!zaQ$k
zo1x_7(@_2Kb*TD00`K(+TDP|xp#5>S2iF&+U`{z9mJJ_V{COW}cVg|PrtpVvdZ
z=NdQ*-U!vt4?sQl1E_jE0#&bHLzVw`sOPpi*>i8G`W*pPpW}>6Eq)!`pZF1|dR+!J
zes8h#t1bS0#+#w)cN^4uzYJCG_n_qHmr(V38md2@v+%a3`2N}h>iL;a?_B_uZv|Ap
zt%rJk5URY?;x`&EgX;IIpzNd@p!(%*sQeE=wf|w`FQLZ&S*Z7Hd#dlJJ)zor095=d
zE!+pq_sks=Y5-
z{0^sidDsgcO#B>p09+1LZVc6)jZpn~g@vz!dfx}3^w4ck`9BBMuV06H&%l;}KB(FbAsMr$W`M*O)-P?+sAn`VJ_${)C0U0o9%-;6d=8
z7JpEepNGf5T@ELURVx8I0z4eZ-i>+
zhoI_v3snEz3)N2#Lp}dvsQ&vc)Hwak;$JlGyx7TcMtRm&M;?;g4DR7mfEo)#Cx<525<;2@C((!Y^5P=OwBCTRIRVvepvrw7>bZYF
zJ-5?R|J*)M>92-b4`)No`_tedum?(R3Q+kjfm^{hLbdlwsD6Gs)cZeT;X9zpdkCuD
zzk)}>zr!{-YngBNYIp?UA-Ds)3aZ`LLG{ZGQ1$*a)cd{yw}sz=YWKrX?fnH*zCS|M
z^F^rqujujI1-21B0IL067QX_joOKpofNIBuQ1y7d@!z5Hy&LWbZ-y%WcBuE>1@+tm
zQ1$sKRQ;cX>W7!0#&z%0eL1g&lJf;n&#g3`4^>`jd>x!Y_{~uHu7etno8S)cF1RDS
z4{i^?WAQ&W{sOArPeIk|d8l=L`{lkq2SUB?NDD87de2g*eCsTI)Z#Zm&AT^4z5hR;
z-v1#>{{);t_-?4@AAoxA&n*3Smi{8tIBvhfzke5~au0-(m!qNT(FIk0pYc4Xek{OG
zyaGKBcP4zqD!+~_fC?{!JHf@q)ll^~7w!r#fa?EocsP7Jl>YoIlpg-Bh5ulj(d+fo
z5pWjir$Wt-0z4F6Zs{L_A>q5A=HFxR)o`oTK7N*Q8B}}%S=xfD;qmYxi0Kw=e}?am
zF1S14eq#(Z-!?$C=PI}>e2;}c0@Z(?gX;fpL5;`Hq1KzHpyX%UHNO3aK&3B)lAkW9
z@=k~9m-SHd^RpS%MdL0fGUTERfQ0*Ir
zyTOgdE1~4;T~Ooke&bzGZ`uKgJ+B4hO0agFyQ1u;wYG(@D;U#c3{3KMl
zKY^;}(@^sJf^oYueZTDq_aXi$sC=DJ^4DwO5>&sx&cathmHQ5;c6l^ZW%1Z*{Jp-@8GTdmL2#Plb}>Gobos0IHk{R6kt`^`5s_`g@`3@o~5xyaVce
z-?j9|jDLV?$3HCnkn?>0Bca~Y1y#-(sP>%?_l4u|0Ck
zkN*Qz?g8g}&W38o2~cvo6sjHPLd}a5hVTtg^8O)<|0LA=?}Z1$pTR@n3sChvAn)5T
z(|9sexoe@)N1*CegHG>2m45{c;oFR#f_l&Qp!)Im@F2MDYkdC0q1t;iRJo_Xt>NiV
z{k;k*{T$;MRJ$&Ls?Xb@-v42!ez^_Kf?u)lZ=v!(XW^YA-~R_g_1gj{`R#=J!_}6a
zK-KqBsQ0`ZN`5{H^}aiy=EHqZ&p!&)AHTEozd-fJOHkvo!+`JKL!jPs5>&seg>Ian
z5sB-$D-hUoczil$U8LA%F
zLp^spR6ll2&sCqpEmG7TW{kCVpKYtKZf6s?o!%nF5Zs_I(lw6$y_5QN)VyJfg8w}wsP~-3b
zRC|5}^}gqgJCFGI!=UQ907|~Qq57d0s@-|0_l-jJ@1;=fzaFaGo1p4-2UNe`2X}x!
zGCmIV-Y22@=S3)evsdCdA1eI}csLw_hrui05%9wn{~*+Je}p02^#cF?b~vB#BDfT8
zfW7d`Q2n#(sF$~cq3YWKRsJfd`B;K_|CR7acs-PSeGP64pMU|eOJ$E@&Iafiw=LWblyd7$Od>JbL_o2q&r%>bd3{?KDOFrK|#-pI#(+O2h58MHs
z33r5fsQyTx@{L24cNyFXUTb_GRQb0;wf9crx8V%JPeAq0@1dUCG4*n=50rjb2vzT1
zsD3*Ws=QIC=PrU8&-Xyp^A4!`+y|BaA*lBLH{1=r05xti%0B-b=k5k3}bzMc=~z}LbY
zycMe4AH$jOuTcGcV8z$})ll+v3{-#iLcMPQs{R|`uJ97LC%hV}-5-Fe-|bNC_`LBR
zD7k+S>OIfFJ>XVV|NP!i{V~hJ3oN_@s+=`Y?>i6b`J#n47%zvr6Mr4t6W#>XA76md
zC*Ogp-&1fG_yUw3*rDd-@kqEA;nSeTw;$^H$im}L&tC!6FYkn^*X>aA`%b8O{lNHh
zsD649s-4e3mA_5hm%Beyd2^xKb()2Hq4MR8RjBt|3DvG^;Xd#tsPexARnAwT(!URt
z|2I(OJOkA)+imdm+z;w~bD`w-RH)~dLbdBGD0!+twd)$F@@_GH2CCe<;Va;O;`IBY
zM}V0S981DG;U|^BemCP^hW{qqRrtREAF#9n;RU!eaik^E?edf_sFt7&jmPE$}7Wv$%b6`u)^+EB-&>
zKMMDIm%n=$4
zo86LsTjGaF_?RW`OJlDeCg2RM2;v{oB(vFpIYxqmz%DA@@
zj-Y;d+y&;O=i%OH@pyxi@GpcHTio_7X*uFQM)(cz6!;FDbixeFBRzZv?!CDGBJOP5
zzv2F2>8C=?Vf}u9s}a5g_fFhLaoKN{dHzh?{rLY5KMh|C$1R`c@Cw{^gg=kF)#85)
zze~Jy+XXoHV;q)R`e{Tg#=Rf+kj32ywMM;&+Xnv$xE*jkxaWy`H|{ey{W^*3^WG_c
zk0jLJYeA^@B_HNTm0+s{}=wZ;QnB7
z!nU{p()3%7dpG{|xNUgfXW<-|(){y;d3S~jN#7CoW}JS{;haR=irA$$z(yY|ev_+O1%gG2oX
zZy^3;_=2V5b>G_WCA<;;GZz0H{1=)3aQsJ_|6=?9;kMJ@{JOCvktl>30V4yTZ@n
z>i9QU{%;fR$KL}_#~p30C()ws|5U=ZS8g8vS998SMK!fW79;65(K
z|2YoKBW_pR`*DZi^m~o_%h(vdOneFVIPO!pj}reO_z+BSW!#0h3UOb-{X70e@Dn)w
z?)3=P5&jN*o;y#7@KCXj&|AW)-SMZzWS9mwvI^1jp_&rS8
z>u}rRzUQNYQT%7&e+vE@SHPk8o57jGiHJDlL2--?%DV`m)_YGE(axJ%{
z-X6?r<_Q)o4)eYBS}`fbbLPwm7UUO){gwLQNL*9!q@J;;5TDZWaA%RUvGHkB$|F%&
zOT!guA)PM0l#E5Sv{IcWZE-x9R;Gzx6PJeK=@RBi|2YH?{W
zDTck}>FThymauI*sXtAN1L>wy+Ly(}a(n+s94_ryxjO7Esf${Y*VRhZX1{DPp}nhK
ztEHvZf+s)OuI_r73w0@dkzr>GYNPzdyLB7*(su;GCt&Sb0uwr4V#7?i=E8
zFfB@!I){eBuDlADyegFMN-GFW795BMM+=p-UK(<#LzT3gt9l7h?gFhyN|cJf8J$S9
zqGH%n8cr)ntpu%em|k@GgU+Nf;6}vvL|$Ft-sd_dzbZ~kK1h7XL`){!E5^#jq*fn_
zIZi4R^|zKp#U!E;<#KU6EX1X_64mIWVl*D}+UlsKxNxY5uq~~GLkxFR8JZn*)@vha
zr9(^yX;{!Xk&F=+bS(|jax|FK#)GbWME8X~J*rVxzFsNidR*=BOEO(_qmRNx>eisE
z8R0ZQYlQ3g)(EC`Ats^{j>Jh}q~^TExKvO@qN)v5&=rqF8_cvFqCH;YZZ
z(wmx4Yso&AGFn~5bZ|6e5aq2`_=f4Q-Xj`AwrI0b2At%1KLe9Yq@`L^EHVg6RfXzR
z@2`!Qt+WksrIrl(TxotoQgYJf+TltI*V(ImX#J#+jfGG0HEjCBwsNv5E~;Ohu)4ot
zDH`L=^|A6;R1VvsqLj9iui4>1Yc0K?bcCy71hTd<^_i++QbNbms>3OyQmy%U7%a+1
zl?`#O$E_NR@*|aWY_pJBv`Crghoq`9>1T^^V;Dx2n7QEcxN%$*7mKd7&4w%*iHf7y
zD@T%Y*ts#vkGrB3vawj?ULOub#i%qG2NoQT23dWwP*IX9smmg&QLWDG(@eJqCe1ruk9VoU}9;ZQzBhMqz$sOo#jE@_0ox?;xduiVFRlSj1avaaf8shJH3$glRM%
zs)obNzHn(h8H%g)wsc}xV}Tox4-JK9QMzb>j*Yw1|H)Mj25&Sw#7!Q!Zr4WPWNBWbBPKBKKG)*^LuI8d*-80uQ_ZK=}6
z+DI4`Q&NWge4kA@wYVc#91lnJVvVP~JXa}&hE$c14l>ym$HiI{ZitHYSjxiBm&I|Z
zifRnoW>QXEMyD*MgE0({?Ul*U5Cd%yMQN&Fal)LTc6cggbu3OdmV(8VXk(aP)_10w
zTpn@FBdQwqm6J+}0xFMGj}E)bNez>1Bu$3sb-H{-QmsZ8r1fe@2X2U~bHbHrCFbSB
zX&BYQky@?X(cWH)nRJz*IfLm~`;k?KJuR>T^3JrJEmSRjv_v{QO!HeagzKk^Y@Ow;
zC0O4y%Wo_p-9xPXHn*IAprOiLP$L*PpQ$+K_mbH?JWQ8On#SRg;ey%0782%eDdm_g
zB^*0#0+9@!pU>UJVv;XAEqiphgqboDSNu}Z&2X#>^mo1cJD^2EJ~taIuz|rWjcGEV
zGJ}@k47w{UZ~kxla8fMdtsu52j$$0fo8rN`q;bZ~D*pxD8{(4t)1D3u1xuFZx|ZgU
z9rLZ>Dll>Vm8euLqeNIzmPA8z`^IS8`-ah};Y{zx$_~xXI_Bb_DFbUEZw{8IB2MGW
zmwAdI_JNyJWwXXeEh3w;N}Sgvb}bE-6qTW5N@WSlS)e~*UTaNLExR}`KhC>(Y9;m-
zn9aW>6|F(;Z)=QS*<5s$R9aiZRx8HCHSH<}QmmD+oYQ`RGs(L*QMIZRwhOK<)(e<6
z0mfLqT6K$pyt3}XWvN@3WT)91o!7+G`CIFZgd%R4+G==087_IJh_f`TI~H(+AdBc=
z`@;%l7^}fD)(f}VHFZQYs-Yp8QQ5NDjPWDe3}>e0GFCzvtiiGr
zF>{M2-puR?dV1Cb&Uy^{v3A&s`hXdUKHzK??`4d!YFYDq(5sK0v7}ImbMuc=3wziM
zZZcW)ex5OZRq2LE9iUKD0k(hyk~J(5#D$jnVQTSX-nqRJ#VCWH
zJC@CDD`hXV)OTf6DbRThvvH+19NA#IfE%ur(WW_*Y{ivnHNtpd{~U+TuwBVqMLJjI
zZ6mZw^L-UBbGAp=HZUIMSI3n>wA^g9tC56>qIsWhZts5kXj*o@c
zWeMvukLfj^&dl)p0JPft*+FkoOoqq(X3`C3Z`p4Ydn?*5c?su42!XQgj1TyEgkLqD
zH2hhdm%l7jFe|X3A+rSc($&$B38H+NjNz9y;~JVHOLOL1-|%I2t9B1rs%*ttbLHff
z1?Fj$bWLlTBCk6H$%v$6`#(z|hFOiY%x>oKTfr=YTRvC2BcuShfeBV?iWH;w=~I7&C7`GPa*QAI=QI)BZI?qH4IjCwdrIP+$k#x=+?bJ1;eyx(n?
z*2H;avQ*IGwV5@wCYFL^hsOa0Sq3q=heO*32aQDR5Kab^WV@3!@fcm-GL6ZrV?Xvi
zQCV|*P0ZG;6rL$7z8b7a1_tN?tfWE7iUs|0u|^t{D9%%)N9lQg46!Dy7e;*b-LA*4
zRmAe1p>Rze6V)xt?rro~u!cYF2y`{*>*-w_BD-bmtiIm<&d~1;m9tN4Fhc6N9_olS
z?5q^(G8cK)M=%_ybGDj|GgyD17dF*gGi8wuV78D_siuJK@0Dml%|8Fdvs$GJk)brM@6%se)u
zRc0)Dbu3o@+L1M?!W9(iJcgYhc2L#t5?Km3GxH~cNohkm==E3gN%jE6y4Hayk8&>l
zub%D*XExe1Tn{rv(9(Nx6b`u^WFHIj;7F*IO@}=LK}&>N{(M+cnG4ID9B?kSF-njr
z_n_i=R(rF7m&+g>G$oxS%vUKlFrIT-n4U!7MvwwhP!WxVP{AbPuNyLso`+eqJF@WV
zw8F^(2XZ<;_h=f87H(LK7H-{6T9jW1EHK0_-_5)%?7PdoBi!h0R;PYQ=17dc{>-n%
z2I?EpIg3{tWWa>?7Gl1y#+M3IgZpyP$L^Tfn9mNH{kglFrqalLW3rt3#+*^^k*Ows
zL}zib?CdzMFD)iRp_`9EAKC^L#hyH7JLGH%B*RotUs-2lw#v43(?;+!hsjpqI`uNK-ssPvkT3;T2vX}
ze7EZCB86(wO^%f5==UDp@AtaS@1)P|cKhmOR?A3T8T4($0?Fn3kq~ubf4=!$s6SsH
zKpE5ra=x3x714k{f$xvU%4sF4jJJGaQYQrZ6E4cTb2L|+!d_Bbl9$_t#p>dw*bpwZ
zY)g6nNHXX}s~>5{jIbUJEU4M-x;Tq45mK_78yKQVp@8a|cTz5Q%KT%G4Xa})m$))J
zP@{wX6mingsjDvmCwDH|RDn-Oi$Tl2y>%gLZ1?)>19{(J({`GcH)r`~yIsG{)xIfM
zTjoDT#X76S-!xWTq~9w0E?ui*cRQZTdNEMsu-m>nH4>qJH8P53f9^KQ)y8)<#ad50
z`@-xcj;X3ObvEnwq=H-Xs@Q*-(abIP`o?ShS)@*x8*f3dv?8Br6EirAb5R>feVFP`
z*lL8!sFMHYbC&Gp%pkLXJJ>kOeLZl0Re5i!H-d$TkAi2V98S7p!t!`<7Beqchb^-q
z(IG=MSl{YT>pHJyEt2Gohn0GX)uiB7uvgBkzS35;IYGXYBO&*3D9^VLeTb3F1KC+k&feri+p%-Pq}k(@AD_r-p`Tg2*$n-
za6T9#f>IV1Aw#38&$)4sU#yc(Hj|Z5o!X~wD*44SUA0U%7CiT$4h?f&o4c@%*Zk?4
z59&}X)Un8T$onY~W6Gtt11;MI_=uz^qqGfsJ>FEF9prW1#G$?K3U`!bCSacPplZ#x
zWJ!HuVw|J$>?>b>srztN44GuH*F;rU{L)I|OIlW`dmWZ{da4>gd&!E(Z>_O4v8kJF
z?=AAJawM&#uB6o{(}WKId>dyS@KNZ=vQC3HSePS4ecpD7YrH`z8`;9c(mA2GOL)K8
zyl5Lck0;8kR{wxAQ=4m8-r1@wMitI9eCxd7&=KVOSf+d(`lP;E<;pKRu0+nHy@+z!
zHDKAZQ)QpQtq|Ta@DbAgzRRU|gS`H-+WJ0~hKyK4LYX@*zw7?Z*Mt1pQdMhusPhAt
zP4m~c;H((0i(3~Bj^zA_u)-M37tn*bo}nDmUbC+wjOz<#tch7$YPprwLNdh4Q>f
fZjG`@})Uock~k&YwH?xZK=ha`Weg^A>i@oqN<=eq_w8iT!k*KHmbLZ$(tC
z`J-6mkq@k4&%L)tqY1KAsYG}SQMj^RDWuwrg(nSRQ^e_M6Kp1;lFsW-nSpo}>P*gD
ze;kc&
zI-ECW-rPC!XRt}FM8(_^zHnDN!j}t`$}Vg5$CA$OgB&B>L>?x8uI_c#goxw4AXVGD=EW#!sHf3
zEs^OlT@GD6nMl&<(iX>~JhX*G&ht^sd>Ndk&}C7*h6PrduF#&^L{ywE;cRTt;%HRk
z^qhT5AsOYv)95sX>qbVxVN9&l#vO|lQGsvG6H&W6p4351#08jUa($va?Uj@jlM>py
zP;1HLf+uItl@xX6%jN0TQQ<%(t!<*6Tc|?&G9(sR*m8z$)Jgs2UbBUcm|S0}?X*%!
zM$@nm(Xw_v)Nw2ug)s{l`@agRO@gtdYEF6HRg1+vVyNo>p9iPjRvE1&^gulv)xKWC
zxisd+LOsm8(k1#?1P0E8n+p~pDWOG7`x26Ck*E+!mW61f+L;9{(Qd6E)7&W;NeVQc
ziDP|&Kx5(zQ5UYX#O^cYFvWMb^b|SrR7}81Sc`P%9?@S+l?lFo
zccL)dO&56!F&psaWfxRajvyJ-w_z29&OFk{#g+O*lpAv&(OYs%jt|@7AszWnU^vw3
zeB~=>9qI_W2c)2xlBurijHaWBU525g+QjN&4r`5um!nbMR;@E@d-K$po|za;BX>O}
z$ZNVIK-5?5?#jD)A}>WWhe8F}XiiF?4N0ZW_k>BY?!7OcovSnKm?$+W*6OGQU7+z1
z#rlN8y}qWotQhUnBPDc7LUZ<5*fzl=NGE*zxE=Jb6DK0R_P96loqU29JA@N;eWnWX
ztD+HBLOM)+-~(|kv-&yuXsa>7>e1|J)4Xn?Bwd={RF>Cz!B0gae3uCX*8;;bLB;dV(vCyXFTnr2S=
zH7hkZod0_{=PR#8@d04-sBDNDd8XvB2s~{Dvq#stW{+VElJ&iRA3nBRV~&k
z+ua{R(4;xIH$+xvmH8t}UZpFW0rJV4wW?s%u>h2sF{Y{f6(V|)kByaRfDN0JEeD&W
zfUmCDpA13%-naF2=}=`@eX9QGuG&Q+R_M{ALym5_Ni@nuA_OJmjbY66$QgN=RpG=(bC*MrxQbaa!C^E*#85SoI3w9o
z(o}WTd@R#J&6w7e+UZh6u`KaxYG3UIBXz$^Z;W{}Lqp{^lyPH{bPva)$m3K^L?7Dq
zq?gU$t|`4-4tHJYw}#D2`^b4%f$YNz~gYoh*cO0Ry@&
zX!_T;_)BgLmr>Tp+KB3LGrHs#7`xfz#ft?3(|~=Cv7P&Qy6MFACX_oXkkns@65*DU
zEGpHrG=tA2y6Mz~{IWGh!p+m(MGaj{XT5?ghB?Jwi91)9n-NR9)>;@%%V92pRf*~)
z^mje;abH3*myB}z$r7DJ>o!!DSqnmoUt`=D_r+QFDbtdK%}b3hv^l@rZXQ;f`7G69
z`e{>(z@r-Y7ymxl?Axh%vrH%i=`k}6SH$c{a&B`Kcz=GnrLZNN>YvRIi;ld#-MV(t
zk4|Cv-9qa#=ohJIkEscY$!rv#hb>CVz_EEBWd_BVMKT?v4KeBJY&w~8+JN#P_Nm_j
zTbRQEwuRXD`97@hhLm=(&uDBZYE>_~E&GwIc`Z?mx!V#qxue`nZMmk!fHoGFT$Gpb
zD;?U1)Aod_V=%a#M@#Ogg9a87R%Cq=ni$gR(|D{UvF0vsx$VqqI!JRsV&wh!bW5wY
zNvk(AgRk>0&(wH|b{bwiPmgL%ro#uM+*ILC+XUDJE{3k*8^zEbh`6-mtR6i-MHO$J
zVTwZDJVVon+B_v2mCfT@RdYWUGvXXoWx*7^CDItW=3Ou*q%MPLiO$LF9_2Ea+bXFI
z*{-J2ao4s-v4f=J1f;=p-%qJ#^p8|{r3bc9t)kC=zT@`cYW#=TBV{BVR
zFf27}fkt&EsT(G()smYjZYSVv|7LtV4myBf!DJcdadx{U3
zErIo|fqtFc*rtv)wq&CkbybbSRGDGCxFwNKVY*YtR%R4?P}Y!vlR4KRoXNRpbPXG|
z3y_8cZIH!fCqFK1c2{Qw8K#4=C`?NHwYrA%*u6UB%iXNQ!k|uh87J;`9ZMwF>o||#
zoYY;gQ{`Ku7P_^+HRkv!F(+g(T#;k5=Qen{Pv;C>F4y@PZSxHc()g5-)0R{9*Fj{k
z!Yi3<{B+f>J3D#GJg)3!z+JfWCVywW8gU-UK3wMw7P8X|zFF2slL_gtsr!JlIXu;d
zT~gw2-(luxH>w+XsNgiEc+fBe`
zlR3xAy9@}NYU3(68VxxqYI-!A66PDto7HIFten<8
zz8dLNC$Sq6nso{Kg>9wuC_AM&EyZM|U^FuBqZ}^qM*UMM-TLzj9GerSpH7JI=z|0q
z{Fzp>9M>-~Qp-(1ow-daES^9f|9|DR-V0n(_oYkcwRB|*so9DUXDeWlfuW}l+(
z5jvUhXG-?nrW+xxb7UBD?M)ws)CiU={X#nrHpk%Soe*0*zGTK$QOlpO4ibHDk|?m~}%OBek4l2Fq2p
zwiTIYH0YV&9}siaz*KQ>b)}(Edh#fkT^j`i9qFDhXWU_&SB=qtoOkou*2|Bb6J?fEeL{ERN!Po2Gcjgbhj5yfWGE4m^nBUm0QhWF5#AH}_4;
zH!kmX?Np&VuPRxKSyAcsPSh2{=?<>U;-rh3M=k2^T(qS=&(k*7=eGZ7IkZAU+G!R4
z9?6}tuovc}Wy(f&nz)v(o^%*SMYG}Q);WGLu`ef$$53_(H)WhWHD4uZ(KWb(c-}Jt+c`q{xFTiwUE8TK_
zEj^i#8{ypD+9;TiwgyZOz*z0*De$Zm_ZHITW@&d3>E{zhu^
z#69O_)jdaSfyIQaNb`~>Cso=p`#xAP*;>su8~L6IE;1m1{_S+B-(q{{R)UCuYOI-7oT+TCf$GrAJ;%jR?~(Ybv-nq{g*qPw0~RLN
z1Vlqe8$Or25Q_Ge)Dp-4_rT)atx$L8#}$iq&I0s6cmqQ}zGUg%vOF
zw`1-Lt^0`p7_6XHwymn_*pOd;RP9RW
zc8k2cx*f^}4}%4fwQ6^}wNU><1HMDL{4ySNX)bJT0$hU6*;qBXF{=9^EO>dRj&!o_
zo@b?SR~OKR*iECzh)xNVw;dvIh4cYW##{30*^(T1o?Egt)u7n5R
zHSi$38csk}nT0elXMDa2uOc6L=J0y*4|{$bs@-!??OudG4u8}0cYOID!M9QVr@s6Z
zU;Zjo|NrLsL(eN--z(n?H}m~Qcpcp0S%DhwAXNK9Q1dzB%TGY*`Ch2`#c&f`hSK+8
zsP-2;KL*wQ37>xszM1^5LbdxcRJ)fwzXti4Z}HOj-+|Kedr;&37rYj3LTRc7>O@ABLae~R)UDE*E@>HmPwpM@GX
z^?cZuUw|6taj0>g^n4E9K>qWPpZR^yKll7=C_P?<8t+F?`fZ|-`nwwH`*l$Bc`MYq
z?|{-{H`KZeLh1Q#sD6%k&Oy2~r{OIy^1J}~nP1`cCiq+MR`^w)|3|3(_TN5#8;gE`
z{9W)MOdzgpegn#{{t#-Mzk<^DJ5YY`pD=*ezX9Fh9w>d^12vE1Q1#D1**$`q_lp1i
zDCB1@@KU>{efj60>b(Fp@0XzF{d-XM`!ZC&-|&0|s{X%2t>ce;{wgY~-Rq&g-|X{S
zJhwshUx6C`0MxqQ=ktd>r=aXU>+`4K733d;8m|U5-`Ic8q1J1~^CM7tJOkCw^HB9)
zf{oWhCHht#!WMb1RfSd!hOnf@(hn
zrN=2qQ*+jT{{YnZk3;qUB-A{gh1wr4!neSeq5AtaRQvBi)xVlaYaZ7_wYwF{j@zKd
z9e~njAEb#Hg{uDml%1MB{|Hq34?|qndtYP{1>dM!b<%RC>38vijUdwkaOcYXO^!mX5l
z7wR0k2II+3ZigzLg#parID8UL!@q^nr@~@sz3$zY
z@A*StF6Fd7?|@p*eNgodLix=hsP#SVzt{ZtvrzNy`11Ebwx0PQl%G7~`6a0Ke+E_m
zYf$U-H&E;OivRwvQ0w|1o>wv{t?zYEdff`u&sL~@27LKGsCoyX&cnk{`cFaapE;=U
zYQ8*zTAvikZy$rw<0+_m&qIy#5_}yTMeajBjp$ME_Y26UkOrbBMyh4Xm=kar`52NT
z#}GXaA+oQY_aRS|sb0+XQPQc;_c2MrB4?3zBeLPUkOvVxS}W;$FLFEbapV_~VPpi+
zvm3b|*@I+A|B-)1NE4|bxS+WMxfYSnJcB%d=$Y@qJPiw^i+mQ@i)g(cMouA*A~hsL
z`cIw2hmbbn5L~x>ewp_Xq|?im`-9~+??rYYlM~Qhq
zat=w5jn4;s!6A4M`B|S|f*(fCAUcEeOe6csRPQC)_s^Dy@0%7UD;JWeG+a*4kOwh>z|`!
zP9wJ>`;nhR`p@<4$S)y7NdK84
zF^eoBclHb6o0Q&`4VqnZwKVMHm9b)%84A;CT4YT#)b2!KUeui#iW`yMd1#~1W@f0!
zn@KuohPq*!q#3rgRwGS{xE>rzq9k2kFwwRRXNFzVo(q$LPZ5=Q7iqB2!$~t-jyGJS
zab+SN430Wi5Ax+Ci0q0>vmlIvJjrde)f@`b8k+P5Dc`}KUM|?{d52iE;|z9I(y-CY
z2hE`(Ou4|%+P2GGYDSXf*o;Q*oXx|86icvBzE7IbPMD`jt(k;%Gn(4W@lKO8SZ;=q
z3*32EEAlXIY~GgfGo$BRY{teb!{e31bH{yZc6?Z=`P9Z)$7%{@%+_5}Kxgx&OXk5iTIpLbB~}Nrmj}5+@xE|
z&7?YEO2PKJYoyL)0~BSMJ)2+_>FVlc%BBqrvAq+XcM%n)l03&EN0Xp!^IDU69xd8c
zOfy}}rAua}>vc1|w3NAgt(DI&^go>RiL75G*b(dvNYCC(BowpLdTeA!OMlBn*|
z*Z9PKzFhZxC%){*IhW#o!E{GHw|*iuvM3d_le!CR6tN~j5=SfSc?@dt(Q}UUxun)}
zf;HvY`cc98acR>yiT|(GgTb~{EtZPFyU%*nolR@apt=$)>ddT~xwV3$+S|Rn_Dm({
zM9yX|ShgWXEbFP9wpBI#-zw<%xa2z?HRn2^pfJg^pzhCOJo2JE
zp4myAMN1C)q>$I%9d91L8sdDeAU*UD7Z2i8U6tK;R(2l<_U;+HYv1j=DWPIz)}0I0-&#E?@!J>dIWTzV-d?>)
zo8`TmC9*lUc`)&nFWFWYOxiTHBpWuED$+(0GGcIV9mBcgeph5I8#Ur$XOcGV+dRqr
zP;kFj=ACU12E#UcsBpo(VcspG4tLVV`co5Aqid7hvvc?6L)=oFDHW~pV31>rU7ZM<
z-4oPsC64Ta$L7Z>``7B}DqM1DWi+lOI)(>>{naqvyigf;F&nj<$&q0#ctHO<_iny4
zz;UIsEG3qZ#)mjcHXQqSEy|(qiZ!DR{K57^9X{t>*GkxFHcoUQ2Q39W?&1$r2-Bj@
z&e0aJs6_x29?^I~X*IZXTvKsD?qqrA3z%0aU8%
z(rz`U!n9RL*CT%HJv&#`*t?dzV=Z~A$XOBFT8oJ)%;{LHsk9P>L@Y-C;B*0-BhQkU
zV6SU)#=+gFK9;n|1r2&qh?El}aqQVLOq#Q;M9Xg$T$5NSD`FeClog15sFX4QL7<~x
zJi$y|Em_-!v_Xf3b?JWK)FN)8(rDLK8MYTYF&gW^utiX3fb*`!#MD>3nS)ee)Nn{U
z;#6YPG@Xem*o(I!s*4H~Sowl+%l3_}nMiFBH*j4B9SN6;b{O~691Af|?iyi*gN%y9
z1b%@&t@DFc7@J9#r?!%Z9i~c<(pp7pZE4r7GG?yQX*ah4!F0FIlC7(^_AxJ`u+leY
zn4D%W6?5tZ3Uv0&Giy
zU8}vs>8b#uNW+#n<>D&Gku}q;GK5O--eG*DH13GY*nwT{h`3%{Jir3i#rlut)F
z8@IfAwzV4Z$*DBKe$>|uS;cv75QoKZ1P(~_T3DYsxjr+RI<#V?SX1_VKM14~9|mfv
z3Hw3QlVHN*oGqmJeN`%@795)>K
zILpOzcGWWC?79t|xo)KwZ~p)LTOWUp73F$3dGESO4u`}CMX<=WYNcVdG@BO6ayG~d
z`rpgL@sbakLM4!qQvMdQ^)A;3_Z(wfTy=tMdBOT|E?4KU?XnSjG3u$+)h}DQMuE#>
zid6^U23xCB;YMpwGJ(DDsj(z&TXTw2DB(Qbc(~15E-HL=GHJ>flTK$t@9qtvFzX)<
z?D%TPfylkxiv@SJbqnw(GOgN}bU>%&J;iMo)w%AnPPiJT98pN76Sbdc
z^;+X$hi$fchpwehnsGFaEPs?axi}waJ4v`Cdl7gLPn2#L6XUu}Ro3np{!VibCAztf
zHEAx3Mg_jj`bak=MmU8FvpAZvdKaB0i(H}&&J*sUwdi*=4_j=&7Lju4N@e_8s`Nj+
CnrBP^

diff --git a/po-script-fu/eu.po b/po-script-fu/eu.po
index 778d0e79d7..2d14c7849a 100644
--- a/po-script-fu/eu.po
+++ b/po-script-fu/eu.po
@@ -1,28 +1,31 @@
+# translation of eu3.po to Basque
 # translation of eu.po to Basque
 # translation of gimp-script-fu.HEAD.po to basque
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Hizkuntza Politikarako Sailburuordetza , 2004.
-# Iñaki Larrañaga Murgoitio , 2004.
+# Iñaki Larrañaga Murgoitio , 2005, 2006.
+# Iñaki Larrañaga Murgoitio , 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: eu3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-09 21:56+0200\n"
-"PO-Revision-Date: 2004-04-06 19:42+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio \n"
+"POT-Creation-Date: 2006-04-20 17:00+0000\n"
+"PO-Revision-Date: 2006-04-20 17:03+0000\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.0.2\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\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 ""
-"Script-Fu kontsola-moduak deitze interaktiboak bakarrik baimentzen ditu"
+msgstr "Script-Fu kontsola-moduak deitze interaktiboak bakarrik baimentzen ditu"
 
 #: ../plug-ins/script-fu/script-fu-console.c:156
 msgid "Script-Fu Console"
@@ -37,9 +40,8 @@ msgid "Current Command"
 msgstr "Uneko komandoa"
 
 #: ../plug-ins/script-fu/script-fu-console.c:267
-#, fuzzy
 msgid "_Browse..."
-msgstr "Arakatu..."
+msgstr "_Arakatu..."
 
 #: ../plug-ins/script-fu/script-fu-console.c:548
 msgid "Script-Fu evaluate mode allows only noninteractive invocation"
@@ -49,12 +51,12 @@ msgstr ""
 
 #: ../plug-ins/script-fu/script-fu-interface.c:177
 msgid "Script-Fu cannot process two scripts at the same time."
-msgstr ""
+msgstr "'Script-Fu'-k ezin du bi script aldi berean landu."
 
 #: ../plug-ins/script-fu/script-fu-interface.c:179
 #, c-format
 msgid "You are already running the \"%s\" script."
-msgstr ""
+msgstr "\"%s\" scripta jadanik exekutatzen ari zara."
 
 #. strip the first part of the menupath if it contains _("/Script-Fu/")
 #: ../plug-ins/script-fu/script-fu-interface.c:202
@@ -96,9 +98,8 @@ msgid "Script-Fu Font Selection"
 msgstr "Script-Fu-ren letra-tipoaren hautapena"
 
 #: ../plug-ins/script-fu/script-fu-interface.c:454
-#, fuzzy
 msgid "Script-Fu Palette Selection"
-msgstr "Script-Fu-ren eredu-hautapena"
+msgstr "Script-Fu-ren paleta-hautapena"
 
 #: ../plug-ins/script-fu/script-fu-interface.c:462
 msgid "Script-fu Pattern Selection"
@@ -114,30 +115,29 @@ msgstr "Script-Fu-ren brotxa-hautapena"
 
 #. the script progress frame
 #: ../plug-ins/script-fu/script-fu-interface.c:533
-#, fuzzy
 msgid "Script Progress"
-msgstr "Script-argumentuak"
+msgstr "Script-aren progresioa"
 
 #: ../plug-ins/script-fu/script-fu-interface.c:541
 msgid "(none)"
-msgstr ""
+msgstr "(bat ere ez)"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1058
+#: ../plug-ins/script-fu/script-fu-interface.c:1061
 #: ../plug-ins/dbbrowser/gimpprocview.c:198
 msgid "Author:"
 msgstr "Egilea:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1065
+#: ../plug-ins/script-fu/script-fu-interface.c:1068
 #: ../plug-ins/dbbrowser/gimpprocview.c:220
 msgid "Copyright:"
 msgstr "Copyright-a:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1072
+#: ../plug-ins/script-fu/script-fu-interface.c:1075
 #: ../plug-ins/dbbrowser/gimpprocview.c:209
 msgid "Date:"
 msgstr "Data:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:1081
+#: ../plug-ins/script-fu/script-fu-interface.c:1084
 msgid "Image Types:"
 msgstr "Irudi-motak:"
 
@@ -152,41 +152,39 @@ msgstr ""
 " %s\n"
 "%s"
 
-#: ../plug-ins/script-fu/script-fu-server.c:642
+#: ../plug-ins/script-fu/script-fu-server.c:648
 msgid "Script-Fu Server Options"
 msgstr "Script-Fu-ren zerbitzari-aukerak"
 
-#: ../plug-ins/script-fu/script-fu-server.c:670
+#: ../plug-ins/script-fu/script-fu-server.c:676
 msgid "Server Port:"
 msgstr "Zerbitzari-ataka:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:676
+#: ../plug-ins/script-fu/script-fu-server.c:682
 msgid "Server Logfile:"
 msgstr "Zerbitzariaren egunkari-fitxategia:"
 
 #: ../plug-ins/script-fu/script-fu.c:122
-#, fuzzy
 msgid "Script-Fu _Console"
-msgstr "Script-Fu kontsola"
+msgstr "Script-Fu _kontsola"
 
 #: ../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 "/Luzp/Script-Fu/Logotipoak/Ne_on..."
+msgstr "/Luzp/Script-Fu"
 
 #: ../plug-ins/script-fu/script-fu.c:151
 msgid "_Start Server..."
-msgstr ""
+msgstr "_Abiarazi zerbitzaria..."
 
 #: ../plug-ins/script-fu/script-fu.c:282
 msgid "_Refresh Scripts"
-msgstr ""
+msgstr "_Freskatu script-ak"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:128
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:142
 msgid "Procedure Browser"
-msgstr ""
+msgstr "Prozedura-arakatzailea"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:132
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:146
@@ -216,49 +214,48 @@ msgstr "Bilatzen - itxaron"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:428
 msgid "1 Procedure"
-msgstr ""
+msgstr "Prozedura 1"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:430
 #, c-format
 msgid "%d Procedures"
-msgstr ""
+msgstr "%d prozedura"
 
 #: ../plug-ins/dbbrowser/gimpprocbrowser.c:476
 msgid "No matches"
-msgstr "Ez dago bat datorren elementurik"
+msgstr "Ez dago bat datorrenik"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:133
-#, fuzzy
 msgid "Parameters"
-msgstr "Diametroa"
+msgstr "Parametroak"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:146
 msgid "Return Values"
-msgstr ""
+msgstr "Itzulitako balioak"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:159
 msgid "Additional Information"
-msgstr ""
+msgstr "Informazio gehigarria"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:319
 msgid "Internal GIMP procedure"
-msgstr ""
+msgstr "GIMPen barne-prozedura"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:320
 msgid "GIMP Plug-In"
-msgstr ""
+msgstr "GIMPen plugin-a"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:321
 msgid "GIMP Extension"
-msgstr ""
+msgstr "GIMPen luzapena"
 
 #: ../plug-ins/dbbrowser/gimpprocview.c:322
 msgid "Temporary Procedure"
-msgstr ""
+msgstr "Aldi baterako prozedura"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1
 msgid "3D _Outline..."
-msgstr ""
+msgstr "3D _eskema..."
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:2
 #: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:1
@@ -281,9 +278,8 @@ msgstr ""
 #: ../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
-#, fuzzy
 msgid "/Script-Fu/Alpha to Logo"
-msgstr "/Script-Fu/Alfa logotipora/_Neon..."
+msgstr "/Script-Fu/Alfa logotipora"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:3
 #: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:2
@@ -311,21 +307,17 @@ msgstr "/Script-Fu/Alfa logotipora/_Neon..."
 #: ../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
-#, fuzzy
 msgid "/Xtns/Script-Fu/Logos"
-msgstr "/Luzp/Script-Fu/Logotipoak/Ne_on..."
+msgstr "/Luzp/Script-Fu/Logotipoak"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:4
-#, fuzzy
 msgid "Bumpmap (alpha layer) blur radius"
-msgstr "Erliebe-maparen (Alfa geruza) lausotze-erradioa"
+msgstr "Erliebe-maparen (alfa geruza) lausotze-erradioa"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:5
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:7
-#, fuzzy
 msgid "Default bumpmap settings"
 msgstr "Erliebe-maparen ezarpen lehenetsiak"
 
@@ -363,7 +355,7 @@ msgstr "Erliebe-maparen ezarpen lehenetsiak"
 #: ../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/text-circle.scm.h:3
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:2
 msgid "Font"
@@ -402,15 +394,13 @@ msgstr "Letra-tipoa"
 #: ../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/text-circle.scm.h:4
 #: ../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 "Letra-tamaina (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
-#, fuzzy
 msgid "Outline blur radius"
 msgstr "Eskemaren lausotze-erradioa"
 
@@ -428,19 +418,16 @@ msgstr "Eredua"
 #: ../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
-#, fuzzy
 msgid "Shadow X offset"
 msgstr "Itzalaren X desplazamendua"
 
 #: ../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
-#, fuzzy
 msgid "Shadow Y offset"
 msgstr "Itzalaren Y desplazamendua"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:12
-#, fuzzy
 msgid "Shadow blur radius"
 msgstr "Itzalaren lausotze-erradioa"
 
@@ -478,7 +465,7 @@ msgstr "Itzalaren lausotze-erradioa"
 #: ../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/text-circle.scm.h:7
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:5
 msgid "Text"
@@ -486,7 +473,7 @@ msgstr "Testua"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:1
 msgid "3_D Truchet..."
-msgstr ""
+msgstr "3_D Truchet..."
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:2
 #: ../plug-ins/script-fu/scripts/camo.scm.h:1
@@ -496,9 +483,8 @@ msgstr ""
 #: ../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 "/Luzp/Script-Fu/Ereduak/_Lurra..."
+msgstr "/Luzp/Script-Fu/Ereduak"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:3
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
@@ -529,37 +515,31 @@ msgstr "/Luzp/Script-Fu/Ereduak/_Lurra..."
 #: ../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
-#, fuzzy
 msgid "Background color"
 msgstr "Atzeko planoaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:4
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:3
-#, fuzzy
 msgid "Block size"
 msgstr "Bloke-tamaina"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7
-#, fuzzy
 msgid "End blend"
 msgstr "Amaierako nahastea"
 
 #: ../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 "Xeko lauza-kopurua"
 
 #: ../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 "Yko lauza-kopurua"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:8
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:16
-#, fuzzy
 msgid "Start blend"
 msgstr "Hasierako nahastea"
 
@@ -580,17 +560,15 @@ msgstr "Lodiera"
 #: ../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 "/Script-Fu/Dekorazioa/_Diapositiba..."
+msgstr "/Script-Fu/Dekorazioa"
 
 #: ../plug-ins/script-fu/scripts/add-bevel.scm.h:2
 msgid "Add B_evel..."
-msgstr ""
+msgstr "Gehitu _alaka..."
 
 #: ../plug-ins/script-fu/scripts/add-bevel.scm.h:3
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:12
-#, fuzzy
 msgid "Keep bump layer"
 msgstr "Mantendu erliebe-geruza"
 
@@ -600,43 +578,35 @@ msgstr "Mantendu erliebe-geruza"
 #: ../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 "Kopian lan egin"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:2
 msgid "Add _Border..."
-msgstr ""
+msgstr "Gehitu _ertza..."
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:3
-#, fuzzy
 msgid "Border X size"
 msgstr "Ertzaren X tamaina"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:4
-#, fuzzy
 msgid "Border Y size"
 msgstr "Ertzaren Y tamaina"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:5
-#, fuzzy
 msgid "Border color"
 msgstr "Ertzaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:6
-#, fuzzy
 msgid "Delta value on color"
-msgstr "Koloreko delta balioa "
+msgstr "Koloreko delta balioa"
 
 #: ../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 ""
-"/Luzp/Script-Fu/Web orriko gaiak/Dirdira estralurtarra/Barra "
-"_horizontala..."
+msgstr "/Luzp/Script-Fu/Web orriko gaiak/Dirdira estralurtarra"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:3
 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:2
@@ -649,7 +619,6 @@ msgstr "Behean"
 #: ../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 "Berdindu irudia"
 
@@ -662,7 +631,6 @@ msgstr "Berdindu irudia"
 #: ../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
-#, fuzzy
 msgid "Glow color"
 msgstr "Dirdiraren kolorea"
 
@@ -694,45 +662,39 @@ msgstr "Goian"
 
 #: ../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 "Arakatu..."
+msgstr "_Gezia..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:3
-#, fuzzy
 msgid "Bar height"
 msgstr "Barraren altuera"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
-#, fuzzy
 msgid "Bar length"
 msgstr "Barraren luzera"
 
 #: ../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 "Arakatu..."
+msgstr "Erregela _horizontala..."
 
 #: ../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/text-circle.scm.h:5
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:6
 msgid "Radius"
 msgstr "Erradioa"
 
 #: ../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 "Arakatu..."
+msgstr "B_uleta..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:2
 #: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:2
 msgid "B_utton..."
-msgstr ""
+msgstr "B_otoia..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:8
-#, fuzzy
 msgid "Glow radius"
 msgstr "Dirdiraren erradioa"
 
@@ -753,66 +715,57 @@ msgstr "Tarte betegarria"
 #: ../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 "Testuaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:3
 msgid "Alien _Glow..."
-msgstr ""
+msgstr "Estralurtarren _dirdira..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:7
-#, fuzzy
 msgid "Glow size (pixels * 4)"
 msgstr "Dirdiraren tamaina (pixelak * 4)"
 
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:3
 msgid "Alien _Neon..."
-msgstr ""
+msgstr "Estralurtarren _neon..."
 
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:5
-#, fuzzy
 msgid "Fade away"
-msgstr "Iraungiz desagerrarazi"
+msgstr "Iraungitu"
 
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:9
-#, fuzzy
 msgid "Number of bands"
-msgstr "Zerrenda-kopurua"
+msgstr "Banda-kopurua"
 
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:11
-#, fuzzy
 msgid "Width of bands"
-msgstr "Zerrenda-zabalera"
+msgstr "Banda-zabalera"
 
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:12
-#, fuzzy
 msgid "Width of gaps"
 msgstr "Hutsuneen zabalera"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8
 msgid "_Basic I..."
-msgstr ""
+msgstr "_Oinarrizkoa I..."
 
 #: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:3
 msgid "B_asic II..."
-msgstr ""
+msgstr "O_inarrizkoa II.."
 
 #: ../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 "/Luzp/Script-Fu/Logotipoak/Ne_on..."
+msgstr "/Luzp/Script-Fu/Botoiak"
 
 #: ../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
-#, fuzzy
 msgid "Bevel width"
 msgstr "Alaka-zabalera"
 
 #: ../plug-ins/script-fu/scripts/beveled-button.scm.h:5
-#, fuzzy
 msgid "Lower-right color"
 msgstr "Beheko eskuineko kolorea"
 
@@ -823,12 +776,10 @@ msgid "Pressed"
 msgstr "Sakatuta"
 
 #: ../plug-ins/script-fu/scripts/beveled-button.scm.h:8
-#, fuzzy
 msgid "Simple _Beveled Button..."
-msgstr "/Luzp/Script-Fu/Botoiak/Bo_toi soil alakatua..."
+msgstr "Bo_toi soil alakatua..."
 
 #: ../plug-ins/script-fu/scripts/beveled-button.scm.h:11
-#, fuzzy
 msgid "Upper-left color"
 msgstr "Goiko ezkerreko kolorea"
 
@@ -837,9 +788,8 @@ msgstr "Goiko ezkerreko kolorea"
 #: ../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 "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua/_Gezia..."
+msgstr "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua"
 
 #: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:2
 msgid "Diameter"
@@ -848,13 +798,12 @@ msgstr "Diametroa"
 #: ../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 "Atzeko plano gardena"
 
 #: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:4
 msgid "H_eading..."
-msgstr ""
+msgstr "Goiburua..."
 
 #: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:2
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5
@@ -876,12 +825,10 @@ msgstr "Zabalera"
 #: ../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 "/Script-Fu/Animazioa/_Nahastu..."
+msgstr "/Script-Fu/Animazioa"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:2
-#, fuzzy
 msgid "Intermediate frames"
 msgstr "Tarteko markoak"
 
@@ -890,21 +837,18 @@ msgid "Looped"
 msgstr "Begiztatua"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:4
-#, fuzzy
 msgid "Max. blur radius"
-msgstr "Gehieneko lausotze-erradioa"
+msgstr "Geh lausotze-erradioa"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:5
-#, fuzzy
 msgid "_Blend..."
-msgstr "Arakatu..."
+msgstr "_Nahastu..."
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:4
 msgid "Blen_ded..."
-msgstr ""
+msgstr "_Nahastuta..."
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
-#, fuzzy
 msgid "Blend mode"
 msgstr "Nahaste-modua"
 
@@ -914,15 +858,15 @@ msgstr "Gradiente pertsonalizatua"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:8
 msgid "FG-BG-HSV"
-msgstr "AurrPl-AtzPl-HSV"
+msgstr "AurPl-AtzPl-ÑSB"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:9
 msgid "FG-BG-RGB"
-msgstr "AurrPl-AtzPl-RGB"
+msgstr "AurPl-AtzPl-GBU"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:10
 msgid "FG-Transparent"
-msgstr "AurrPl-Gardena"
+msgstr "AurPl-Gardena"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:13
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:7
@@ -940,7 +884,6 @@ msgstr "Gradientea"
 #: ../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 "Gradiente alderantzikatua"
 
@@ -955,7 +898,7 @@ msgstr "Atzeko planoaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:5
 msgid "Bo_vination..."
-msgstr ""
+msgstr "Behi azala..."
 
 #: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:8
 msgid "Spots density X"
@@ -966,25 +909,22 @@ msgid "Spots density Y"
 msgstr "Orbanen Y dentsitatea"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:2
-#, fuzzy
 msgid "Add glowing"
 msgstr "Gehitu dirdira"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:3
-#, fuzzy
 msgid "After glow"
 msgstr "Dirdiraren ondoren"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:4
 msgid "B_urn-In..."
-msgstr ""
+msgstr "_Erregailua..."
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
 msgid "Burn-In: Need two layers in total!"
 msgstr "Erregailua: guztira bi geruza behar dira!"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
-#, fuzzy
 msgid "Corona width"
 msgstr "Koroaren zabalera"
 
@@ -993,7 +933,6 @@ msgid "Fadeout"
 msgstr "Iraungitzea"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
-#, fuzzy
 msgid "Fadeout width"
 msgstr "Iraungitzearen zabalera"
 
@@ -1024,7 +963,6 @@ msgstr "Pikortatzea"
 
 #: ../plug-ins/script-fu/scripts/camo.scm.h:7
 #: ../plug-ins/script-fu/scripts/rendermap.scm.h:7
-#, fuzzy
 msgid "Image size"
 msgstr "Irudiaren tamaina"
 
@@ -1035,25 +973,22 @@ msgstr "Leuna"
 
 #: ../plug-ins/script-fu/scripts/camo.scm.h:9
 msgid "_Camouflage..."
-msgstr ""
+msgstr "_Kamuflajea..."
 
 #: ../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 "/Script-Fu/Eragiketak txantiloiekin/_Zizelkatu..."
+msgstr "/Script-Fu/Zizelkatze eragiketak"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 msgid "C_arve-It..."
-msgstr ""
+msgstr "_Zizelkatu..."
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:3
-#, fuzzy
 msgid "Carve white areas"
 msgstr "Zizelkatu area zuriak"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:4
-#, fuzzy
 msgid "Image to carve"
 msgstr "Zizelkatzeko irudia"
 
@@ -1062,49 +997,42 @@ msgid "Background Image"
 msgstr "Atzeko planoko irudia"
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
-#, fuzzy
 msgid "Carve raised text"
 msgstr "Zizelkatu igotako testua"
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
 msgid "Carved..."
-msgstr ""
+msgstr "Zizelkatua..."
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
-#, fuzzy
 msgid "Padding around text"
 msgstr "Testu inguruko betegarria"
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:4
-#, fuzzy
 msgid "Chalk color"
 msgstr "Klera-kolorea"
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:8
 msgid "_Chalk..."
-msgstr ""
+msgstr "_Klera..."
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:3
-#, fuzzy
 msgid "Blur amount"
 msgstr "Lausotze-maila"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:4
 msgid "Chip Awa_y..."
-msgstr ""
+msgstr "_Xehatu..."
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:5
-#, fuzzy
 msgid "Chip amount"
 msgstr "Xehatze-maila"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:6
-#, fuzzy
 msgid "Drop shadow"
 msgstr "Egin itzala"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:7
-#, fuzzy
 msgid "Fill BG with pattern"
 msgstr "Bete atzeko planoa ereduarekin"
 
@@ -1113,62 +1041,52 @@ msgid "Invert"
 msgstr "Alderantzikatu"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:11
-#, fuzzy
 msgid "Keep background"
 msgstr "Mantendu atzeko planoa"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
-#, fuzzy
 msgid "C_hrome-It..."
-msgstr "Arakatu..."
+msgstr "K_romatu..."
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:2
-#, fuzzy
 msgid "Chrome balance"
 msgstr "Kromatze-balantzea"
 
 #: ../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
-#, fuzzy
 msgid "Chrome factor"
 msgstr "Kromatze-faktorea"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:5
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:4
-#, fuzzy
 msgid "Chrome lightness"
 msgstr "Kromatze-argitasuna"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:6
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:5
-#, fuzzy
 msgid "Chrome saturation"
 msgstr "Kromatze-saturazioa"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:7
-#, fuzzy
 msgid "Chrome white areas"
 msgstr "Kromatu area zuriak"
 
 #: ../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
-#, fuzzy
 msgid "Environment map"
 msgstr "Ingurune-mapa"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9
-#, fuzzy
 msgid "Highlight balance"
 msgstr "Nabarmentzearen balantzea"
 
 #: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:5
-#, fuzzy
 msgid "C_hrome..."
-msgstr "Arakatu..."
+msgstr "K_romatu..."
 
 #: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:8
 msgid "Offsets (pixels * 2)"
@@ -1179,12 +1097,10 @@ msgstr "Desplazamenduak (pixelak * 2)"
 #: ../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 "/Script-Fu/Errendatuak/La_ba..."
+msgstr "/Script-Fu/Errendatu"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:2
-#, fuzzy
 msgid "Circuit seed"
 msgstr "Zirkuitu-hazia"
 
@@ -1192,29 +1108,24 @@ msgstr "Zirkuitu-hazia"
 #: ../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 "Mantendu hautapena"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:4
-#, fuzzy
 msgid "No background (only for separate layer)"
 msgstr "Atzeko planorik ez (bereizitako geruzetarako bakarrik)"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:5
-#, fuzzy
 msgid "Oilify mask size"
 msgstr "Olio-maskararen tamaina"
 
 #: ../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 "Geruza bereizia"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:7
-#, fuzzy
 msgid "_Circuit..."
 msgstr "Zirkuitu-hazia"
 
@@ -1223,9 +1134,8 @@ msgstr "Zirkuitu-hazia"
 #: ../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 "/Script-Fu/Alkimia/_Ehun..."
+msgstr "/Script-Fu/Alkimia"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:2
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:2
@@ -1252,10 +1162,9 @@ msgstr "Goratzea"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:7
 msgid "_Clothify..."
-msgstr ""
+msgstr "_Oihal egin..."
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:2
-#, fuzzy
 msgid ""
 "Darken only\n"
 "(Better, but only for images with alot of white)"
@@ -1269,63 +1178,55 @@ msgstr "Orbanak"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:4
 msgid "_Coffee Stain..."
-msgstr ""
+msgstr "_Kafe orbanak..."
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:4
 msgid "Comic Boo_k..."
-msgstr ""
+msgstr "Komikia..."
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:9
-#, fuzzy
 msgid "Outline color"
 msgstr "Eskemaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:10
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:12
-#, fuzzy
 msgid "Outline size"
 msgstr "Eskemaren tamaina"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:4
 msgid "Cool _Metal..."
-msgstr ""
+msgstr "_Metal hotza..."
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4
-#, fuzzy
 msgid "Effect size (pixels)"
 msgstr "Efektuaren tamaina (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:2
-#, fuzzy
 msgid "Background image"
 msgstr "Atzeko planoko irudia"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:4
 msgid "Crystal..."
-msgstr ""
+msgstr "Beira..."
 
 #: ../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 "/Script-Fu/Hautapena/_Irudira..."
+msgstr "/Script-Fu/Hautapena"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:2
-#, fuzzy
 msgid "Granularity (1 is low)"
 msgstr "Pikortzea (1 txikia da)"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:4
-#, fuzzy
 msgid "Smooth horizontally"
 msgstr "Leundu horizontalki"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:5
-#, fuzzy
 msgid "Smooth vertically"
 msgstr "Leundu bertikalki"
 
@@ -1334,25 +1235,21 @@ msgid "Spread"
 msgstr "Zabaldu"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:7
-#, fuzzy
 msgid "Threshold (bigger 1<-->255 smaller)"
 msgstr "Muga (Handiagoa 1<-->255 Txikiagoa)"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:8
-#, fuzzy
 msgid "_Distress Selection..."
-msgstr "/Script-Fu/Hautapena/_Desitxuratu hautapena..."
+msgstr "_Desitxuratu hautapena..."
 
 #: ../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 "/Script-Fu/Itzala/Egin _itzala..."
+msgstr "/Script-Fu/Itzala"
 
 #: ../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 "Baimendu tamaina aldatzea"
 
@@ -1361,7 +1258,6 @@ msgstr "Baimendu tamaina aldatzea"
 #: ../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
-#, fuzzy
 msgid "Blur radius"
 msgstr "Lausotze-erradioa"
 
@@ -1388,9 +1284,8 @@ msgid "Opacity"
 msgstr "Opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:8
-#, fuzzy
 msgid "_Drop-Shadow..."
-msgstr "Egin itzala"
+msgstr "Egin _itzala..."
 
 #: ../plug-ins/script-fu/scripts/erase-rows.scm.h:2
 msgid "Columns"
@@ -1401,7 +1296,6 @@ msgid "Erase"
 msgstr "Ezabatu"
 
 #: ../plug-ins/script-fu/scripts/erase-rows.scm.h:4
-#, fuzzy
 msgid "Erase/fill"
 msgstr "Ezabatu/Bete"
 
@@ -1410,7 +1304,6 @@ msgid "Even"
 msgstr "Bikoitia"
 
 #: ../plug-ins/script-fu/scripts/erase-rows.scm.h:6
-#, fuzzy
 msgid "Even/odd"
 msgstr "Bikoitia/Bakoitia"
 
@@ -1427,72 +1320,62 @@ msgid "Rows"
 msgstr "Errenkadak"
 
 #: ../plug-ins/script-fu/scripts/erase-rows.scm.h:10
-#, fuzzy
 msgid "Rows/cols"
 msgstr "Errenkadak/Zutabeak"
 
 #: ../plug-ins/script-fu/scripts/erase-rows.scm.h:11
-#, fuzzy
 msgid "_Erase every other Row..."
-msgstr "/Script-Fu/Alkimia/_Ezabatu bi errenkadatatik bat..."
+msgstr "_Ezabatu bi errenkadatatik bat..."
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:2
-#, fuzzy
 msgid "Apply generated layermask"
 msgstr "Aplikatu sortutako geruza-maskara"
 
 #: ../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 "Ertzaren tamaina"
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:4
-#, fuzzy
 msgid "Clear unselected maskarea"
-msgstr "Garbitu hautatu gabeko maskara"
+msgstr "Garbitu desautatutako maskara"
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:6
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Fade from %"
 msgstr "Iraungi hemendik %"
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:8
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Fade to   %"
-msgstr "Iraungi hona %"
+msgstr "Iraungi hona  %"
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:9
-#, fuzzy
 msgid "Use growing selection"
 msgstr "Erabili hazten den hautapena"
 
 #: ../plug-ins/script-fu/scripts/fade-outline.scm.h:10
 msgid "_Fade Outline..."
-msgstr ""
+msgstr "_Iraungitze-eskema..."
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:2
 #: ../plug-ins/script-fu/scripts/land.scm.h:2
-#, fuzzy
 msgid "Detail level"
 msgstr "Xehetasun-maila"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:3
 #: ../plug-ins/script-fu/scripts/land.scm.h:4
-#, fuzzy
 msgid "Image height"
 msgstr "Irudiaren altuera"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:4
 #: ../plug-ins/script-fu/scripts/land.scm.h:5
-#, fuzzy
 msgid "Image width"
 msgstr "Irudiaren zabalera"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:5
 #: ../plug-ins/script-fu/scripts/land.scm.h:7
-#, fuzzy
 msgid "Random seed"
 msgstr "Ausazko hazia"
 
@@ -1508,31 +1391,26 @@ msgstr "Y eskala"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:8
 msgid "_Flatland..."
-msgstr ""
+msgstr "_Lur laua..."
 
 #: ../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 "/Luzp/Script-Fu/Logotipoak/Ne_on..."
+msgstr "/Luzp/Script-Fu/Utilitateak"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:2
-#, fuzzy
 msgid "Active colors"
 msgstr "Aktibatu koloreak"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:3
-#, fuzzy
 msgid "Black on white"
 msgstr "Beltza zurian"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:4
-#, fuzzy
 msgid "Font _size (pixels)"
 msgstr "Letra-_tamaina (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:5
-#, fuzzy
 msgid "Use font _name as text"
 msgstr "Erabili letra-tipoaren _izena testu gisa"
 
@@ -1541,7 +1419,6 @@ msgid "_Border (pixels)"
 msgstr "_Ertza (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:7
-#, fuzzy
 msgid "_Color scheme"
 msgstr "_Kolorearen eskema"
 
@@ -1551,7 +1428,7 @@ msgstr "_Iragazkia (regexp)"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:9
 msgid "_Font Map..."
-msgstr ""
+msgstr "_Letra-tipoaren mapa..."
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:10
 msgid "_Labels"
@@ -1562,17 +1439,14 @@ msgid "_Text"
 msgstr "_Testua"
 
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:8
-#, fuzzy
 msgid "_Frosty..."
-msgstr "Arakatu..."
+msgstr "_Izoztuta..."
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:2
-#, fuzzy
 msgid "Add shadow"
 msgstr "Gehitu itzala"
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:3
-#, fuzzy
 msgid "Blur border"
 msgstr "Lausotu ertza"
 
@@ -1581,128 +1455,112 @@ msgid "Granularity (1 is Low)"
 msgstr "Pikortzea (1 txikia da)"
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:9
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Shadow weight (%)"
 msgstr "Itzalaren pisua (%)"
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:11
 msgid "_Fuzzy Border..."
-msgstr ""
+msgstr "_Ertz lausoa..."
 
 #: ../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 "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/_Goiburu handia..."
+msgstr "/Luzp/Script-Fu/Web orriko gaiak/Classic.Gimp.Org"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:2
-#, fuzzy
 msgid "Autocrop"
 msgstr "Ebaki automatikoki"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:3
-#, fuzzy
 msgid "Dark color"
 msgstr "Kolore iluna"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:6
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9
-#, fuzzy
 msgid "Highlight color"
 msgstr "Nabarmentzearen kolorea"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:7
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:6
-#, fuzzy
 msgid "Index image"
 msgstr "Indexatu irudia"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:8
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:7
-#, fuzzy
 msgid "Number of colors"
 msgstr "Kolore-kopurua"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:9
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:10
-#, fuzzy
 msgid "Remove background"
 msgstr "Kendu atzeko planoa"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:10
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:11
-#, fuzzy
 msgid "Select-by-color threshold"
 msgstr "Kolorearen araberako hautapenaren muga"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:11
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:12
-#, fuzzy
 msgid "Shadow color"
 msgstr "Itzalaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:14
 msgid "_Big Header..."
-msgstr ""
+msgstr "Goiburu _handia..."
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:15
 msgid "_Small Header..."
-msgstr ""
+msgstr "Goiburu _txikia..."
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:13
 msgid "T_ube Sub-Button Label..."
-msgstr ""
+msgstr "Azpibotoiaren etiketako ho_dia..."
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16
 msgid "Tub_e Sub-Sub-Button Label..."
-msgstr ""
+msgstr "Azpi-azpibotoiaren etiketako h_odia..."
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:17
 msgid "_General Tube Labels..."
-msgstr ""
+msgstr "Hodi-etiketa o_rokorrak..."
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:18
 msgid "_Tube Button Label..."
-msgstr ""
+msgstr "Botoiaren etiketako _hodia..."
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:4
-#, fuzzy
 msgid "Blend gradient (Text)"
-msgstr "Nahaste-gradientea (Testua)"
+msgstr "Nahaste-gradientea (testua)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:5
-#, fuzzy
 msgid "Blend gradient (outline)"
-msgstr "Nahaste-gradientea (Eskema)"
+msgstr "Nahaste-gradientea (eskema)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:6
-#, fuzzy
 msgid "Blend gradient (text)"
-msgstr "Nahaste-gradientea (Testua)"
+msgstr "Nahaste-gradientea (testua)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:10
 msgid "Glo_ssy..."
-msgstr ""
+msgstr "_Satinatua..."
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:11
-#, fuzzy
 msgid "Outline gradient reverse"
 msgstr "Eskemaren gradiente alderantzikatua"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:13
-#, fuzzy
 msgid "Pattern (outline)"
-msgstr "Eredua (Eskema)"
+msgstr "Eredua (eskema)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:14
-#, fuzzy
 msgid "Pattern (overlay)"
-msgstr "Eredua (Gainjarria)"
+msgstr "Eredua (gainjarria)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:15
-#, fuzzy
 msgid "Pattern (text)"
-msgstr "Eredua (Testua)"
+msgstr "Eredua (testua)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:16
 #: ../plug-ins/script-fu/scripts/sphere.scm.h:5
@@ -1710,133 +1568,115 @@ msgid "Shadow"
 msgstr "Itzala"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:20
-#, fuzzy
 msgid "Text gradient reverse"
 msgstr "Testu-gradiente alderantzikatua"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:21
-#, fuzzy
 msgid "Use pattern for outline instead of gradient"
 msgstr "Erabili eredua eskemarako gradientearen ordez "
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:22
-#, fuzzy
 msgid "Use pattern for text instead of gradient"
 msgstr "Erabili eredua testurako gradientearen ordez "
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:23
-#, fuzzy
 msgid "Use pattern overlay"
 msgstr "Erabili ereduen gainjartzea"
 
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
-#, fuzzy
 msgid "Effect size (pixels * 3)"
 msgstr "Efektuaren tamaina (pixelak * 3)"
 
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:7
 msgid "Glo_wing Hot..."
-msgstr ""
+msgstr "Bero _dirdiratsua..."
 
 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:4
-#, fuzzy
 msgid "Bevel height (Sharpness)"
-msgstr "Alaka-altuera (Zorroztasuna)"
+msgstr "Alaka-altuera (zorroztasuna)"
 
 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5
-#, fuzzy
 msgid "Bevel height (sharpness)"
-msgstr "Alaka-altuera (Zorroztasuna)"
+msgstr "Alaka-altuera (zorroztasuna)"
 
 #: ../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
-#, fuzzy
 msgid "Border size (pixels)"
 msgstr "Ertzaren tamaina (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:10
-#, fuzzy
 msgid "Gradient Beve_l..."
-msgstr "Gradiente alderantzikatua"
+msgstr "Gradiente-a_laka..."
 
 #: ../plug-ins/script-fu/scripts/gradient-example.scm.h:2
-#, fuzzy
 msgid "Custom _Gradient..."
-msgstr "Gradiente pertsonalizatua"
+msgstr "_Gradiente pertsonalizatua..."
 
 #: ../plug-ins/script-fu/scripts/grid-system.scm.h:2
-#, fuzzy
 msgid "X divisions"
-msgstr "X zatiketak"
+msgstr "X zatiketa"
 
 #: ../plug-ins/script-fu/scripts/grid-system.scm.h:3
-#, fuzzy
 msgid "Y divisions"
-msgstr "Y zatiketak"
+msgstr "Y zatiketa"
 
 #: ../plug-ins/script-fu/scripts/grid-system.scm.h:4
 msgid "_Grid..."
-msgstr ""
+msgstr "_Sareta..."
 
 #: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:1
 msgid "Creates four Guides around the bounding box of the current selection."
-msgstr ""
+msgstr "Lau gida sortzen ditu uneko hautapeneko muga-koadroaren  inguruan."
 
 #: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:2
 msgid "New Guides from _Selection"
-msgstr ""
+msgstr "Gida berriak _hautapenetik"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:1
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:1
-#, fuzzy
 msgid "Direction"
-msgstr "Azalpena"
+msgstr "Norabidea"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:2
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:2
-#, fuzzy
 msgid "Horizontal"
-msgstr "Lausotu horizontalki"
+msgstr "Horizontala"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:3
 msgid "New Guide (by _Percent)..."
-msgstr ""
+msgstr "Gida berria (%)..."
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:5
 #, no-c-format
 msgid "Position (in %)"
-msgstr ""
+msgstr "Posizioa (%)"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:6
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:4
-#, fuzzy
 msgid "Vertical"
-msgstr "Lausotu bertikalki"
+msgstr "Bertikala"
 
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:3
 msgid "New _Guide..."
-msgstr ""
+msgstr "Gida _berria..."
 
 #: ../plug-ins/script-fu/scripts/guides-remove-all.scm.h:1
 msgid "_Remove all Guides"
-msgstr ""
+msgstr "_Kendu gida guztiak"
 
 #: ../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 "/Script-Fu/Utilitateak/_ASCII geruzara..."
+msgstr "/Script-Fu/Utilitateak"
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:2
-#, fuzzy
 msgid "BG opacity"
-msgstr "Atzeko planoaren opakutasuna"
+msgstr "AtzPl-aren opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:3
-#, fuzzy
 msgid "Draw _HSV Graph..."
-msgstr "/Script-Fu/Utilitateak/Marraztu _HSV grafikoa..."
+msgstr "Marraztu _ÑSB grafikoa..."
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:4
 msgid "End X"
@@ -1847,12 +1687,10 @@ msgid "End Y"
 msgstr "Amaierako Y"
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:6
-#, fuzzy
 msgid "From top-left to bottom-right"
 msgstr "Goiko ezkerretik beheko eskuinera"
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:7
-#, fuzzy
 msgid "Graph scale"
 msgstr "Grafikoaren eskala"
 
@@ -1865,92 +1703,76 @@ msgid "Start Y"
 msgstr "Hasierako Y"
 
 #: ../plug-ins/script-fu/scripts/hsv-graph.scm.h:10
-#, fuzzy
 msgid "Use selection bounds instead of belows"
 msgstr "Erabili hautapen-mugak behekoen ordez"
 
 #: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:4
-#, fuzzy
 msgid "Frame color"
 msgstr "Markoaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:5
-#, fuzzy
 msgid "Frame size"
 msgstr "Markoaren tamaina"
 
 #: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:6
 msgid "Imigre-26..."
-msgstr ""
+msgstr "Imigre-26"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:2
-#, fuzzy
 msgid "Apply layer mask (or discard)"
 msgstr "Aplikatu geruza-maskara (edo baztertu)"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:4
-#, fuzzy
 msgid "Create new image"
 msgstr "Sortu irudi berria"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:5
-#, fuzzy
 msgid "Insert layer names"
 msgstr "Sartu geruza-izenak"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:6
-#, fuzzy
 msgid "Make new background"
-msgstr "Egin atzeko plano berria"
+msgstr "Sortu atzeko plano berria"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:7
-#, fuzzy
 msgid "Outer border"
 msgstr "Kanpoko ertza"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:8
-#, fuzzy
 msgid "Pad color"
 msgstr "Betegarriaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:9
-#, fuzzy
 msgid "Pad opacity"
 msgstr "Betegarriaren opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:10
-#, fuzzy
 msgid "Padding for transparent regions"
 msgstr "Eskualde gardenen betegarria"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:11
-#, fuzzy
 msgid "Shear length"
 msgstr "Zizailamenduaren luzera"
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:12
-#, fuzzy
 msgid "Show Image _Structure..."
-msgstr "/Script-Fu/Utilitateak/Erakutsi _irudiaren egitura..."
+msgstr "Erakutsi _irudiaren egitura..."
 
 #: ../plug-ins/script-fu/scripts/image-structure.scm.h:13
-#, fuzzy
 msgid "Space between layers"
 msgstr "Geruzen arteko tartea"
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:6
-#, fuzzy
 msgid "Land height"
 msgstr "Lurraren altuera"
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:10
-#, fuzzy
 msgid "Sea depth"
 msgstr "Itsasoaren sakonera"
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:11
 msgid "_Land..."
-msgstr ""
+msgstr "_Lurra..."
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:4
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:8
@@ -1962,25 +1784,22 @@ msgid "Seed"
 msgstr "Hazia"
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:8
-#, fuzzy
 msgid "Use current gradient"
 msgstr "Erabili uneko gradientea"
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:9
 msgid "_Lava..."
-msgstr ""
+msgstr "_Laba..."
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:2
 msgid "Line _Nova..."
-msgstr ""
+msgstr "_Noba linea..."
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:3
-#, fuzzy
 msgid "Number of lines"
 msgstr "Marra-kopurua"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:4
-#, fuzzy
 msgid "Offset radius"
 msgstr "Desplazamendu-erradioa"
 
@@ -1993,26 +1812,24 @@ msgid "Sharpness (degrees)"
 msgstr "Zorroztasuna (gradutan)"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1
-#, fuzzy
 msgid "/Xtns/Script-Fu/Make Brush"
-msgstr "/Luzp/Script-Fu/Egin brotxa/Elip_tikoa..."
+msgstr "/Luzp/Script-Fu/Egin brotxa"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:2
 msgid "Elli_ptical, Feathered..."
-msgstr ""
+msgstr "_Eliptikoa, difuminatua..."
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:3
 msgid "Feathering"
 msgstr "Difuminatzea"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:5
-#, fuzzy
 msgid "Name"
-msgstr "Izena:"
+msgstr "Izena"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:6
 msgid "Re_ctangular, Feathered..."
-msgstr ""
+msgstr "_Laukizuzena, difuminatua..."
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:7
 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:4
@@ -2021,28 +1838,25 @@ msgstr "Tartea"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:9
 msgid "_Elliptical..."
-msgstr ""
+msgstr "_Eliptikoa..."
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:10
 msgid "_Rectangular..."
-msgstr ""
+msgstr "_Laukizuzena..."
 
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:4
-#, fuzzy
 msgid "Create shadow"
 msgstr "Sortu itzala"
 
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
-#, fuzzy
 msgid "Effect size (pixels * 5)"
 msgstr "Efektuaren tamaina (pixelak * 5)"
 
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:9
 msgid "N_eon..."
-msgstr ""
+msgstr "N_eon..."
 
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:4
-#, fuzzy
 msgid "Cell size (pixels)"
 msgstr "Gelaxkaren tamaina (pixeletan)"
 
@@ -2054,7 +1868,7 @@ msgstr "Dentsitatea (%)"
 
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:9
 msgid "Newsprint Text..."
-msgstr ""
+msgstr "Prentsa-paperako testua..."
 
 #: ../plug-ins/script-fu/scripts/old-photo.scm.h:3
 msgid "Defocus"
@@ -2070,7 +1884,7 @@ msgstr "Sepia"
 
 #: ../plug-ins/script-fu/scripts/old-photo.scm.h:7
 msgid "_Old Photo..."
-msgstr ""
+msgstr "_argazki zaharra..."
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:3
 msgid "Angle"
@@ -2078,42 +1892,37 @@ msgstr "Angelua"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:6
 msgid "Cubic"
-msgstr ""
+msgstr "Kubikoa"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:7
-#, fuzzy
 msgid "Interpolation"
-msgstr "Interpolatu"
+msgstr "Interpolazioa"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:8
 msgid "Linear"
-msgstr ""
+msgstr "Lineala"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:9
 msgid "None"
-msgstr ""
+msgstr "Bat ere ez"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:11
-#, fuzzy
 msgid "Relative distance of horizon"
 msgstr "Zerumugaren distantzia erlatiboa"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:12
-#, fuzzy
 msgid "Relative length of shadow"
 msgstr "Itzalaren luzera erlatiboa"
 
 #: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:13
 msgid "_Perspective..."
-msgstr ""
+msgstr "_Perspektiba..."
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:2
-#, fuzzy
 msgid "Edge amount"
-msgstr "Ertzaren lodiera"
+msgstr "Ertza-kopurua"
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:4
-#, fuzzy
 msgid "Pixel amount"
 msgstr "Pixel-kopurua"
 
@@ -2123,25 +1932,21 @@ msgstr "Pixelizatu"
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:7
 msgid "_Predator..."
-msgstr ""
+msgstr "_Harraparia..."
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:5
-#, fuzzy
 msgid "Lower color"
 msgstr "Behe-mailako kolorea"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:6
-#, fuzzy
 msgid "Lower color (active)"
-msgstr "Behe-mailako kolorea (Aktiboa)"
+msgstr "Behe-mailako kolorea (aktiboa)"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:7
-#, fuzzy
 msgid "Not pressed"
 msgstr "Sakatu gabe"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:8
-#, fuzzy
 msgid "Not pressed (active)"
 msgstr "Sakatu gabe (Aktiboa)"
 
@@ -2154,28 +1959,24 @@ msgid "Padding Y"
 msgstr "Y betegarria"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:12
-#, fuzzy
 msgid "Round ratio"
 msgstr "Biribilaren erlazioa"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:15
-#, fuzzy
 msgid "Text color (active)"
-msgstr "Testuaren kolorea (Aktiboa)"
+msgstr "Testuaren kolorea (aktiboa)"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:16
-#, fuzzy
 msgid "Upper color"
 msgstr "Goi-mailako kolorea"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:17
-#, fuzzy
 msgid "Upper color (active)"
-msgstr "Goi-mailako kolorea (Aktiboa)"
+msgstr "Goi-mailako kolorea (aktiboa)"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:18
 msgid "_Round Button..."
-msgstr ""
+msgstr "Bo_toi biribila..."
 
 #: ../plug-ins/script-fu/scripts/rendermap.scm.h:2
 msgid "Behaviour"
@@ -2187,7 +1988,7 @@ msgstr "Xehetasuna erdian"
 
 #: ../plug-ins/script-fu/scripts/rendermap.scm.h:8
 msgid "Render _Map..."
-msgstr ""
+msgstr "Errendatu _mapa..."
 
 #: ../plug-ins/script-fu/scripts/rendermap.scm.h:9
 msgid "Tile"
@@ -2198,18 +1999,15 @@ msgid "Black"
 msgstr "Beltza"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3
-#, fuzzy
 msgid "Edge behaviour"
 msgstr "Ertzaren portaera"
 
 #: ../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 "Marko-kopurua"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:5
-#, fuzzy
 msgid "Rippling strength"
 msgstr "Izurtze-indarra"
 
@@ -2223,76 +2021,66 @@ msgstr "Doitu"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:8
 msgid "_Rippling..."
-msgstr ""
+msgstr "_Izurtu..."
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:2
-#, fuzzy
 msgid "Add background"
 msgstr "Gehitu atzeko planoa"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:3
-#, fuzzy
 msgid "Add drop-shadow"
 msgstr "Gehitu itzala"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
-#, fuzzy
 msgid "Edge radius"
 msgstr "Ertzaren erradioa"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:9
 msgid "_Round Corners..."
-msgstr ""
+msgstr "_Biribildu izkinak..."
 
 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:2
-#, fuzzy
 msgid "Brush name"
 msgstr "Brotxaren izena"
 
 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:3
-#, fuzzy
 msgid "File name"
 msgstr "Fitxategi-izena"
 
 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:5
-#, fuzzy
 msgid "To _Brush..."
-msgstr "Arakatu..."
+msgstr "_Brotxara..."
 
 #: ../plug-ins/script-fu/scripts/select-to-image.scm.h:2
 msgid "To _Image"
-msgstr ""
+msgstr "_Irudira"
 
 #: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:2
 msgid "Filename"
 msgstr "Fitxategi-izena"
 
 #: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:3
-#, fuzzy
 msgid "Pattern name"
 msgstr "Eredu-izena"
 
 #: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:4
-#, fuzzy
 msgid "To _Pattern..."
-msgstr "Eredua"
+msgstr "E_redura..."
 
 #: ../plug-ins/script-fu/scripts/selection-round.scm.h:1
 msgid "Concave"
-msgstr ""
+msgstr "Ahurra"
 
 #: ../plug-ins/script-fu/scripts/selection-round.scm.h:3
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Radius (%)"
-msgstr "Erradioa"
+msgstr "Erradioa (%)"
 
 #: ../plug-ins/script-fu/scripts/selection-round.scm.h:4
-#, fuzzy
 msgid "Rounded R_ectangle..."
-msgstr "/Script-Fu/Hautapena/Bi_ribildu..."
+msgstr "Laukizuzen bi_ribildua..."
 
 #: ../plug-ins/script-fu/scripts/slide.scm.h:3
-#, fuzzy
 msgid "Font color"
 msgstr "Letra-tipoaren kolorea"
 
@@ -2302,20 +2090,19 @@ msgstr "Zenbakia"
 
 #: ../plug-ins/script-fu/scripts/slide.scm.h:7
 msgid "_Slide..."
-msgstr ""
+msgstr "_Diapositiba..."
 
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:10
 msgid "SOTA Chrome..."
-msgstr ""
+msgstr "SOTA kromatua..."
 
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:7
 msgid "Speed Text..."
-msgstr ""
+msgstr "Testu azkarra..."
 
 #: ../plug-ins/script-fu/scripts/sphere.scm.h:1
-#, fuzzy
 msgid "/Xtns/Script-Fu/Misc"
-msgstr "/Luzp/Script-Fu/Logotipoak/Ne_on..."
+msgstr "/Luzp/Script-Fu/Hainbat"
 
 #: ../plug-ins/script-fu/scripts/sphere.scm.h:3
 msgid "Lighting (degrees)"
@@ -2326,32 +2113,28 @@ msgid "Radius (pixels)"
 msgstr "Erradioa (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/sphere.scm.h:6
-#, fuzzy
 msgid "Sphere color"
 msgstr "Esferaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/sphere.scm.h:7
-#, fuzzy
 msgid "_Sphere..."
-msgstr "Arakatu..."
+msgstr "_Esfera..."
 
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:2
 msgid "Frames"
 msgstr "Markoak"
 
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:3
-#, fuzzy
 msgid "Index to n colors (0 = remain RGB)"
-msgstr "Indexatu n koloretan (0 = Mantendu RGB)"
+msgstr "Indexatu n koloretan (0 = Mantendu GBU)"
 
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:5
-#, fuzzy
 msgid "Turn from left to right"
 msgstr "Biratu ezkerretik eskuinera"
 
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:7
 msgid "_Spinning Globe..."
-msgstr ""
+msgstr "Globo b_irakaria..."
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2
 msgid "Airbrush"
@@ -2366,7 +2149,6 @@ msgid "Circle"
 msgstr "Zirkulua"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:6
-#, fuzzy
 msgid "Color method"
 msgstr "Koloreztatze-metodoa"
 
@@ -2375,6 +2157,8 @@ msgid ""
 "Draws Spirographs, Epitrochoids and Lissajous Curves. More info at http://"
 "netword.com/*spyrogimp"
 msgstr ""
+"Espirografoak, epitrokoideak eta Lissajous kurbak marrazten ditu. Xehetasun "
+"gehiago honako gunean: http://netword.com/*spyrogimp"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:8
 msgid "Epitrochoid"
@@ -2397,12 +2181,10 @@ msgid "Hexagon"
 msgstr "Hexagonoa"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
-#, fuzzy
 msgid "Hole ratio"
 msgstr "Zuloaren erradioa"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
-#, fuzzy
 msgid "Inner teeth"
 msgstr "Barruko hortzak"
 
@@ -2415,7 +2197,6 @@ msgid "Margin (pixels)"
 msgstr "Marjina (pixeletan)"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:18
-#, fuzzy
 msgid "Outer teeth"
 msgstr "Kanpoko hortzak"
 
@@ -2460,8 +2241,7 @@ msgid "Square"
 msgstr "Karratua"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:29
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:7
-#, fuzzy
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:6
 msgid "Start angle"
 msgstr "Hasierako angelua"
 
@@ -2478,102 +2258,86 @@ msgid "Type"
 msgstr "Mota"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:33
-#, fuzzy
 msgid "_Spyrogimp..."
-msgstr "Espirografoa"
+msgstr "E_spirografoa..."
 
 #: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:4
-#, fuzzy
 msgid "Burst color"
 msgstr "Eztandaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:5
-#, fuzzy
 msgid "Effect size (pixels * 30)"
 msgstr "Efektuaren tamaina (pixelak * 30)"
 
 #: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:8
 msgid "Starb_urst..."
-msgstr ""
+msgstr "I_zar-eztanda..."
 
 #: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
-#, fuzzy
 msgid "Effect size (pixels * 4)"
 msgstr "Efektuaren tamaina (pixelak * 4)"
 
 #: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:7
-#, fuzzy
 msgid "Sta_rscape..."
-msgstr "Arakatu..."
+msgstr "Iz_arretakoa..."
 
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:9
 msgid "Swirl-_Tile..."
-msgstr ""
+msgstr "Lauza moduan e_spiralean..."
 
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:10
-#, fuzzy
 msgid "Whirl amount"
-msgstr "Zurrunbiloaren indarra"
+msgstr "Zurrunbilo-kopurua"
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:2
-#, fuzzy
 msgid "Number of times to whirl"
 msgstr "Biratu beharreko aldi-kopurua"
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:3
-#, fuzzy
 msgid "Quarter size"
 msgstr "Lauzen tamaina"
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:4
-#, fuzzy
 msgid "Whirl angle"
 msgstr "Espiralaren angelua"
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:5
 msgid "_Swirly..."
-msgstr ""
+msgstr "E_spiralean..."
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4
-#, fuzzy
 msgid "Base color"
 msgstr "Oinarri-kolorea"
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:6
-#, fuzzy
 msgid "Edge only"
 msgstr "Ertza bakarrik"
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:7
-#, fuzzy
 msgid "Edge width"
 msgstr "Ertzaren zabalera"
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:10
-#, fuzzy
 msgid "Hit rate"
 msgstr "Talka-tasa"
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:12
 msgid "_Particle Trace..."
-msgstr ""
+msgstr "_Partikulen arrastoa..."
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:1
 msgid "Antialias"
 msgstr "Antialiasing-a"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
-#, fuzzy
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
 msgid "Fill angle"
 msgstr "Bete angelua"
 
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:9
-#, fuzzy
-msgid "Text Circle..."
-msgstr "Zirkulua"
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
+msgid "Text C_ircle..."
+msgstr "Testu _zirkularra..."
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
-#, fuzzy
 msgid "Ending blend"
 msgstr "Amaierako nahastea"
 
@@ -2582,7 +2346,6 @@ msgid "Hexagons"
 msgstr "Hexagonoak"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:9
-#, fuzzy
 msgid "Mosaic tile type"
 msgstr "Mosaikoko lauzen mota"
 
@@ -2595,31 +2358,26 @@ msgid "Squares"
 msgstr "Karratuak"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:13
-#, fuzzy
 msgid "Starting blend"
 msgstr "Hasierako nahastea"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:15
-#, fuzzy
 msgid "Text pattern"
 msgstr "Testu-eredua"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:16
 msgid "_Textured..."
-msgstr ""
+msgstr "Te_sturaduna..."
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:1
-#, fuzzy
 msgid "Blur horizontally"
 msgstr "Lausotu horizontalki"
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:2
-#, fuzzy
 msgid "Blur type"
 msgstr "Lausotze-mota"
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:3
-#, fuzzy
 msgid "Blur vertically"
 msgstr "Lausotu bertikalki"
 
@@ -2632,36 +2390,32 @@ msgid "RLE"
 msgstr "RLE"
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:7
-#, fuzzy
 msgid "_Tileable Blur..."
-msgstr "/Iragazkiak/Lausotuak/_Lausotze teilakagarria..."
+msgstr "_Lausotze teilakagarria..."
 
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:6
 msgid "Web Title Header..."
-msgstr ""
+msgstr "Web izenburuen goiburua..."
 
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:4
-#, fuzzy
 msgid "Foreground color"
 msgstr "Aurreko planoaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:7
 msgid "T_ruchet..."
-msgstr ""
+msgstr "T_ruchet..."
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:2
-#, fuzzy
 msgid "Mask opacity"
 msgstr "Maskararen opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:3
-#, fuzzy
 msgid "Mask size"
 msgstr "Maskararen tamaina"
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:4
 msgid "_Unsharp Mask..."
-msgstr ""
+msgstr "_Desenfokatze-maskara..."
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2
 msgid "Amplitude"
@@ -2677,622 +2431,89 @@ msgstr "Uhinaren luzera"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:6
 msgid "_Waves..."
-msgstr ""
+msgstr "_Uhinak..."
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:2
-#, fuzzy
 msgid "Ribbon spacing"
 msgstr "Banda arteko tartea"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:3
-#, fuzzy
 msgid "Ribbon width"
 msgstr "Bandaren zabalera"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:4
-#, fuzzy
 msgid "Shadow darkness"
 msgstr "Itzalaren iluntasuna"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:5
-#, fuzzy
 msgid "Shadow depth"
 msgstr "Itzalaren sakonera"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:6
-#, fuzzy
 msgid "Thread density"
 msgstr "Hariaren dentsitatea"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:7
-#, fuzzy
 msgid "Thread intensity"
 msgstr "Hariaren intentsitatea"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:8
-#, fuzzy
 msgid "Thread length"
 msgstr "Hariaren luzera"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:9
 msgid "_Weave..."
-msgstr ""
+msgstr "_Bilbea..."
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:1
-#, fuzzy
 msgid "/Help/The GIMP Online"
-msgstr "/Laguntza/GIMP online/Web gune _nagusia"
+msgstr "/Laguntza/GIMP linean"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:2
 msgid "Plug-in _Registry"
-msgstr ""
+msgstr "Plugin-en _erregistroa"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:3
 msgid "_Developer Web Site"
-msgstr ""
+msgstr "_Garatzaileen web gunea"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:4
 msgid "_Main Web Site"
-msgstr ""
+msgstr "_Web gune nagusia"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2
-#, fuzzy
 msgid "Drop shadow X offset"
 msgstr "Itzalaren X desplazamendua"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:3
-#, fuzzy
 msgid "Drop shadow Y offset"
 msgstr "Itzalaren Y desplazamendua"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:4
-#, fuzzy
 msgid "Drop shadow blur radius"
 msgstr "Itzalaren lausotze-erradioa"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:5
-#, fuzzy
 msgid "Drop shadow color"
 msgstr "Itzalaren kolorea"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:6
-#, fuzzy
 msgid "Drop shadow opacity"
 msgstr "Itzalaren opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
-#, fuzzy
 msgid "Highlight X offset"
 msgstr "Nabarmentzearen X desplazamendua"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:8
-#, fuzzy
 msgid "Highlight Y offset"
 msgstr "Nabarmentzearen Y desplazamendua"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:10
-#, fuzzy
 msgid "Highlight opacity"
 msgstr "Nabarmentzearen opakutasuna"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
-msgstr ""
+msgstr "_Xach-en efektua..."
 
-#, fuzzy
-#~ msgid "Buffer amount (% height of text)"
-#~ msgstr "Bufferraren tamaina (testuaren altueraren %)"
-
-#, fuzzy
-#~ msgid "_ASCII to Layer..."
-#~ msgstr "/Script-Fu/Utilitateak/_ASCII geruzara..."
-
-#~ msgid "/Xtns/Script-Fu/_Refresh Scripts"
-#~ msgstr "/Luzp/Script-Fu/_Freskatu script-ak..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/3D _Outline..."
-#~ msgstr "/Script-Fu/Alfa logotipora/3D _eskema..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/3D _Outline..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/3D e_skema..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/3_D Truchet..."
-#~ msgstr "/Luzp/Script-Fu/Ereduak/3D _truchet-a..."
-
-#~ msgid "/Script-Fu/Decor/Add B_evel..."
-#~ msgstr "/Script-Fu/Dekorazioa/Gehitu a_laka..."
-
-#~ msgid "/Script-Fu/Decor/Add _Border..."
-#~ msgstr "/Script-Fu/Dekorazioa/Gehitu e_rtza..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Alien Glow/_Arrow..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Dirdira estralurtarra/_Gezia..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Alien Glow/_Bullet..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Dirdira estralurtarra/_Buleta..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Alien Glow/B_utton..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Dirdira estralurtarra/Bo_toia..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Alien _Glow..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Dirdira _estralurtarra..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Alien _Glow..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Di_rdira estralurtarra..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Alien _Neon..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Neon e_stralurtarra..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Alien _Neon..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Neon estralur_tarra..."
-
-#~ msgid "/Xtns/Script-Fu/Utils/_ASCII to Image..."
-#~ msgstr "/Luzp/Script-Fu/Utilitateak/ASCII irudira..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/_Basic I..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Oinarrizkoa I..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/_Basic I..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/O_inarrizkoa I..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/B_asic II..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Oi_narrizkoa II..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/B_asic II..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Oin_arrizkoa II..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Bullet..."
-#~ msgstr "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua/_Buleta..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/B_utton..."
-#~ msgstr "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua/Bo_toia..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/H_eading..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua/_Izenburua..."
-
-#~ msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern/_Hrule..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Eredu alakatua/Ba_rra "
-#~ "horizontala..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Blen_ded..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Na_hastuta..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Blen_ded..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/_Nahastuta..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Bo_vination..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Behi-kontuak..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Bo_vination..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Be_hi-kontuak..."
-
-#~ msgid "/Script-Fu/Animators/B_urn-In..."
-#~ msgstr "/Script-Fu/Animazioa/_Erregailua..."
-
-#~ msgid "Burn-in like effect on a fg (text) layer and a bg layer; V2.1"
-#~ msgstr ""
-#~ "Testu-geruza (aurrekoa) batean eta atzeko geruza batean errauste efektua "
-#~ "bezalakoa; V2.1"
-
-#~ msgid "/Xtns/Script-Fu/Patterns/_Camouflage..."
-#~ msgstr "/Luzp/Script-Fu/_Ereduak/_Kamuflajea..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Carved..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Zizelkatuta..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/_Chalk..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Klera..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/_Chalk..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/K_lera..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Chip Awa_y..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Xehatu..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Chip Awa_y..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Xe_hatu..."
-
-#~ msgid "/Script-Fu/Stencil Ops/C_hrome-It..."
-#~ msgstr "/Script-Fu/Eragiketak txantiloiekin/_Kromatu..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/C_hrome..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Kromatu..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/C_hrome..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/K_romatu..."
-
-#~ msgid "/Script-Fu/Render/_Circuit..."
-#~ msgstr "/Script-Fu/Errendatuak/_Zirkuitua..."
-
-#~ msgid "/Script-Fu/Alchemy/_Clothify..."
-#~ msgstr "/Script-Fu/Alkimia/_Ehundura..."
-
-#~ msgid "/Script-Fu/Decor/_Coffee Stain..."
-#~ msgstr "/Script-Fu/Dekorazioa/_Kafe-orbana..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Comic Boo_k..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Ko_mikia..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Comic Boo_k..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/K_omikia..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Cool _Metal..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Metal hotza..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Cool _Metal..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Me_tal hotza..."
-
-#, fuzzy
-#~ msgid "/Edit/Copy/Copy _Visible"
-#~ msgstr "/Editatu/Kopiatu _ikusgai dagoena"
-
-#~ msgid "/Xtns/Script-Fu/Logos/Crystal..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/K_ristala..."
-
-#~ msgid "/Script-Fu/Selection/_Fade Outline..."
-#~ msgstr "/Script-Fu/Hautapena/_Iraungitze-eskema..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/_Flatland..."
-#~ msgstr "/Luzp/Script-Fu/_Ereduak/_Lur laua..."
-
-#~ msgid "/Xtns/Script-Fu/Utils/_Font Map..."
-#~ msgstr "/Luzp/Script-Fu/Utilitateak/Letra-tipoen mapa..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/_Frosty..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Izoztuta..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/_Frosty..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/I_zoztuta..."
-
-#~ msgid "/Script-Fu/Decor/_Fuzzy Border..."
-#~ msgstr "/Script-Fu/Dekorazioa/_Ertz lausoa..."
-
-#, fuzzy
-#~ msgid ""
-#~ "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_Small Header..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/G_oiburu txikia..."
-
-#, fuzzy
-#~ msgid ""
-#~ "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/T_ube Sub-"
-#~ "Button Label..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/_Hodiaren azpibotoiko "
-#~ "etiketa..."
-
-#, fuzzy
-#~ msgid ""
-#~ "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/Tub_e Sub-Sub-"
-#~ "Button Label..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/Ho_diaren azpibotoiko "
-#~ "etiketa..."
-
-#, fuzzy
-#~ msgid ""
-#~ "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_General Tube "
-#~ "Labels..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/_Hodiaren etiketa "
-#~ "orokorrak..."
-
-#, fuzzy
-#~ msgid ""
-#~ "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org/_Tube Button "
-#~ "Label..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Web orriko gaiak/Gimp.Org/_Hodiaren botoiko "
-#~ "etiketa..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Glo_ssy..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Distiratsua..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Glo_ssy..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Dis_tiratsua..."
-
-#, fuzzy
-#~ msgid "Use tattern for outline instead of gradient"
-#~ msgstr "Erabili eredua eskemarako gradientearen ordez "
-
-#~ msgid "/Script-Fu/Alpha to Logo/Glo_wing Hot..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Bero dirdiratsua..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Glo_wing Hot..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Be_ro dirdiratsua..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Gradient Beve_l..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Gradiente a_lakatua..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Gradient Beve_l..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Gradiente _alakatua..."
-
-#~ msgid "/Xtns/Script-Fu/Utils/Custom _Gradient..."
-#~ msgstr "/Luzp/Script-Fu/Utilitateak/_Gradiente pertsonalizatua..."
-
-#~ msgid "/Script-Fu/Render/_Grid..."
-#~ msgstr "/Script-Fu/Errendatuak/_Sareta..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Imigre-26..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Imigre-26..."
-
-#~ msgid "/Script-Fu/Render/Line _Nova..."
-#~ msgstr "/Script-Fu/Errendatuak/Line _Nova..."
-
-#~ msgid "/Xtns/Script-Fu/Make Brush/Elli_ptical, Feathered..."
-#~ msgstr "/Luzp/Script-Fu/Egin brotxa/Eli_ptikoa, difuminatua..."
-
-#~ msgid "/Xtns/Script-Fu/Make Brush/Re_ctangular, Feathered..."
-#~ msgstr "/Luzp/Script-Fu/Egin brotxa/A_ngeluzuzena, difuminatua..."
-
-#~ msgid "/Xtns/Script-Fu/Make Brush/_Rectangular..."
-#~ msgstr "/Luzp/Script-Fu/Egin brotxa/_Laukizuzena..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/N_eon..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Ne_on..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Newsprint Text..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/_Prentsa-paperaren testua..."
-
-#~ msgid "/Script-Fu/Decor/_Old Photo..."
-#~ msgstr "/Script-Fu/Dekorazioa/_Argazki zaharra..."
-
-#~ msgid "/Script-Fu/Shadow/_Perspective..."
-#~ msgstr "/Script-Fu/Itzala/_Perspektiba..."
-
-#~ msgid "/Script-Fu/Alchemy/_Predator..."
-#~ msgstr "/Script-Fu/Alkimia/_Harraparia..."
-
-#~ msgid "/Xtns/Script-Fu/Buttons/_Round Button..."
-#~ msgstr "/Luzp/Script-Fu/Botoiak/Bo_toi biribila..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/Render _Map..."
-#~ msgstr "/Luzp/Script-Fu/Ereduak/Errendatu _mapa..."
-
-#~ msgid "/Script-Fu/Animators/_Rippling..."
-#~ msgstr "/Script-Fu/Animazioa/_Izurtu..."
-
-#~ msgid "/Script-Fu/Decor/_Round Corners..."
-#~ msgstr "/Script-Fu/Dekorazioa/_Biribildu izkinak..."
-
-#~ msgid "/Script-Fu/Selection/To _Brush..."
-#~ msgstr "/Script-Fu/Hautapena/_Brotxara..."
-
-#~ msgid "/Script-Fu/Selection/To _Pattern..."
-#~ msgstr "/Script-Fu/Hautapena/_Eredura..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/SOTA Chrome..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/SOTA _kromatua..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Speed Text..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Testu azkarra..."
-
-#~ msgid "/Xtns/Script-Fu/Misc/_Sphere..."
-#~ msgstr "/Luzp/Script-Fu/Hainbat/Es_fera..."
-
-#~ msgid "/Script-Fu/Animators/_Spinning Globe..."
-#~ msgstr "/Script-Fu/Animazioa/Globo b_irakaria..."
-
-#~ msgid "/Script-Fu/Render/_Spyrogimp..."
-#~ msgstr "/Script-Fu/Errendatuak/_Spyrogimp..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Starb_urst..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Izar-eztanda..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Starb_urst..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/I_zar-eztanda..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/Sta_rscape..."
-#~ msgstr "/Script-Fu/Alfa logotipora/Iza_rretakoa..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Sta_rscape..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Iz_arretakoa..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/Swirl-_Tile..."
-#~ msgstr "/Luzp/Script-Fu/Ereduak/Lauza moduan e_spiralean..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/_Swirly..."
-#~ msgstr "/Luzp/Script-Fu/Ereduak/E_spiralean..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/_Particle Trace..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Partikulen arrastoa..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/_Particle Trace..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Par_tikulen arrastoa..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Text Circle..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Testu zirkularra..."
-
-#~ msgid "/Script-Fu/Alpha to Logo/_Textured..."
-#~ msgstr "/Script-Fu/Alfa logotipora/_Testuraduna..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/_Textured..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Te_sturaduna..."
-
-#~ msgid "/Xtns/Script-Fu/Logos/Web Title Header..."
-#~ msgstr "/Luzp/Script-Fu/Logotipoak/Web izenburuen goiburua..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/T_ruchet..."
-#~ msgstr "/Luzp/Script-Fu/_Ereduak/Truc_het..."
-
-#~ msgid "/Script-Fu/Alchemy/_Unsharp Mask..."
-#~ msgstr "/Script-Fu/Alkimia/_Lausotze-maskara..."
-
-#~ msgid "/Script-Fu/Animators/_Waves..."
-#~ msgstr "/Script-Fu/Animazioa/_Uhinak..."
-
-#~ msgid "/Help/The GIMP Online/Plug-in _Registry"
-#~ msgstr "/Laguntza/GIMP online/Plugin-en _erregistroa"
-
-#~ msgid "/Help/The GIMP Online/_Developer Web Site"
-#~ msgstr "/Laguntza/GIMP online/_Garatzaileen web gnuea"
-
-#~ msgid "/Script-Fu/Shadow/_Xach-Effect..."
-#~ msgstr "/Script-Fu/Itzala/_Xach-en efektua..."
-
-#~ msgid "Re-read all available scripts"
-#~ msgstr "Berriz irakurri erabilgarri dauden script guztiak"
-
-#~ msgid ""
-#~ "\n"
-#~ "\t\t    SF-ADJUSTMENT _"
-#~ msgstr ""
-#~ "\n"
-#~ "\t\t    SF-ADJUSTMENT _"
-
-#~ msgid ""
-#~ "\n"
-#~ "\t\t    SF-COLOR      _"
-#~ msgstr ""
-#~ "\n"
-#~ "\t\t    SF-COLOR      _"
-
-#, fuzzy
-#~ msgid "Relative radius"
-#~ msgstr "Erradio erlatiboa"
-
-#, fuzzy
-#~ msgid "_About"
-#~ msgstr "Honi buruz"
-
-#~ msgid "DB Browser"
-#~ msgstr "DB arakatzailea"
-
-#~ msgid "Blurb:"
-#~ msgstr "Deskribapena:"
-
-#~ msgid "In:"
-#~ msgstr "Sarrera:"
-
-#~ msgid "Out:"
-#~ msgstr "Irteera:"
-
-#~ msgid "Help:"
-#~ msgstr "Laguntza:"
-
-#~ msgid "Font Size (pixels)"
-#~ msgstr "Letra-tamaina (pixeletan)"
-
-#~ msgid "Text Color"
-#~ msgstr "Testuaren kolorea"
-
-#~ msgid "Transparent Background"
-#~ msgstr "Atzeko plano gardena"
-
-#~ msgid ""
-#~ ")))\n"
-#~ "     (filename (string-append data-dir\n"
-#~ "\t\t\t      "
-#~ msgstr ""
-#~ ")))\n"
-#~ "     (filename (string-append data-dir\n"
-#~ "\t\t\t      "
-
-#~ msgid ""
-#~ ")))\n"
-#~ "     (filename (string-append data-dir\n"
-#~ "               "
-#~ msgstr ""
-#~ ")))\n"
-#~ "     (filename (string-append data-dir\n"
-#~ "\t\t\t      "
-
-#~ msgid ""
-#~ ")))\n"
-#~ "    (filename (string-append data-dir\n"
-#~ "               "
-#~ msgstr ""
-#~ ")))\n"
-#~ "     (filename (string-append data-dir\n"
-#~ "\t\t\t      "
-
-#~ msgid ""
-#~ ")))\n"
-#~ "    (set! filename2 (string-append data-dir\n"
-#~ "\t\t\t\t   "
-#~ msgstr ""
-#~ ")))\n"
-#~ "    (set! filename2 (string-append data-dir\n"
-#~ "\t\t\t\t   "
-
-#~ msgid ""
-#~ ")))\n"
-#~ "  (set! filename2 (string-append data-dir\n"
-#~ "\t\t\t\t "
-#~ msgstr ""
-#~ ")))\n"
-#~ "    (set! filename2 (string-append data-dir\n"
-#~ "\t\t\t\t   "
-
-#~ msgid "Unable to open a stream on the SIOD output pipe"
-#~ msgstr "Ezin da korrontea ireki SIOD irteerako kanalizazioan"
-
-#~ msgid "Unable to open the SIOD output pipe"
-#~ msgstr "Ezin da SIOD irteerako kanalizazioa ireki"
-
-#, fuzzy
-#~ msgid "Blend gradient (sext)"
-#~ msgstr "Nahaste-gradientea (Testua)"
-
-#~ msgid "/Xtns/Script-Fu/Script-Fu _Console"
-#~ msgstr "/Luzp/Script-Fu/Script-Fu _Kontsola"
-
-#~ msgid "/Xtns/Script-Fu/_Start Server..."
-#~ msgstr "/Luzp/Script-Fu/_Abiatu zerbitzaria..."
-
-#~ msgid "/Xtns/Script-Fu/Patterns/_Swirly (tileable)..."
-#~ msgstr ""
-#~ "/Luzp/Script-Fu/Ereduak/_Espirala (lauza moduan jar daiteke)..."
-
-#~ msgid "/Xtns/Web Browser/Developer FAQ"
-#~ msgstr "/Luzp/Web arakatzailea/Garatzailearen FAQak"
-
-#~ msgid "/Xtns/Web Browser/GIMP Bugs"
-#~ msgstr "/Luzp/Web arakatzailea/GIMPen erroreak"
-
-#~ msgid "/Xtns/Web Browser/GIMP Manual"
-#~ msgstr "/Luzp/Web arakatzailea/GIMPen eskuliburua"
-
-#~ msgid "/Xtns/Web Browser/GIMP News"
-#~ msgstr "/Luzp/Web arakatzailea/GIMPen albisteak"
-
-#~ msgid "/Xtns/Web Browser/GIMP Tutorials"
-#~ msgstr "/Luzp/Web arakatzailea/GIMPen tutorialak"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/Documenation"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/Dokumentazioa"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/Download"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/Deskargatuak"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/GIMP Art"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/GIMPeko artea"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/GTK"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/GTK"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/Links"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/Estekak"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/Mailing Lists"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/Posta-zerrendak"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/Resources"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/Baliabideak"
-
-#~ msgid "/Xtns/Web Browser/GIMP.ORG/The GIMP"
-#~ msgstr "/Luzp/Web arakatzailea/GIMP.ORG/GIMP"
-
-#~ msgid "/Xtns/Web Browser/Gimp-Savvy.com"
-#~ msgstr "/Luzp/Web arakatzailea/Gimp-Savvy.com"
-
-#~ msgid "/Xtns/Web Browser/Grokking the GIMP"
-#~ msgstr "/Luzp/Web arakatzailea/Grokking the GIMP"
-
-#~ msgid "/Xtns/Web Browser/User FAQ"
-#~ msgstr "/Luzp/Web arakatzailea/Erabiltzaileen FAQak"
diff --git a/po/ChangeLog b/po/ChangeLog
index b848d77ade..17bb8a778e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-06  Francisco Javier F. Serrador  
+
+	* es.po: Updated Spanish translation.
+
+2006-04-24  Francisco Javier F. Serrador  
+
+	* es.po: Updated Spanish translation.
+
+2006-04-20  Inaki Larranaga  
+
+	* eu.po: Updated Basque translation.
+
 2006-03-07  Benoît Dejean  
 
 	* fr.po: Updated French translation.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index deeb686368..d2d4e4cdcd 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 SHELL = /bin/sh
-@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -34,9 +33,8 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -46,7 +44,6 @@ mkdir_p = $(install_sh) -d
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-CC = @CC@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
@@ -55,31 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
 GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+#This Gets Replace for some reason
 
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
@@ -105,76 +93,63 @@ all-no:
 $(GETTEXT_PACKAGE).pot: $(POTFILES)
 	$(GENPOT)
 
-install: install-exec install-data
-install-exec:
+install: install-data
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$cat as" \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
 		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
 		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$cat as" \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
 		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
 
 # Define this as empty until I found a useful application.
 installcheck:
 
 uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
 
 check: all $(GETTEXT_PACKAGE).pot
 
-dvi info tags TAGS ID:
-
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
 	rm -f .intltool-merge-cache
 
 clean: mostlyclean
@@ -188,7 +163,7 @@ maintainer-clean: distclean
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f Makefile.in.in
 
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	extra_dists="$(EXTRA_DISTFILES)"; \
@@ -204,10 +179,12 @@ dist distdir: $(DISTFILES)
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	if test -n "$(PO_LINGUAS)"; then \
+	  linguas="$(PO_LINGUAS)"; \
+	else \
+	  linguas="$(ALL_LINGUAS)"; \
+	fi; \
+	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
 	  if $$result; then \
@@ -223,7 +200,7 @@ update-po: Makefile
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+	    echo "msgmerge for $$lang.gmo failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done
diff --git a/po/es.po b/po/es.po
index 255a94ef1e..3fc3458c3a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,41 +5,41 @@
 # Rodrigo Sancho Senosiain 
 # Francisco Vila , 2003.
 # Pablo G. del Campo , 2003,2004.
-# Francisco Javier F. Serrador , 2004, 2005.
+# Francisco Javier F. Serrador , 2004, 2005, 2006.
 # Francisco Vila , 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 23:31+0100\n"
-"PO-Revision-Date: 2005-03-05 23:35+0100\n"
+"POT-Creation-Date: 2006-05-06 01:13+0200\n"
+"PO-Revision-Date: 2006-05-06 01:20+0200\n"
 "Last-Translator: Francisco Javier F. Serrador \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../app/app_procs.c:144
 msgid "(This console window will close in ten seconds)\n"
 msgstr "(Esta ventana de consola se cerrará en diez segundos)\n"
 
-#: ../app/app_procs.c:238
+#: ../app/app_procs.c:239
 msgid ""
 "GIMP is not properly installed for the current user.\n"
 "User installation was skipped because the '--no-interface' flag was used.\n"
 "To perform user installation, run the GIMP without the '--no-interface' flag."
 msgstr ""
-"El Gimp no se encuentra instalado correctamente para el usuario actual.\n"
+"GIMP no se encuentra instalado correctamente para el usuario actual.\n"
 "La instalación del usuario fue saltada debido a que se utilizó el \n"
-"modificador «-- no interface».\n"
-"Para realizar la instalación de usuario ejecute El Gimp sin el modificador\n"
+"modificador «-- no-interface».\n"
+"Para realizar la instalación de usuario ejecute GIMP sin el modificador\n"
 "«--no-interface»."
 
-#: ../app/app_procs.c:289
+#: ../app/app_procs.c:290
 #, c-format
 msgid ""
 "Unable to open a test swap file. To avoid data loss please check the "
@@ -50,7 +50,7 @@ msgstr ""
 "pérdida de datos compruebe la ubicación y los permisos del directorio de "
 "intercambio definido en sus preferencias (actualmente es «%s»)."
 
-#: ../app/app_procs.c:348 ../app/core/gimppalette-import.c:441
+#: ../app/app_procs.c:349 ../app/core/gimppalette-import.c:444
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "La apertura de «%s» ha fallado: %s"
@@ -67,13 +67,13 @@ msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
 msgstr ""
-"El Gimp no ha podido inicializar la interfaz gráfica de usuario.\n"
+"GIMP no ha podido inicializar la interfaz gráfica de usuario.\n"
 "Asegúrese de que exista una instalación apropiada para su pantalla."
 
 #: ../app/main.c:222 ../app/widgets/gimptoolbox.c:559
 #: ../data/misc/gimp.desktop.in.in.h:3
 msgid "The GIMP"
-msgstr "El Gimp"
+msgstr "El GIMP"
 
 #.
 #. *  anything else starting with a '-' is an error.
@@ -89,7 +89,7 @@ msgstr ""
 
 #: ../app/main.c:501
 msgid "GIMP version"
-msgstr "Versión de El Gimp"
+msgstr "Versión de GIMP"
 
 #: ../app/main.c:509
 #, c-format
@@ -123,7 +123,7 @@ msgid ""
 "  --no-shm                 Do not use shared memory between GIMP and "
 "plugins.\n"
 msgstr ""
-"  --no-shm                 No compartir la memoria entre El Gimp y las "
+"  --no-shm                 No compartir la memoria entre GIMP y los "
 "complementos.\n"
 
 #: ../app/main.c:516
@@ -158,8 +158,7 @@ msgstr "  -s, --no-splash          No mostrar la ventana de inicio.\n"
 
 #: ../app/main.c:522
 msgid "  --session          Use an alternate sessionrc file.\n"
-msgstr ""
-"  --session          U so de un archivo de sesión alternativo.\n"
+msgstr "  --session          Uso de un archivo «sessionrc» alternativo.\n"
 
 #: ../app/main.c:523
 msgid "  -g, --gimprc     Use an alternate gimprc file.\n"
@@ -167,12 +166,10 @@ msgstr "  -g, --gimprc     Usar un archivo «gimprc» alternativo.\n"
 
 #: ../app/main.c:524
 msgid "  --system-gimprc  Use an alternate system gimprc file.\n"
-msgstr ""
-"  --system-gimprc  Usar un archivo de sistema «gimprc» alternativo.\n"
+msgstr "  --system-gimprc  Usar un archivo de sistema «gimprc» alternativo.\n"
 
 #: ../app/main.c:525
-msgid ""
-"  --dump-gimprc            Output a gimprc file with default settings.\n"
+msgid "  --dump-gimprc            Output a gimprc file with default settings.\n"
 msgstr ""
 "  --dump-gimprc            Saca un archivo gimprc con la configuración "
 "predeterminada.\n"
@@ -188,8 +185,7 @@ msgstr ""
 # //R Posiblemente estará mal
 # Creo que ahora está un poco mejor. FVD
 #: ../app/main.c:527
-msgid ""
-"  --debug-handlers         Enable non-fatal debugging signal handlers.\n"
+msgid "  --debug-handlers         Enable non-fatal debugging signal handlers.\n"
 msgstr ""
 "  --debug-handlers         Activar los manejadores de señales no fatales de "
 "depuración.\n"
@@ -248,7 +244,7 @@ msgid ""
 "8 and you didn't tell GLib about this. Please set the environment variable "
 "G_FILENAME_ENCODING."
 msgstr ""
-"El nombre del directorio que contiene la configuración de usuario de Gimp no "
+"El nombre del directorio que contiene la configuración de usuario de GIMP no "
 "se puede convertir a UTF-8: %s\n"
 " \n"
 "Lo más probable es que su sistema de ficheros almacene los archivos en una "
@@ -256,153 +252,154 @@ msgstr ""
 "establezca la variable de entorno G_FILENAME_ENCODING."
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:93 ../app/core/gimp.c:856
+#: ../app/actions/actions.c:94 ../app/core/gimp.c:856
 #: ../app/dialogs/dialogs.c:138 ../app/dialogs/preferences-dialog.c:2297
 #: ../app/pdb/internal_procs.c:92
 msgid "Brushes"
 msgstr "Brochas"
 
-#: ../app/actions/actions.c:96 ../app/dialogs/dialogs.c:150
+#: ../app/actions/actions.c:97 ../app/dialogs/dialogs.c:150
 msgid "Buffers"
 msgstr "Búferes"
 
-#: ../app/actions/actions.c:99 ../app/dialogs/dialogs.c:163
+#: ../app/actions/actions.c:100 ../app/dialogs/dialogs.c:163
 msgid "Channels"
 msgstr "Canales"
 
-#: ../app/actions/actions.c:102
+#: ../app/actions/actions.c:103
 msgid "Colormap Editor"
 msgstr "Editor del mapa de colores"
 
-#: ../app/actions/actions.c:105 ../app/pdb/internal_procs.c:101
+#: ../app/actions/actions.c:106 ../app/pdb/internal_procs.c:101
 msgid "Context"
 msgstr "Contexto"
 
-#: ../app/actions/actions.c:108
+#: ../app/actions/actions.c:109
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../app/actions/actions.c:111
+#: ../app/actions/actions.c:112
 msgid "Dialogs"
 msgstr "Diálogos"
 
-#: ../app/actions/actions.c:114
+#: ../app/actions/actions.c:115
 msgid "Dockable"
 msgstr "Empotrable"
 
-#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:152
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:152
 msgid "Document History"
 msgstr "Historial del documento"
 
-#: ../app/actions/actions.c:120 ../app/core/core-enums.c:1041
-#: ../app/core/core-enums.c:1071
+#: ../app/actions/actions.c:121 ../app/core/core-enums.c:1043
+#: ../app/core/core-enums.c:1073
 msgid "Drawable"
 msgstr "Dibujable"
 
-#: ../app/actions/actions.c:123 ../app/tools/tools-enums.c:144
+#: ../app/actions/actions.c:124 ../app/tools/tools-enums.c:144
 msgid "Edit"
 msgstr "Editar"
 
-#: ../app/actions/actions.c:126 ../app/dialogs/dialogs.c:131
+#: ../app/actions/actions.c:127 ../app/dialogs/dialogs.c:131
 msgid "Error Console"
 msgstr "Consola de errores"
 
-#: ../app/actions/actions.c:129
+#: ../app/actions/actions.c:130
 msgid "File"
 msgstr "Archivo"
 
 #. initialize the list of gimp fonts
-#: ../app/actions/actions.c:132 ../app/core/gimp.c:872
+#: ../app/actions/actions.c:133 ../app/core/gimp.c:872
 #: ../app/dialogs/dialogs.c:146 ../app/dialogs/preferences-dialog.c:2313
 #: ../app/pdb/internal_procs.c:128
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: ../app/actions/actions.c:135 ../app/dialogs/dialogs.c:205
+#: ../app/actions/actions.c:136 ../app/dialogs/dialogs.c:205
 msgid "Gradient Editor"
 msgstr "Editor de degradados"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:138 ../app/core/gimp.c:868
+#: ../app/actions/actions.c:139 ../app/core/gimp.c:868
 #: ../app/dialogs/dialogs.c:142 ../app/dialogs/preferences-dialog.c:2309
 #: ../app/pdb/internal_procs.c:140
 msgid "Gradients"
 msgstr "Degradados"
 
-#: ../app/actions/actions.c:141
+#: ../app/actions/actions.c:142
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../app/actions/actions.c:144 ../app/pdb/internal_procs.c:149
+#: ../app/actions/actions.c:145 ../app/pdb/internal_procs.c:149
 #: ../app/tools/tools-enums.c:176
 msgid "Image"
 msgstr "Imagen"
 
 #. list & grid views
-#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:136
+#: ../app/actions/actions.c:148 ../app/dialogs/dialogs.c:136
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../app/actions/actions.c:150 ../app/dialogs/dialogs.c:159
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:159
 msgid "Layers"
 msgstr "Capas"
 
-#: ../app/actions/actions.c:153 ../app/dialogs/dialogs.c:209
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:209
 msgid "Palette Editor"
 msgstr "Editor de paleta"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:156 ../app/core/gimp.c:864
+#: ../app/actions/actions.c:157 ../app/core/gimp.c:864
 #: ../app/dialogs/dialogs.c:144 ../app/dialogs/preferences-dialog.c:2305
 #: ../app/pdb/internal_procs.c:170
 msgid "Palettes"
 msgstr "Paletas"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:159 ../app/core/gimp.c:860
+#: ../app/actions/actions.c:160 ../app/core/gimp.c:860
 #: ../app/dialogs/dialogs.c:140 ../app/dialogs/preferences-dialog.c:2301
 #: ../app/pdb/internal_procs.c:185
 msgid "Patterns"
 msgstr "Patrones"
 
-#: ../app/actions/actions.c:162 ../app/dialogs/preferences-dialog.c:2317
+#: ../app/actions/actions.c:163 ../app/dialogs/preferences-dialog.c:2317
 msgid "Plug-Ins"
 msgstr "Complementos"
 
-#: ../app/actions/actions.c:165
-msgid "QuickMask"
+#: ../app/actions/actions.c:166 ../app/core/core-enums.c:1040
+#: ../app/core/gimpchannel.c:383
+msgid "Quick Mask"
 msgstr "Máscara rápida"
 
-#: ../app/actions/actions.c:168
+#: ../app/actions/actions.c:169
 msgid "Select"
 msgstr "Seleccionar"
 
 #. initialize the template list
-#: ../app/actions/actions.c:171 ../app/core/gimp.c:880
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:880
 #: ../app/dialogs/dialogs.c:154
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../app/actions/actions.c:174
+#: ../app/actions/actions.c:175
 msgid "Text Editor"
 msgstr "Editor de textos"
 
-#: ../app/actions/actions.c:177 ../app/dialogs/dialogs.c:123
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:123
 #: ../app/dialogs/preferences-dialog.c:1585
 #: ../app/dialogs/preferences-dialog.c:1588 ../app/gui/gui.c:410
 msgid "Tool Options"
 msgstr "Opciones de herramienta"
 
-#: ../app/actions/actions.c:180 ../app/dialogs/dialogs.c:148
+#: ../app/actions/actions.c:181 ../app/dialogs/dialogs.c:148
 msgid "Tools"
 msgstr "Herramientas"
 
-#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:167
+#: ../app/actions/actions.c:184 ../app/dialogs/dialogs.c:167
 #: ../app/pdb/internal_procs.c:176 ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "Rutas"
 
-#: ../app/actions/actions.c:186
+#: ../app/actions/actions.c:187
 msgid "View"
 msgstr "Vista"
 
@@ -526,7 +523,7 @@ msgstr "Duplicar canal"
 msgid "_Delete Channel"
 msgstr "_Borrar canal"
 
-#: ../app/actions/channels-actions.c:73 ../app/core/core-enums.c:1089
+#: ../app/actions/channels-actions.c:73 ../app/core/core-enums.c:1091
 msgid "Delete channel"
 msgstr "Borra el canal"
 
@@ -761,10 +758,10 @@ msgstr "Colores pre_definidos"
 msgid "S_wap Colors"
 msgstr "In_tercambiar los colores"
 
-#: ../app/actions/data-commands.c:79 ../app/core/gimpimage.c:1283
+#: ../app/actions/data-commands.c:79 ../app/core/gimpimage.c:1285
 #: ../app/core/gimppalette-import.c:219 ../app/core/gimppalette.c:523
 #: ../app/core/gimppalette.c:634 ../app/dialogs/palette-import-dialog.c:684
-#: ../app/pdb/image_cmds.c:3760
+#: ../app/pdb/image_cmds.c:3771
 msgid "Untitled"
 msgstr "Sin nombre"
 
@@ -1395,8 +1392,7 @@ msgstr "Ingrese el nombre para esta plantilla"
 
 #: ../app/actions/file-commands.c:291
 msgid "Revert failed. No file name associated with this image."
-msgstr ""
-"Falló al revertir. No hay un nombre de archivo asociado con esta imagen."
+msgstr "Falló al revertir. No hay un nombre de archivo asociado con esta imagen."
 
 #: ../app/actions/file-commands.c:303
 msgid "Revert Image"
@@ -1434,7 +1430,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"La reversión de «%s» ha fallado:\n"
+"Revertir a «%s» ha fallado:\n"
 "\n"
 "%s"
 
@@ -1815,7 +1811,7 @@ msgstr "Menú de imagen"
 
 #: ../app/actions/image-actions.c:58
 msgid "_Xtns"
-msgstr "E_xts"
+msgstr "_Exts"
 
 #: ../app/actions/image-actions.c:59
 msgid "_Image"
@@ -1964,7 +1960,7 @@ msgstr "_Capa"
 msgid "Stac_k"
 msgstr "_Pila"
 
-#: ../app/actions/layers-actions.c:54 ../app/tools/gimplevelstool.c:665
+#: ../app/actions/layers-actions.c:54 ../app/tools/gimplevelstool.c:669
 msgid "_Auto"
 msgstr "_Auto"
 
@@ -2024,7 +2020,7 @@ msgstr "Duplica la capa"
 msgid "_Delete Layer"
 msgstr "_Borrar la capa"
 
-#: ../app/actions/layers-actions.c:93 ../app/core/core-enums.c:1079
+#: ../app/actions/layers-actions.c:93 ../app/core/core-enums.c:1081
 msgid "Delete layer"
 msgstr "Borra la capa"
 
@@ -2471,8 +2467,7 @@ msgstr "Restablecer todos los filtros"
 
 #: ../app/actions/plug-in-commands.c:207
 msgid "Do you really want to reset all filters to default values?"
-msgstr ""
-"¿Realmente desea reiniciar todos los filtros con sus valores predeterminados?"
+msgstr "¿Realmente desea reiniciar todos los filtros con sus valores predeterminados?"
 
 #: ../app/actions/qmask-actions.c:42
 msgid "Quick Mask Menu"
@@ -2703,8 +2698,7 @@ msgstr "Borrar la plantilla"
 
 #: ../app/actions/templates-commands.c:243
 #, 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 "¿Está seguro de que quiere borrar «%s» de la lista y del disco?"
 
 #: ../app/actions/text-editor-actions.c:44
@@ -2715,7 +2709,7 @@ msgstr "Abrir"
 msgid "Load text from file"
 msgstr "Cargar texto desde un archivo"
 
-#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:350
+#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:353
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -2989,7 +2983,7 @@ msgstr "E_xportar ruta..."
 msgid "Path to Sele_ction"
 msgstr "Ruta a sele_cción"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1893
+#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1903
 msgid "Path to selection"
 msgstr "Ruta a selección"
 
@@ -3038,7 +3032,7 @@ msgstr "Opciones de ruta nueva"
 msgid "Path to Selection"
 msgstr "Ruta a selección"
 
-#: ../app/actions/vectors-commands.c:370 ../app/tools/gimpvectortool.c:1923
+#: ../app/actions/vectors-commands.c:370 ../app/tools/gimpvectortool.c:1933
 #: ../app/vectors/gimpvectors.c:237
 msgid "Stroke Path"
 msgstr "Trazar ruta"
@@ -3301,10 +3295,10 @@ msgid ""
 "using different filenames, restart the Gimp and check the location of the "
 "swap directory in your Preferences."
 msgstr ""
-"Imposible abrir el archivo de intercambio. El Gimp ha agotado toda la "
+"Imposible abrir el archivo de intercambio. GIMP ha agotado toda la "
 "memoria y no puede usar el archivo de intercambio. Algunas partes de sus "
 "imágenes pueden estar corrompidas. Intente guardar su trabajo usando nombres "
-"de archivo diferentes, reinicie El Gimp y compruebe la ubicación del "
+"de archivo diferentes, reinicie GIMP y compruebe la ubicación del "
 "directorio de intercambio en sus Preferencias."
 
 #: ../app/config/gimpconfig-deserialize.c:100
@@ -3452,11 +3446,11 @@ msgstr ""
 
 #: ../app/config/gimprc-blurbs.h:33
 msgid "Sets the pixel format of cursors the GIMP will use."
-msgstr "Establece el formato de píxel de los cursores que El Gimp usará."
+msgstr "Establece el formato de píxel de los cursores que GIMP usará."
 
 #: ../app/config/gimprc-blurbs.h:36
 msgid "Sets the mode of cursor the GIMP will use."
-msgstr "Definir el modo del cursor que utilizará El Gimp."
+msgstr "Definir el modo del cursor que utilizará GIMP."
 
 #: ../app/config/gimprc-blurbs.h:39
 msgid ""
@@ -3534,13 +3528,12 @@ msgstr ""
 
 #: ../app/config/gimprc-blurbs.h:157
 msgid "Sets the text to appear in image window titles."
-msgstr ""
-"Establece el texto que aparecerá en los títulos de las ventanas de imágenes."
+msgstr "Establece el texto que aparecerá en los títulos de las ventanas de imágenes."
 
 #: ../app/config/gimprc-blurbs.h:160
 msgid "When enabled, the GIMP will use a different info window per image view."
 msgstr ""
-"Cuando se encuentre activado El Gimp utilizará una ventana de información "
+"Cuando se encuentre activado GIMP utilizará una ventana de información "
 "diferente por cada vista de imagen."
 
 #: ../app/config/gimprc-blurbs.h:163
@@ -3552,15 +3545,13 @@ msgstr ""
 "después de abrirse, de otro modo será mostrada con una escala de 1:1."
 
 #: ../app/config/gimprc-blurbs.h:167
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
+msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
 msgstr ""
 "Instala un mapa de color privado; podría ser muy útil en las pantallas de 8 "
 "bits (256 colores)."
 
 #: ../app/config/gimprc-blurbs.h:170
-msgid ""
-"Sets the level of interpolation used for scaling and other transformations."
+msgid "Sets the level of interpolation used for scaling and other transformations."
 msgstr ""
 "Establece el nivel de interpolación utilizado para el redimensionado y otras "
 "transformaciones."
@@ -3584,12 +3575,12 @@ 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 ""
-"El Gimp advertirá al usuario si realiza un intento de crear una imagen que "
+"GIMP advertirá al usuario si realiza un intento de crear una imagen que "
 "podría requerir más memoria que el tamaño especificado aquí."
 
 #: ../app/config/gimprc-blurbs.h:185
 msgid "When enabled, GIMP will show mnemonics in menus."
-msgstr "Cuando se encuentre activado El Gimp mostrará mnemónicos en los menús."
+msgstr "Cuando se encuentre activado GIMP mostrará mnemónicos en los menús."
 
 #: ../app/config/gimprc-blurbs.h:188
 msgid ""
@@ -3597,7 +3588,7 @@ msgid ""
 "system colors allocated for the GIMP."
 msgstr ""
 "Generalmente sólo es importante para pantallas de 8 bits, esto define la "
-"cantidad mínima de colores del sistema reservados para El Gimp."
+"cantidad mínima de colores del sistema reservados para GIMP."
 
 #: ../app/config/gimprc-blurbs.h:199
 msgid ""
@@ -3642,8 +3633,8 @@ msgid ""
 "On multiprocessor machines, if GIMP has been compiled with --enable-mp this "
 "sets how many processors GIMP should use simultaneously."
 msgstr ""
-"En las máquinas con múltiples procesadores, si El Gimp ha sido compilado con "
-"«--enable-mp» esto define cuántos procesadores debería utilizar El Gimp "
+"En las máquinas con múltiples procesadores, si GIMP ha sido compilado con "
+"«--enable-mp» esto define cuántos procesadores debería utilizar GIMP "
 "simultáneamente."
 
 #: ../app/config/gimprc-blurbs.h:232
@@ -3666,7 +3657,7 @@ msgid ""
 "the layers and channels dialog are nice to have but they can slow things "
 "down when working with large images."
 msgstr ""
-"Establece si El Gimp debería crear vistas previas de las capas y los "
+"Establece si GIMP debería crear vistas previas de las capas y los "
 "canales. Es estupendo disponer de las vistas previas en el diálogo de capas "
 "y canales, pero pueden ralentizar el trabajo con imágenes grandes."
 
@@ -3699,15 +3690,14 @@ msgstr ""
 #: ../app/config/gimprc-blurbs.h:262
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr ""
-"Permitir a El Gimp intentar restaurar la última sesión guardada durante cada "
+"Permitir a GIMP intentar restaurar la última sesión guardada durante cada "
 "inicio."
 
 #: ../app/config/gimprc-blurbs.h:265
-msgid ""
-"Remember the current tool, pattern, color, and brush across GIMP sessions."
+msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr ""
 "Recordar la herramienta, el patrón, el color y las brochas actuales entre "
-"distintas sesiones de El Gimp."
+"distintas sesiones de GIMP."
 
 #: ../app/config/gimprc-blurbs.h:269
 msgid "Save the positions and sizes of the main dialogs when the GIMP exits."
@@ -3811,7 +3801,7 @@ msgstr ""
 
 #: ../app/config/gimprc-blurbs.h:320
 msgid "Enable to display a handy GIMP tip on startup."
-msgstr "Activa la visualización de un útil consejo de El Gimp al iniciar."
+msgstr "Activa la visualización de un útil consejo de GIMP al iniciar."
 
 #: ../app/config/gimprc-blurbs.h:323
 msgid "Enable to display tooltips."
@@ -3824,7 +3814,7 @@ msgid ""
 "to enable this setting."
 msgstr ""
 "Siempre hay un balance entre uso de memoria y velocidad. En la mayoría de "
-"los casos, El Gimp opta por la velocidad por encima de la memoria. Sin "
+"los casos, GIMP opta por la velocidad por encima de la memoria. Sin "
 "embargo, si la memoria es un gran problema intente activar esta opción."
 
 #: ../app/config/gimprc-blurbs.h:331
@@ -3836,11 +3826,11 @@ msgid ""
 "swap file is created on a directory that is mounted over NFS.  For these "
 "reasons, it may be desirable to put your swap file in \"/tmp\"."
 msgstr ""
-"Establece la localización del archivo de intercambio. El Gimp utiliza un "
+"Establece la localización del archivo de intercambio. GIMP utiliza un "
 "esquema de reserva de memoria basado en mosaicos. El archivo de intercambio "
 "se utiliza para intercambiar mosaicos rápida y fácilmente hacia y desde el "
 "disco. Tenga en cuenta que el archivo de intercambio puede volverse muy "
-"grande fácilmente si El Gimp es utilizado con imágenes grandes. También, las "
+"grande fácilmente si GIMP es utilizado con imágenes grandes. También, las "
 "cosas puede ponerse horriblemente lentas si el archivo de intercambio es "
 "creado en un directorio que está montado sobre NFS. Por estas razones quizá "
 "sea conveniente colocar su archivo de intercambio en «/tmp»."
@@ -3860,12 +3850,11 @@ msgstr ""
 
 #: ../app/config/gimprc-blurbs.h:347
 msgid "Save changed keyboard shortcuts when the GIMP exits."
-msgstr "Guardar las combinaciones de teclas modificadas al salir de El Gimp."
+msgstr "Guardar las combinaciones de teclas modificadas al salir de GIMP."
 
 #: ../app/config/gimprc-blurbs.h:350
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
-msgstr ""
-"Restaurar las combinaciones de teclas guardadas en cada inicio de El Gimp."
+msgstr "Restaurar las combinaciones de teclas guardadas en cada inicio de GIMP."
 
 # "si es", no "si sea". FVD
 #: ../app/config/gimprc-blurbs.h:353
@@ -3876,8 +3865,8 @@ msgid ""
 "one that is shared by other users."
 msgstr ""
 "Establece el directorio de almacenamiento temporal. Los archivos aparecerán "
-"aquí durante el curso de ejecución de El Gimp. La mayoría de los archivos "
-"desaparecerán cuando se salga de El Gimp, pero algunos archivos podrían "
+"aquí durante el curso de ejecución de GIMP. La mayoría de los archivos "
+"desaparecerán cuando se salga de GIMP, pero algunos archivos podrían "
 "quedar, por lo tanto es mejor si este directorio no es uno que se comparte "
 "con otros usuarios."
 
@@ -3887,7 +3876,7 @@ msgid ""
 "not create thumbnails if layer previews are disabled."
 msgstr ""
 "Establece el tamaño de las miniaturas que se muestran en el diálogo Abrir. "
-"Tenga en cuenta que El Gimp no puede crear miniaturas si las vistas previas "
+"Tenga en cuenta que GIMP no puede crear miniaturas si las vistas previas "
 "de capa están desactivadas."
 
 #: ../app/config/gimprc-blurbs.h:369
@@ -3907,11 +3896,11 @@ msgid ""
 "swap space, but will also cause the GIMP to use more memory. Conversely, a "
 "smaller cache size causes the GIMP to use more swap space and less memory."
 msgstr ""
-"El cache de mosaico es utilizado para asegurarse de que El Gimp no "
+"El cache de mosaico es utilizado para asegurarse de que GIMP no "
 "desperdicie mosaicos entre la memoria y el disco. Establecer este valor como "
-"alto hará que El Gimp utilice menos espacio de intercambio, pero también "
-"causa que El Gimp utilice más memoria. Normalmente, un tamaño de caché mas "
-"pequeño causa que El Gimp utilice más espacio de intercambio y menos memoria."
+"alto hará que GIMP utilice menos espacio de intercambio, pero también "
+"causa que GIMP utilice más memoria. Normalmente, un tamaño de caché mas "
+"pequeño causa que GIMP utilice más espacio de intercambio y menos memoria."
 
 #: ../app/config/gimprc-blurbs.h:384
 msgid ""
@@ -3928,15 +3917,14 @@ msgstr "Establece la forma en que se muestra la transparencia en las imágenes."
 
 #: ../app/config/gimprc-blurbs.h:391
 msgid "Sets the size of the checkerboard used to display transparency."
-msgstr ""
-"Establece el tamaño del cuadriculado utilizado para mostrar la transparencia."
+msgstr "Establece el tamaño del cuadriculado utilizado para mostrar la transparencia."
 
 #: ../app/config/gimprc-blurbs.h:394
 msgid ""
 "When enabled, the GIMP will not save if the image is unchanged since opening "
 "it."
 msgstr ""
-"Cuando se encuentre activado El Gimp no guardará la imagen si no fue "
+"Cuando se encuentre activado GIMP no guardará la imagen si no fue "
 "modificada desde que se la abrió."
 
 #: ../app/config/gimprc-blurbs.h:398
@@ -4351,251 +4339,251 @@ msgstr "Directa (tradicional)"
 msgid "Backward (corrective)"
 msgstr "Inversa (correctivo)"
 
-#: ../app/core/core-enums.c:1029
+#: ../app/core/core-enums.c:1030
 msgid "<>"
 msgstr "<>"
 
-#: ../app/core/core-enums.c:1030
+#: ../app/core/core-enums.c:1031
 msgid "Scale image"
 msgstr "Escalar la imagen"
 
-#: ../app/core/core-enums.c:1031
+#: ../app/core/core-enums.c:1032
 msgid "Resize image"
 msgstr "Redimensionar imagen"
 
-#: ../app/core/core-enums.c:1032
+#: ../app/core/core-enums.c:1033
 msgid "Flip image"
 msgstr "Voltear la imagen"
 
-#: ../app/core/core-enums.c:1033
+#: ../app/core/core-enums.c:1034
 msgid "Rotate image"
 msgstr "Rotar imagen"
 
-#: ../app/core/core-enums.c:1034
+#: ../app/core/core-enums.c:1035
 msgid "Crop image"
 msgstr "Recortar la imagen"
 
-#: ../app/core/core-enums.c:1035
+#: ../app/core/core-enums.c:1036
 msgid "Convert image"
 msgstr "Convertir la imagen"
 
-#: ../app/core/core-enums.c:1036
+#: ../app/core/core-enums.c:1037
+msgid "Remove item"
+msgstr "Quitar elemento"
+
+#: ../app/core/core-enums.c:1038
 msgid "Merge layers"
 msgstr "Combinar capas"
 
-#: ../app/core/core-enums.c:1037
+#: ../app/core/core-enums.c:1039
 msgid "Merge vectors"
 msgstr "Combinar los vectores"
 
-#: ../app/core/core-enums.c:1038 ../app/core/gimpchannel.c:383
-msgid "Quick Mask"
-msgstr "Máscara rápida"
-
-#: ../app/core/core-enums.c:1039 ../app/core/core-enums.c:1068
+#: ../app/core/core-enums.c:1041 ../app/core/core-enums.c:1070
 #: ../app/core/gimpimage-grid.c:59 ../app/dialogs/grid-dialog.c:144
 #: ../app/tools/tools-enums.c:175
 msgid "Grid"
 msgstr "Rejilla"
 
-#: ../app/core/core-enums.c:1040 ../app/core/core-enums.c:1069
+#: ../app/core/core-enums.c:1042 ../app/core/core-enums.c:1071
 msgid "Guide"
 msgstr "Guía"
 
-#: ../app/core/core-enums.c:1042 ../app/core/core-enums.c:1072
+#: ../app/core/core-enums.c:1044 ../app/core/core-enums.c:1074
 msgid "Drawable mod"
 msgstr "Mod dibujable"
 
-#: ../app/core/core-enums.c:1043 ../app/core/core-enums.c:1073
+#: ../app/core/core-enums.c:1045 ../app/core/core-enums.c:1075
 msgid "Selection mask"
 msgstr "Máscara de selección"
 
-#: ../app/core/core-enums.c:1044 ../app/core/core-enums.c:1076
+#: ../app/core/core-enums.c:1046 ../app/core/core-enums.c:1078
 msgid "Item visibility"
 msgstr "Visibilidad del elemento"
 
-#: ../app/core/core-enums.c:1045
+#: ../app/core/core-enums.c:1047
 msgid "Linked item"
 msgstr "Elemento enlazado"
 
-#: ../app/core/core-enums.c:1046
+#: ../app/core/core-enums.c:1048
 msgid "Item properties"
 msgstr "Propiedades del elemento"
 
-#: ../app/core/core-enums.c:1047 ../app/core/core-enums.c:1075
+#: ../app/core/core-enums.c:1049 ../app/core/core-enums.c:1077
 msgid "Move item"
 msgstr "Mover el elemento"
 
-#: ../app/core/core-enums.c:1048
+#: ../app/core/core-enums.c:1050
 msgid "Scale item"
 msgstr "Escalar elemento"
 
-#: ../app/core/core-enums.c:1049
+#: ../app/core/core-enums.c:1051
 msgid "Resize item"
 msgstr "Redimensionar elemento"
 
-#: ../app/core/core-enums.c:1050 ../app/core/core-enums.c:1080
+#: ../app/core/core-enums.c:1052 ../app/core/core-enums.c:1082
 msgid "Add layer mask"
 msgstr "Añadir máscara de capa"
 
-#: ../app/core/core-enums.c:1051
+#: ../app/core/core-enums.c:1053
 msgid "Apply layer mask"
 msgstr "Aplicar máscara de capa"
 
-#: ../app/core/core-enums.c:1052
+#: ../app/core/core-enums.c:1054
 msgid "Floating selection to layer"
 msgstr "Selección flotante a capa"
 
-#: ../app/core/core-enums.c:1053
+#: ../app/core/core-enums.c:1055
 msgid "Float selection"
 msgstr "Selección flotante"
 
 # Creo que es un verbo. FVD
-#: ../app/core/core-enums.c:1054
+#: ../app/core/core-enums.c:1056
 msgid "Anchor floating selection"
 msgstr "Anclar la selección flotante"
 
-#: ../app/core/core-enums.c:1055
+#: ../app/core/core-enums.c:1057
 msgid "Remove floating selection"
 msgstr "Eliminar la selección flotante"
 
-#: ../app/core/core-enums.c:1056 ../app/core/gimp-edit.c:267
+#: ../app/core/core-enums.c:1058 ../app/core/gimp-edit.c:270
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../app/core/core-enums.c:1057 ../app/core/gimp-edit.c:418
+#: ../app/core/core-enums.c:1059 ../app/core/gimp-edit.c:421
 msgid "Cut"
 msgstr "Cortar"
 
-#: ../app/core/core-enums.c:1058 ../app/core/core-enums.c:1086
+#: ../app/core/core-enums.c:1060 ../app/core/core-enums.c:1088
 #: ../app/tools/gimptexttool.c:144 ../app/widgets/widgets-enums.c:263
 msgid "Text"
 msgstr "Texto"
 
-#: ../app/core/core-enums.c:1059 ../app/core/core-enums.c:1099
+#: ../app/core/core-enums.c:1061 ../app/core/core-enums.c:1101
 #: ../app/core/gimpdrawable-transform.c:867
 msgid "Transform"
 msgstr "Transformar"
 
-#: ../app/core/core-enums.c:1060 ../app/core/core-enums.c:1100
+#: ../app/core/core-enums.c:1062 ../app/core/core-enums.c:1102
 #: ../app/paint/gimppaintcore.c:345
 msgid "Paint"
 msgstr "Pintar"
 
-#: ../app/core/core-enums.c:1061 ../app/core/core-enums.c:1102
+#: ../app/core/core-enums.c:1063 ../app/core/core-enums.c:1104
 msgid "Attach parasite"
 msgstr "Adjuntar parásito"
 
-#: ../app/core/core-enums.c:1062 ../app/core/core-enums.c:1103
+#: ../app/core/core-enums.c:1064 ../app/core/core-enums.c:1105
 msgid "Remove parasite"
 msgstr "Quitar parásito"
 
-#: ../app/core/core-enums.c:1063
+#: ../app/core/core-enums.c:1065
 msgid "Import paths"
 msgstr "Importar rutas"
 
-#: ../app/core/core-enums.c:1064 ../app/pdb/drawable_cmds.c:1693
+#: ../app/core/core-enums.c:1066 ../app/pdb/drawable_cmds.c:1693
 msgid "Plug-In"
 msgstr "Complemento"
 
-#: ../app/core/core-enums.c:1065
+#: ../app/core/core-enums.c:1067
 msgid "Image type"
 msgstr "Tipo de imagen"
 
-#: ../app/core/core-enums.c:1066
+#: ../app/core/core-enums.c:1068
 msgid "Image size"
 msgstr "Tamaño de la imagen"
 
-#: ../app/core/core-enums.c:1067
+#: ../app/core/core-enums.c:1069
 msgid "Resolution change"
 msgstr "Cambio de resolución"
 
-#: ../app/core/core-enums.c:1070
+#: ../app/core/core-enums.c:1072
 msgid "Change indexed palette"
 msgstr "Cambiar la paleta indexada"
 
-#: ../app/core/core-enums.c:1074
+#: ../app/core/core-enums.c:1076
 msgid "Rename item"
 msgstr "Renombrar elemento"
 
-#: ../app/core/core-enums.c:1077
+#: ../app/core/core-enums.c:1079
 msgid "Set item linked"
 msgstr "Definir el elemento como enlazado"
 
-#: ../app/core/core-enums.c:1078
+#: ../app/core/core-enums.c:1080
 msgid "New layer"
 msgstr "Capa nueva"
 
-#: ../app/core/core-enums.c:1081
+#: ../app/core/core-enums.c:1083
 msgid "Delete layer mask"
 msgstr "Borrar máscara de capa"
 
-#: ../app/core/core-enums.c:1082
+#: ../app/core/core-enums.c:1084
 msgid "Reposition layer"
 msgstr "Reposicionar la capa"
 
 # Es posible que aquí Mod sea una abreviatura de Modification. FVD
-#: ../app/core/core-enums.c:1083
+#: ../app/core/core-enums.c:1085
 msgid "Set layer mode"
 msgstr "Definir el modo de la capa"
 
-#: ../app/core/core-enums.c:1084
+#: ../app/core/core-enums.c:1086
 msgid "Set layer opacity"
 msgstr "Definir la opacidad de la capa"
 
-#: ../app/core/core-enums.c:1085
+#: ../app/core/core-enums.c:1087
 msgid "Set preserve trans"
 msgstr "Definir preservar trans"
 
-#: ../app/core/core-enums.c:1087
+#: ../app/core/core-enums.c:1089
 msgid "Text modified"
 msgstr "Texto modificado"
 
-#: ../app/core/core-enums.c:1088
+#: ../app/core/core-enums.c:1090
 msgid "New channel"
 msgstr "Nuevo canal"
 
-#: ../app/core/core-enums.c:1090
+#: ../app/core/core-enums.c:1092
 msgid "Reposition channel"
 msgstr "Reposicionar el canal"
 
-#: ../app/core/core-enums.c:1091
+#: ../app/core/core-enums.c:1093
 msgid "Channel color"
 msgstr "Color del canal"
 
-#: ../app/core/core-enums.c:1092
+#: ../app/core/core-enums.c:1094
 msgid "New vectors"
 msgstr "Vectores nuevos"
 
-#: ../app/core/core-enums.c:1093
+#: ../app/core/core-enums.c:1095
 msgid "Delete vectors"
 msgstr "Borrar vectores"
 
-#: ../app/core/core-enums.c:1094
+#: ../app/core/core-enums.c:1096
 msgid "Vectors mod"
 msgstr "Modif. vectores"
 
-#: ../app/core/core-enums.c:1095
+#: ../app/core/core-enums.c:1097
 msgid "Reposition vectors"
 msgstr "Reposicionar los vectores"
 
-#: ../app/core/core-enums.c:1096
+#: ../app/core/core-enums.c:1098
 msgid "FS to layer"
 msgstr "FS a capa"
 
-#: ../app/core/core-enums.c:1097
+#: ../app/core/core-enums.c:1099
 msgid "FS rigor"
 msgstr "FS riguroso"
 
-#: ../app/core/core-enums.c:1098
+#: ../app/core/core-enums.c:1100
 msgid "FS relax"
 msgstr "FS relajado"
 
-#: ../app/core/core-enums.c:1101 ../app/paint/gimpink.c:102
+#: ../app/core/core-enums.c:1103 ../app/paint/gimpink.c:103
 #: ../app/tools/gimpinktool.c:62
 msgid "Ink"
 msgstr "Tinta"
 
-#: ../app/core/core-enums.c:1104
+#: ../app/core/core-enums.c:1106
 msgid "EEK: can't undo"
 msgstr "¡AY!: No se puede deshacer"
 
@@ -4603,27 +4591,27 @@ msgstr "¡AY!: No se puede deshacer"
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "No se puede cortar o copiar porque la región seleccionada está vacía."
 
-#: ../app/core/gimp-edit.c:195 ../app/core/gimp-edit.c:319
+#: ../app/core/gimp-edit.c:198 ../app/core/gimp-edit.c:322
 msgid "Pasted Layer"
 msgstr "Capa pegada"
 
-#: ../app/core/gimp-edit.c:369
+#: ../app/core/gimp-edit.c:372
 msgid "Fill with FG Color"
 msgstr "Rellenar con el color de frente"
 
-#: ../app/core/gimp-edit.c:373 ../app/core/gimp-edit.c:394
+#: ../app/core/gimp-edit.c:376 ../app/core/gimp-edit.c:397
 msgid "Fill with BG Color"
 msgstr "Rellenar con el color de fondo"
 
-#: ../app/core/gimp-edit.c:377
+#: ../app/core/gimp-edit.c:380
 msgid "Fill with White"
 msgstr "Rellenar con blanco"
 
-#: ../app/core/gimp-edit.c:381
+#: ../app/core/gimp-edit.c:384
 msgid "Fill with Transparency"
 msgstr "Rellenar con transparencia"
 
-#: ../app/core/gimp-edit.c:385
+#: ../app/core/gimp-edit.c:388
 msgid "Fill with Pattern"
 msgstr "Rellenar con un patrón"
 
@@ -4642,7 +4630,7 @@ msgstr "Frente a transparente"
 
 #: ../app/core/gimp-gui.c:153
 msgid "GIMP"
-msgstr "El Gimp"
+msgstr "GIMP"
 
 #. register all internal procedures
 #: ../app/core/gimp.c:638
@@ -4702,8 +4690,7 @@ msgstr ""
 #: ../app/core/gimpbrush.c:609
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
-msgstr ""
-"Error fatal de análisis en el archivo de brocha «%s»: Versión desconocida %d."
+msgstr "Error fatal de análisis en el archivo de brocha «%s»: Versión desconocida %d."
 
 #: ../app/core/gimpbrush.c:625 ../app/core/gimpbrush.c:745
 #, c-format
@@ -4733,21 +4720,21 @@ msgid ""
 msgstr ""
 "Error fatal de análisis en el archivo de broca «%s»: Profundidad de brocha "
 "no soportada %d\n"
-"Las brochas de El Gimp deben ser GRAY (GRISES) o RGBA."
+"Las brochas de GIMP deben ser GRAY (GRISES) o RGBA."
 
 #: ../app/core/gimpbrushgenerated.c:614
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr ""
 "Error fatal de análisis: en el archivo de brocha «%s»: No es un archivo de "
-"brocha de de El Gimp."
+"brocha de de GIMP."
 
 #: ../app/core/gimpbrushgenerated.c:630
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version."
 msgstr ""
 "Error fatal de análisis en el archivo de brocha «%s»: Versión de brocha de "
-"El Gimp desconocida."
+"GIMP desconocida."
 
 #: ../app/core/gimpbrushgenerated.c:669
 #, c-format
@@ -4845,15 +4832,15 @@ msgstr "Achicar el canal"
 msgid "Cannot stroke empty channel."
 msgstr "No se puede trazar un canal vacío."
 
-#: ../app/core/gimpchannel.c:1527
+#: ../app/core/gimpchannel.c:1530
 msgid "Set Channel Color"
 msgstr "Definir el color del canal"
 
-#: ../app/core/gimpchannel.c:1575
+#: ../app/core/gimpchannel.c:1578
 msgid "Set Channel Opacity"
 msgstr "Definir la opacidad del canal"
 
-#: ../app/core/gimpchannel.c:1644 ../app/core/gimpselection.c:563
+#: ../app/core/gimpchannel.c:1647 ../app/core/gimpselection.c:563
 msgid "Selection Mask"
 msgstr "Máscara de selección"
 
@@ -4883,7 +4870,7 @@ msgstr "Selección borrosa"
 msgid "Select by Color"
 msgstr "Seleccionar por color"
 
-#: ../app/core/gimpdata.c:314
+#: ../app/core/gimpdata.c:320
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "No se ha podido borrar «%s»: %s"
@@ -4990,7 +4977,7 @@ msgstr "Nombre de variable ilegal en el archivo de ambiente %s: %s"
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 msgstr ""
 "Error fatal de análisis: en el archivo de degradados «%s»: No es un archivo "
-"de degradados de El Gimp."
+"de degradados de GIMP."
 
 #: ../app/core/gimpgradient-load.c:87
 #, c-format
@@ -5035,8 +5022,7 @@ msgid "The foreground color of the grid."
 msgstr "El color de frente de la rejilla."
 
 #: ../app/core/gimpgrid.c:139
-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 ""
 "El color de fondo de la rejilla, sólo se utiliza en el estilo de línea de "
 "guiones dobles."
@@ -5050,8 +5036,7 @@ msgid "Vertical spacing of grid lines."
 msgstr "Espacio vertical de las líneas de la rejilla."
 
 #: ../app/core/gimpgrid.c:159
-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 ""
 "Deslizamiento horizontal de la primera línea de la rejilla, puede ser un "
 "número negativo."
@@ -5094,11 +5079,11 @@ msgstr "Convertir a indexados (paso 2)..."
 msgid "Converting to indexed (stage 3)..."
 msgstr "Convertir la imagen a indexados (paso 3)"
 
-#: ../app/core/gimpimage-crop.c:123
+#: ../app/core/gimpimage-crop.c:124
 msgid "Crop Image"
 msgstr "Recortar la imagen"
 
-#: ../app/core/gimpimage-crop.c:126 ../app/core/gimpimage-resize.c:67
+#: ../app/core/gimpimage-crop.c:127 ../app/core/gimpimage-resize.c:67
 msgid "Resize Image"
 msgstr "Redimensionar la imagen"
 
@@ -5163,148 +5148,148 @@ msgstr "Desactivar la máscara rápida"
 msgid "Can't undo %s"
 msgstr "No se puede deshacer %s"
 
-#: ../app/core/gimpimage.c:1357
+#: ../app/core/gimpimage.c:1359
 msgid "Change Image Resolution"
 msgstr "Cambiar la resolución de la imagen"
 
-#: ../app/core/gimpimage.c:1397
+#: ../app/core/gimpimage.c:1399
 msgid "Change Image Unit"
 msgstr "Cambiar la unidad de medida"
 
-#: ../app/core/gimpimage.c:2177
+#: ../app/core/gimpimage.c:2179
 msgid "Attach Parasite to Image"
 msgstr "Adjuntar parásito a la imagen"
 
-#: ../app/core/gimpimage.c:2210
+#: ../app/core/gimpimage.c:2212
 msgid "Remove Parasite from Image"
 msgstr "Quitar el parásito de la imagen"
 
-#: ../app/core/gimpimage.c:2678
+#: ../app/core/gimpimage.c:2680
 msgid "Add Layer"
 msgstr "Añadir una capa"
 
-#: ../app/core/gimpimage.c:2745
+#: ../app/core/gimpimage.c:2744 ../app/core/gimpimage.c:2757
 msgid "Remove Layer"
 msgstr "Quitar una capa"
 
-#: ../app/core/gimpimage.c:2816
+#: ../app/core/gimpimage.c:2831
 msgid "Layer cannot be raised higher."
 msgstr "La capa no puede ser elevada más alto."
 
-#: ../app/core/gimpimage.c:2822 ../app/core/gimpimage.c:2872
+#: ../app/core/gimpimage.c:2837 ../app/core/gimpimage.c:2887
 msgid "Cannot raise a layer without alpha."
 msgstr "No se puede elevar una capa sin alfa."
 
-#: ../app/core/gimpimage.c:2827
+#: ../app/core/gimpimage.c:2842
 msgid "Raise Layer"
 msgstr "Elevar la capa"
 
-#: ../app/core/gimpimage.c:2844
+#: ../app/core/gimpimage.c:2859
 msgid "Layer cannot be lowered more."
 msgstr "La capa no puede bajarse más."
 
-#: ../app/core/gimpimage.c:2849
+#: ../app/core/gimpimage.c:2864
 msgid "Lower Layer"
 msgstr "Bajar la capa"
 
-#: ../app/core/gimpimage.c:2866
+#: ../app/core/gimpimage.c:2881
 msgid "Layer is already on top."
 msgstr "La capa ya se encuentra en lo más alto."
 
-#: ../app/core/gimpimage.c:2877
+#: ../app/core/gimpimage.c:2892
 msgid "Raise Layer to Top"
 msgstr "Elevar la capa hasta lo más alto"
 
-#: ../app/core/gimpimage.c:2897
+#: ../app/core/gimpimage.c:2912
 msgid "Layer is already on the bottom."
 msgstr "La capa ya se encuentra en la parte más baja."
 
-#: ../app/core/gimpimage.c:2902
+#: ../app/core/gimpimage.c:2917
 msgid "Lower Layer to Bottom"
 msgstr "Bajar la capa hasta la parte más baja"
 
-#: ../app/core/gimpimage.c:2941
+#: ../app/core/gimpimage.c:2956
 #, c-format
 msgid "Layer '%s' has no alpha. Layer was placed above it."
 msgstr "La capa «%s» no tiene alfa. La capa fue colocada encima de ésta."
 
-#: ../app/core/gimpimage.c:2993
+#: ../app/core/gimpimage.c:3008
 msgid "Add Channel"
 msgstr "Añadir un canal"
 
-#: ../app/core/gimpimage.c:3038
+#: ../app/core/gimpimage.c:3052 ../app/core/gimpimage.c:3063
 msgid "Remove Channel"
 msgstr "Quitar el canal"
 
-#: ../app/core/gimpimage.c:3082
+#: ../app/core/gimpimage.c:3110
 msgid "Channel cannot be raised higher."
 msgstr "El canal no puede ser elevado más alto."
 
-#: ../app/core/gimpimage.c:3087
+#: ../app/core/gimpimage.c:3115
 msgid "Raise Channel"
 msgstr "Elevar el canal"
 
-#: ../app/core/gimpimage.c:3104
+#: ../app/core/gimpimage.c:3132
 msgid "Channel is already on top."
 msgstr "El canal ya está en la cima."
 
-#: ../app/core/gimpimage.c:3109
+#: ../app/core/gimpimage.c:3137
 msgid "Raise Channel to Top"
 msgstr "Elevar el canal hasta lo alto"
 
-#: ../app/core/gimpimage.c:3126
+#: ../app/core/gimpimage.c:3154
 msgid "Channel cannot be lowered more."
 msgstr "El canal no puede descender más."
 
-#: ../app/core/gimpimage.c:3131
+#: ../app/core/gimpimage.c:3159
 msgid "Lower Channel"
 msgstr "Bajar el canal"
 
-#: ../app/core/gimpimage.c:3151
+#: ../app/core/gimpimage.c:3179
 msgid "Channel is already on the bottom."
 msgstr "El canal ya está en el fondo."
 
-#: ../app/core/gimpimage.c:3156
+#: ../app/core/gimpimage.c:3184
 msgid "Lower Channel to Bottom"
 msgstr "Bajar el canal hasta lo más bajo"
 
-#: ../app/core/gimpimage.c:3231
+#: ../app/core/gimpimage.c:3259
 msgid "Add Path"
 msgstr "Añadir una ruta"
 
-#: ../app/core/gimpimage.c:3276
+#: ../app/core/gimpimage.c:3304
 msgid "Remove Path"
 msgstr "Quitar la ruta"
 
-#: ../app/core/gimpimage.c:3320
+#: ../app/core/gimpimage.c:3348
 msgid "Path cannot be raised higher."
 msgstr "La ruta no puede ser elevada más alto."
 
-#: ../app/core/gimpimage.c:3325
+#: ../app/core/gimpimage.c:3353
 msgid "Raise Path"
 msgstr "Elevar la ruta"
 
-#: ../app/core/gimpimage.c:3342
+#: ../app/core/gimpimage.c:3370
 msgid "Path is already on top."
 msgstr "La ruta ya está en la cima."
 
-#: ../app/core/gimpimage.c:3347
+#: ../app/core/gimpimage.c:3375
 msgid "Raise Path to Top"
 msgstr "Elevar la ruta hasta el principio"
 
-#: ../app/core/gimpimage.c:3364
+#: ../app/core/gimpimage.c:3392
 msgid "Path cannot be lowered more."
 msgstr "La ruta no puede descender más."
 
-#: ../app/core/gimpimage.c:3369
+#: ../app/core/gimpimage.c:3397
 msgid "Lower Path"
 msgstr "Bajar la ruta"
 
-#: ../app/core/gimpimage.c:3389
+#: ../app/core/gimpimage.c:3417
 msgid "Path is already on the bottom."
 msgstr "La ruta ya está en el fondo."
 
-#: ../app/core/gimpimage.c:3394
+#: ../app/core/gimpimage.c:3422
 msgid "Lower Path to Bottom"
 msgstr "Bajar la ruta hasta el fondo"
 
@@ -5353,7 +5338,7 @@ msgstr "1 capa"
 msgid "%d Layers"
 msgstr "%d capas"
 
-#: ../app/core/gimpimagefile.c:682
+#: ../app/core/gimpimagefile.c:685
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "No se ha podido abrir la miniatura «%s»: %s"
@@ -5437,8 +5422,7 @@ msgstr ""
 
 #: ../app/core/gimplayer.c:1035
 msgid "Cannot add layer mask to layer which is not part of an image."
-msgstr ""
-"No se puede añadir una máscara a la capa dado que no es parte de una imagen."
+msgstr "No se puede añadir una máscara a la capa dado que no es parte de una imagen."
 
 #: ../app/core/gimplayer.c:1042
 msgid "Unable to add a layer mask since the layer already has one."
@@ -5478,7 +5462,7 @@ msgstr "Capa a tamaño de imagen"
 msgid "Move Layer Mask"
 msgstr "Mover la mascara de la capa"
 
-#: ../app/core/gimppalette-import.c:490
+#: ../app/core/gimppalette-import.c:493
 #, c-format
 msgid ""
 "Unknown type of palette file:\n"
@@ -5530,26 +5514,22 @@ msgstr ""
 #: ../app/core/gimppalette.c:484
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
-msgstr ""
-"Leyendo el archivo de paleta «%s»: Falta la componente ROJO en la línea %d."
+msgstr "Leyendo el archivo de paleta «%s»: Falta la componente ROJO en la línea %d."
 
 #: ../app/core/gimppalette.c:492
 #, c-format
 msgid "Reading palette '%s': Missing GREEN component in line %d."
-msgstr ""
-"Leyendo el archivo de paleta «%s»: Falta la componente VERDE en la línea %d."
+msgstr "Leyendo el archivo de paleta «%s»: Falta la componente VERDE en la línea %d."
 
 #: ../app/core/gimppalette.c:500
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
-msgstr ""
-"Leyendo el archivo de paleta «%s»: Falta la componente AZUL en la línea %d."
+msgstr "Leyendo el archivo de paleta «%s»: Falta la componente AZUL en la línea %d."
 
 #: ../app/core/gimppalette.c:510
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
-msgstr ""
-"Leyendo el archivo de paleta «%s»: Valor RGB fuera de rango en la línea %d."
+msgstr "Leyendo el archivo de paleta «%s»: Valor RGB fuera de rango en la línea %d."
 
 #: ../app/core/gimppattern.c:337 ../app/core/gimppattern.c:384
 #: ../app/core/gimppattern.c:415
@@ -5561,8 +5541,7 @@ msgstr ""
 
 #: ../app/core/gimppattern.c:357
 #, 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 ""
 "Error de análisis fatal en el archivo de patrón «%s»: Versión del formato de "
 "patrón desconocida %d."
@@ -5575,7 +5554,7 @@ msgid ""
 msgstr ""
 "Error de análisis fatal en el archivo de patrón «%s»: Profundidad del patrón "
 "no soportada %d.\n"
-"Los patrones de El Gimp deben ser GRAY o RGB."
+"Los patrones de GIMP deben ser GRAY o RGB."
 
 #: ../app/core/gimppattern.c:393
 #, c-format
@@ -5722,7 +5701,7 @@ msgstr "Contribuciones"
 
 #: ../app/dialogs/about-dialog.c:153
 msgid "About The GIMP"
-msgstr "Acerca de El Gimp"
+msgstr "Acerca de GIMP"
 
 #: ../app/dialogs/channel-options-dialog.c:138
 msgid "Channel Name:"
@@ -5765,13 +5744,13 @@ msgstr "Activar difuminado de _transparencia"
 msgid "Converting to indexed..."
 msgstr "Convertir a indexado..."
 
-#: ../app/dialogs/convert-dialog.c:382
+#: ../app/dialogs/convert-dialog.c:384
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "No se puede convertir a una paleta con más de 256 colores."
 
 #: ../app/dialogs/dialogs-constructors.c:164 ../app/gui/gui.c:161
 msgid "GIMP Message"
-msgstr "Mensaje de El Gimp"
+msgstr "Mensaje de GIMP"
 
 #: ../app/dialogs/dialogs.c:127
 msgid "Devices"
@@ -6311,8 +6290,7 @@ msgstr "Vista previa"
 
 #: ../app/dialogs/preferences-dialog.c:294
 msgid "You will have to restart GIMP for the following changes to take effect:"
-msgstr ""
-"Necesitará reiniciar El Gimp para que los siguientes cambios tengan efecto:"
+msgstr "Necesitará reiniciar GIMP para que los siguientes cambios tengan efecto:"
 
 #: ../app/dialogs/preferences-dialog.c:501
 msgid "Configure Keyboard Shortcuts"
@@ -6332,7 +6310,7 @@ msgid ""
 "start GIMP."
 msgstr ""
 "Sus combinaciones de teclas serán restablecidas a los valores de fábrica la "
-"próxima vez que inicie Gimp."
+"próxima vez que inicie GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:629
 msgid ""
@@ -6340,7 +6318,7 @@ msgid ""
 "GIMP."
 msgstr ""
 "Su configuración de ventanas se restablecerá al valor de fábrica la próxima "
-"vez que inicie el Gimp."
+"vez que inicie el GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:663
 msgid ""
@@ -6348,7 +6326,7 @@ msgid ""
 "start GIMP."
 msgstr ""
 "Su configuración de dispositivos de entrada se restablecerá a los valores de "
-"fábrica la siguiente vez que inicie el Gimp."
+"fábrica la siguiente vez que inicie el GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:1082
 msgid "Show _menubar"
@@ -6792,8 +6770,7 @@ msgstr "Guardar las posiciones de las ventanas _ahora"
 
 #: ../app/dialogs/preferences-dialog.c:2163
 msgid "_Reset Saved Window Positions to Default Values"
-msgstr ""
-"R_estaurar la posiciones de ventana guardadas a los valores predeterminados"
+msgstr "R_estaurar la posiciones de ventana guardadas a los valores predeterminados"
 
 #: ../app/dialogs/preferences-dialog.c:2178
 #: ../app/dialogs/preferences-dialog.c:2181
@@ -6861,7 +6838,7 @@ msgid "Select Temp Folder"
 msgstr "Seleccionar las carpetas de temas"
 
 #: ../app/dialogs/preferences-dialog.c:2264
-#: ../app/dialogs/user-install-dialog.c:1403
+#: ../app/dialogs/user-install-dialog.c:1401
 msgid "Swap folder:"
 msgstr "Carpeta de intercambio:"
 
@@ -6991,11 +6968,11 @@ msgstr "píxeles/%a"
 
 #: ../app/dialogs/quit-dialog.c:84
 msgid "Quit The GIMP"
-msgstr "Salir de El Gimp"
+msgstr "Salir de GIMP"
 
 #: ../app/dialogs/quit-dialog.c:126
 msgid "If you quit GIMP now, these changes will be lost."
-msgstr "Si sale de Gimp ahora, estos cambios se perderán."
+msgstr "Si sale de GIMP ahora, estos cambios se perderán."
 
 #: ../app/dialogs/quit-dialog.c:164
 msgid "There is one image with unsaved changes:"
@@ -7070,20 +7047,19 @@ msgstr "¡El archivo de consejos de GIMP para estar perdido!"
 #: ../app/dialogs/tips-dialog.c:92
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
-msgstr ""
-"Debería haber un archivo llamado «%s». Por favor compruebe su instalación."
+msgstr "Debería haber un archivo llamado «%s». Por favor compruebe su instalación."
 
 #: ../app/dialogs/tips-dialog.c:98
 msgid "The GIMP tips file could not be parsed!"
-msgstr "¡El archivo de consejos de El Gimp no ha podido ser analizado!"
+msgstr "¡El archivo de consejos de GIMP no ha podido ser analizado!"
 
 #: ../app/dialogs/tips-dialog.c:131
 msgid "GIMP Tip of the Day"
-msgstr "Consejo del día de El Gimp"
+msgstr "Consejo del día de GIMP"
 
 #: ../app/dialogs/tips-dialog.c:195
 msgid "Show tip next time GIMP starts"
-msgstr "Mostrar un consejo la próxima vez que inicie El Gimp"
+msgstr "Mostrar un consejo la próxima vez que inicie GIMP"
 
 #: ../app/dialogs/tips-dialog.c:219
 msgid "_Previous tip"
@@ -7109,7 +7085,7 @@ msgid ""
 "ins and modules can also configured here."
 msgstr ""
 "«gimprc» se utiliza para almacenar las preferencias personales que afectan "
-"al comportamiento predeterminado de El Gimp. Las rutas de búsqueda para las "
+"al comportamiento predeterminado de GIMP. Las rutas de búsqueda para las "
 "brochas, paletas, degradados, patrones, complementos y módulos también "
 "pueden configurarse aquí."
 
@@ -7118,7 +7094,7 @@ msgid ""
 "GIMP uses an additional gtkrc file so you can configure it to look "
 "differently than other GTK apps."
 msgstr ""
-"El Gimp usa un archivo «gtkrc» adicional de modo que pueda ponerle un "
+"GIMP usa un archivo «gtkrc» adicional de modo que pueda ponerle un "
 "aspecto diferente al resto de programas GTK."
 
 #: ../app/dialogs/user-install-dialog.c:149
@@ -7131,8 +7107,8 @@ msgstr ""
 "Los complementos y los añadidos son programas externos ejecutados por El "
 "GIMP que proporcionan funcionalidades adicionales. Estos programas se buscan "
 "en tiempo de ejecución, y se almacena la información acerca de su función y "
-"fechas de modificación en este archivo para conseguir un inicio de El Gimp "
-"más rápido. Este archivo sólo debe ser leído por El Gimp, y no debe ser "
+"fechas de modificación en este archivo para conseguir un inicio de GIMP "
+"más rápido. Este archivo sólo debe ser leído por GIMP, y no debe ser "
 "editado."
 
 #: ../app/dialogs/user-install-dialog.c:159
@@ -7145,7 +7121,7 @@ msgstr ""
 "Las combinaciones de teclas pueden ser redefinidas de forma dinámica en El "
 "GIMP. «menurc» es un volcado de su configuración para que pueda ser "
 "recordada en la próxima sesión. Puede editar este archivo si lo desea, pero "
-"es mucho más fácil definir las teclas desde El Gimp. Si borra este archivo "
+"es mucho más fácil definir las teclas desde GIMP. Si borra este archivo "
 "se restaurarán las combinaciones de teclas predefinidas."
 
 #: ../app/dialogs/user-install-dialog.c:169
@@ -7155,7 +7131,7 @@ msgid ""
 "the saved position."
 msgstr ""
 "«sessionrc» se utiliza para almacenar qué ventanas de diálogo estaban "
-"abiertas la última vez que salió de El Gimp. Puede configurar El Gimp para "
+"abiertas la última vez que salió de GIMP. Puede configurar GIMP para "
 "reabrir esos diálogos en la posición guardada."
 
 #: ../app/dialogs/user-install-dialog.c:176
@@ -7176,7 +7152,7 @@ msgstr ""
 "«unitrc» se utiliza para almacenar su base de datos de unidades. Puede "
 "definir unidades adicionales y usarlas tal como usa las unidades "
 "predefinidas: pulgadas, milímetros, puntos y picas. Este archivo se "
-"sobreescribe cada vez que sale de El Gimp."
+"sobreescribe cada vez que sale de GIMP."
 
 #: ../app/dialogs/user-install-dialog.c:191
 msgid ""
@@ -7185,7 +7161,7 @@ msgid ""
 "searching for brushes."
 msgstr ""
 "Esta carpeta se utiliza para almacenar las brochas definidas por el usuario. "
-"El Gimp revisa esta carpeta además de la instalación global de brochas de El "
+"GIMP revisa esta carpeta además de la instalación global de brochas de El "
 "GIMP cuando está buscando brochas."
 
 #: ../app/dialogs/user-install-dialog.c:199
@@ -7196,10 +7172,10 @@ msgid ""
 "have GIMP-only fonts, otherwise put things in your global font directory."
 msgstr ""
 "Esta carpeta se utiliza para almacenar las tipografías que desea que sean "
-"visibles sólo en El Gimp. El Gimp revisa esta carpeta además de la carpeta "
+"visibles sólo en GIMP. GIMP revisa esta carpeta además de la carpeta "
 "global del sistema de la instalación de tipografías cuando está buscando "
 "tipografías. Sólo utilice esta carpeta si realmente quiere tener tipografías "
-"exclusivas para El Gimp, de otro modo póngalas en su directorio de "
+"exclusivas para GIMP, de otro modo póngalas en su directorio de "
 "tipografías global."
 
 #: ../app/dialogs/user-install-dialog.c:209
@@ -7209,8 +7185,8 @@ msgid ""
 "searching for gradients."
 msgstr ""
 "Esta carpeta se utiliza para almacenar los degradados definidos por el "
-"usuario. El Gimp revisa esta carpeta junto con la instalación global de "
-"degradados de El Gimp cuando está buscando degradados."
+"usuario. GIMP revisa esta carpeta junto con la instalación global de "
+"degradados de GIMP cuando está buscando degradados."
 
 #: ../app/dialogs/user-install-dialog.c:216
 msgid ""
@@ -7219,7 +7195,7 @@ msgid ""
 "searching for palettes."
 msgstr ""
 "Esta carpeta se utiliza para almacenar las paletas definidas por el usuario. "
-"El Gimp revisa esta carpeta junto con la instalación global de paletas de El "
+"GIMP revisa esta carpeta junto con la instalación global de paletas de El "
 "GIMP cuando está buscando paletas."
 
 #: ../app/dialogs/user-install-dialog.c:223
@@ -7229,8 +7205,8 @@ msgid ""
 "searching for patterns."
 msgstr ""
 "Esta carpeta se utiliza para almacenar los patrones definidos por el "
-"usuario. El Gimp revisa esta carpeta junto con la instalación global de "
-"patrones de El Gimp cuando está buscando patrones."
+"usuario. GIMP revisa esta carpeta junto con la instalación global de "
+"patrones de GIMP cuando está buscando patrones."
 
 #: ../app/dialogs/user-install-dialog.c:230
 msgid ""
@@ -7239,8 +7215,8 @@ msgid ""
 "system-wide GIMP plug-in folder when searching for plug-ins."
 msgstr ""
 "Esta carpeta se utiliza para almacenar los complementos temporales o no "
-"soportadas por el sistema, creadas por el usuario. El Gimp revisa esta "
-"carpeta junto con la carpeta global de complementos de El Gimp cuando está "
+"soportadas por el sistema, creadas por el usuario. GIMP revisa esta "
+"carpeta junto con la carpeta global de complementos de GIMP cuando está "
 "buscando complementos."
 
 #: ../app/dialogs/user-install-dialog.c:238
@@ -7251,8 +7227,8 @@ msgid ""
 "initialization."
 msgstr ""
 "Esta carpeta se utiliza para almacenar los módulos DLL temporales o no "
-"soportados por el sistema creados por el usuario. El Gimp revisa esta "
-"carpeta junto con la carpeta global de módulos de El Gimp cuando está "
+"soportados por el sistema creados por el usuario. GIMP revisa esta "
+"carpeta junto con la carpeta global de módulos de GIMP cuando está "
 "buscando los módulos que se cargan durante el inicio."
 
 #: ../app/dialogs/user-install-dialog.c:247
@@ -7264,7 +7240,7 @@ msgid ""
 msgstr ""
 "Esta carpeta se utiliza para almacenar las adiciones al entorno de "
 "complementos, creadas por el usuario, temporales o no soportadas por el "
-"sistema. El Gimp revisa esta carpeta además de la carpeta global de entorno "
+"sistema. GIMP revisa esta carpeta además de la carpeta global de entorno "
 "del sistema cuando está buscando archivos de modificación del entorno de "
 "complementos."
 
@@ -7275,8 +7251,8 @@ msgid ""
 "searching for scripts."
 msgstr ""
 "Esta carpeta se utiliza para almacenar los guiones creados e instalados por "
-"el usuario. El Gimp revisa esta carpeta junto con la carpeta global de "
-"guiones de El Gimp cuando está buscando guiones."
+"el usuario. GIMP revisa esta carpeta junto con la carpeta global de "
+"guiones de GIMP cuando está buscando guiones."
 
 #: ../app/dialogs/user-install-dialog.c:265
 msgid "This folder is searched for image templates."
@@ -7296,9 +7272,9 @@ msgid ""
 "sessions and can be destroyed with impunity."
 msgstr ""
 "Esta carpeta se utiliza para almacenar temporalmente los búferes de deshacer "
-"para reducir el uso de memoria.  Si El Gimp  se cierra de forma anormal los "
+"para reducir el uso de memoria.  Si GIMP  se cierra de forma anormal los "
 "archivos del tipo gimp<#>.<#> pueden quedar guardados en esta carpeta.  "
-"Estos archivos son inútiles en distintas sesiones de El Gimp y pueden ser "
+"Estos archivos son inútiles en distintas sesiones de GIMP y pueden ser "
 "destruidos sin problemas."
 
 #: ../app/dialogs/user-install-dialog.c:284
@@ -7329,7 +7305,7 @@ msgstr ""
 
 #: ../app/dialogs/user-install-dialog.c:609
 msgid "GIMP User Installation"
-msgstr "Instalación de usuario de El Gimp"
+msgstr "Instalación de usuario de GIMP"
 
 #: ../app/dialogs/user-install-dialog.c:614
 msgid "Continue"
@@ -7337,31 +7313,30 @@ msgstr "Continuar"
 
 #. GPL_PAGE
 #. version number
-#: ../app/dialogs/user-install-dialog.c:765
+#: ../app/dialogs/user-install-dialog.c:763
 #, c-format
 msgid ""
 "Welcome to\n"
 "The GIMP %d.%d User Installation"
 msgstr ""
 "Bienvenido a\n"
-"la instalación de usuario de El Gimp %d.%d"
+"la instalación de usuario de GIMP %d.%d"
 
-#: ../app/dialogs/user-install-dialog.c:771
+#: ../app/dialogs/user-install-dialog.c:769
 msgid "Click \"Continue\" to enter the GIMP user installation."
-msgstr ""
-"Pulse en «Continuar» para iniciar la instalación de usuario de El Gimp."
+msgstr "Pulse en «Continuar» para iniciar la instalación de usuario de GIMP."
 
-#: ../app/dialogs/user-install-dialog.c:778
+#: ../app/dialogs/user-install-dialog.c:776
 msgid ""
 "The GIMP - GNU Image Manipulation Program\n"
 "Copyright (C) 1995-2004\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team."
 msgstr ""
-"El Gimp - Programa de manipulación de imágenes GNU\n"
+"GIMP - Programa de manipulación de imágenes GNU\n"
 "Copyright © 1995-2004\n"
-"Spencer Kimball, Peter Mattis y el equipo de desarrollo de El Gimp."
+"Spencer Kimball, Peter Mattis y el equipo de desarrollo de GIMP."
 
-#: ../app/dialogs/user-install-dialog.c:788
+#: ../app/dialogs/user-install-dialog.c:786
 msgid ""
 "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 the Free "
@@ -7373,7 +7348,7 @@ msgstr ""
 "Free Software Foundation; tanto en la versión 2 de la licencia, o (a su "
 "elección) cualquier versión posterior."
 
-#: ../app/dialogs/user-install-dialog.c:794
+#: ../app/dialogs/user-install-dialog.c:792
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -7385,7 +7360,7 @@ msgstr ""
 "garantizar la CONVENIENCIA PARA UN PROPÓSITO PARTICULAR. Véase la Licencia "
 "Pública General de GNU para más detalles."
 
-#: ../app/dialogs/user-install-dialog.c:800
+#: ../app/dialogs/user-install-dialog.c:798
 msgid ""
 "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., 59 Temple "
@@ -7395,44 +7370,44 @@ msgstr ""
 "junto con este programa. Si no ha sido así escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA."
 
-#: ../app/dialogs/user-install-dialog.c:810
+#: ../app/dialogs/user-install-dialog.c:808
 msgid "Migrate User Settings"
 msgstr "Migrar configuración de usuario"
 
-#: ../app/dialogs/user-install-dialog.c:811
+#: ../app/dialogs/user-install-dialog.c:809
 msgid "Click \"Continue\" to proceed with the user installation."
 msgstr "Pulse «Continuar» para proceder con la instalación de usuario."
 
-#: ../app/dialogs/user-install-dialog.c:816
+#: ../app/dialogs/user-install-dialog.c:814
 msgid "It seems you have used GIMP 2.0 before."
-msgstr "Parece que ha usado El Gimp 2.0 antes."
+msgstr "Parece que ha usado GIMP 2.0 antes."
 
-#: ../app/dialogs/user-install-dialog.c:820
+#: ../app/dialogs/user-install-dialog.c:818
 msgid "_Migrate GIMP 2.0 user settings"
-msgstr "_Migrar la configuración de usuario de El Gimp 2.0"
+msgstr "_Migrar la configuración de usuario de GIMP 2.0"
 
-#: ../app/dialogs/user-install-dialog.c:823
+#: ../app/dialogs/user-install-dialog.c:821
 msgid "Do a _fresh user installation"
 msgstr "Hacer una instalación de usuario _fresca"
 
-#: ../app/dialogs/user-install-dialog.c:851
+#: ../app/dialogs/user-install-dialog.c:849
 msgid "Personal GIMP Folder"
-msgstr "Carpeta personal de El Gimp"
+msgstr "Carpeta personal de GIMP"
 
-#: ../app/dialogs/user-install-dialog.c:852
+#: ../app/dialogs/user-install-dialog.c:850
 msgid "Click \"Continue\" to create your personal GIMP folder."
-msgstr "Pulse en «Continuar» para crear su carpeta personal de El Gimp."
+msgstr "Pulse en «Continuar» para crear su carpeta personal de GIMP."
 
-#: ../app/dialogs/user-install-dialog.c:896
+#: ../app/dialogs/user-install-dialog.c:894
 #, c-format
 msgid ""
 "For a proper GIMP installation, a folder named '%s' needs to be "
 "created."
 msgstr ""
-"Para una instalación correcta de El Gimp es necesario crear una carpeta "
+"Para una instalación correcta de GIMP es necesario crear una carpeta "
 "llamada «%s»."
 
-#: ../app/dialogs/user-install-dialog.c:903
+#: ../app/dialogs/user-install-dialog.c:901
 msgid ""
 "This folder will contain a number of important files.  Click on one of the "
 "files or folders in the tree to get more information about the selected item."
@@ -7441,60 +7416,59 @@ msgstr ""
 "los archivos o subdirectorios en el árbol para obtener más información "
 "acerca del elemento seleccionado."
 
-#: ../app/dialogs/user-install-dialog.c:991
+#: ../app/dialogs/user-install-dialog.c:989
 msgid "User Installation Log"
 msgstr "Informe de la instalación de usuario"
 
-#: ../app/dialogs/user-install-dialog.c:992
+#: ../app/dialogs/user-install-dialog.c:990
 msgid "Please wait while your personal GIMP folder is being created..."
-msgstr "Aguarde mientras se crea su carpeta personal de El Gimp..."
+msgstr "Aguarde mientras se crea su carpeta personal de GIMP..."
 
-#: ../app/dialogs/user-install-dialog.c:999
+#: ../app/dialogs/user-install-dialog.c:997
 msgid "GIMP Performance Tuning"
-msgstr "Ajustes del rendimiento de El Gimp"
+msgstr "Ajustes del rendimiento de GIMP"
 
-#: ../app/dialogs/user-install-dialog.c:1000
+#: ../app/dialogs/user-install-dialog.c:998
 msgid "Click \"Continue\" to accept the settings above."
 msgstr "Presione «Continuar» para aceptar los ajustes de arriba."
 
-#: ../app/dialogs/user-install-dialog.c:1005
-msgid ""
-"For optimal GIMP performance, some settings may have to be adjusted."
+#: ../app/dialogs/user-install-dialog.c:1003
+msgid "For optimal GIMP performance, some settings may have to be adjusted."
 msgstr ""
-"Para obtener un rendimiento óptimo de El Gimp podrían tener que ajustarse "
+"Para obtener un rendimiento óptimo de GIMP podrían tener que ajustarse "
 "algunas opciones."
 
-#: ../app/dialogs/user-install-dialog.c:1065
+#: ../app/dialogs/user-install-dialog.c:1063
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "Copiando el archivo «%s» desde «%s»..."
 
-#: ../app/dialogs/user-install-dialog.c:1084
+#: ../app/dialogs/user-install-dialog.c:1082
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "Creando la carpeta «%s»..."
 
-#: ../app/dialogs/user-install-dialog.c:1098
+#: ../app/dialogs/user-install-dialog.c:1096
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "No se puede crear la carpeta «%s»: %s"
 
-#: ../app/dialogs/user-install-dialog.c:1362
+#: ../app/dialogs/user-install-dialog.c:1360
 msgid ""
 "GIMP uses a limited amount of memory to store image data, the so-called "
 "\"Tile Cache\".  You should adjust its size to fit into memory.  Consider "
 "the amount of memory used by other running processes."
 msgstr ""
-"El Gimp usa una cantidad limitada de memoria para almacenar datos sobre las "
+"GIMP usa una cantidad limitada de memoria para almacenar datos sobre las "
 "imágenes llamada «Cache de mosaico». Debería ajustar su tamaño para que "
 "quepa en memoria. Considere la cantidad de memoria que usan otros procesos "
 "en ejecución."
 
-#: ../app/dialogs/user-install-dialog.c:1375
+#: ../app/dialogs/user-install-dialog.c:1373
 msgid "Tile cache size:"
 msgstr "Tamaño del caché de mosaico:"
 
-#: ../app/dialogs/user-install-dialog.c:1387
+#: ../app/dialogs/user-install-dialog.c:1385
 msgid ""
 "All image and undo data which doesn't fit into the Tile Cache will be "
 "written to a swap file.  This file should be located on a local filesystem "
@@ -7507,7 +7481,7 @@ msgstr ""
 "(varios cientos de Mib). En un sistema UNIX, debería usar el directorio "
 "temporal global del sistema («/tmp» ó «/var/tmp»)."
 
-#: ../app/dialogs/user-install-dialog.c:1398
+#: ../app/dialogs/user-install-dialog.c:1396
 msgid "Select swap dir"
 msgstr "Seleccionar la carpeta de intercambio"
 
@@ -7575,11 +7549,11 @@ msgstr "Color de los cuadros oscuros"
 msgid "Custom color"
 msgstr "Color personalizado"
 
-#: ../app/display/gimpdisplayshell.c:943
+#: ../app/display/gimpdisplayshell.c:948
 msgid "Zoom image when window size changes"
 msgstr "Ampliar imagen cuando cambia el tamaño de ventana"
 
-#: ../app/display/gimpdisplayshell.c:963
+#: ../app/display/gimpdisplayshell.c:968
 msgid "Toggle Quick Mask"
 msgstr "Activar máscara rápida"
 
@@ -7644,19 +7618,19 @@ msgstr "Configuración de los filtros de colores de la pantalla"
 msgid "Layer Select"
 msgstr "Selección de capas"
 
-#: ../app/display/gimpdisplayshell-scale.c:537
+#: ../app/display/gimpdisplayshell-scale.c:541
 msgid "Zoom Ratio"
 msgstr "Relación de aumento"
 
-#: ../app/display/gimpdisplayshell-scale.c:539
+#: ../app/display/gimpdisplayshell-scale.c:543
 msgid "Select Zoom Ratio"
 msgstr "Seleccione la relación de aumento"
 
-#: ../app/display/gimpdisplayshell-scale.c:574
+#: ../app/display/gimpdisplayshell-scale.c:578
 msgid "Zoom Ratio:"
 msgstr "Relación de aumento:"
 
-#: ../app/display/gimpdisplayshell-scale.c:601
+#: ../app/display/gimpdisplayshell-scale.c:605
 msgid "Zoom:"
 msgstr "Aumento:"
 
@@ -7707,7 +7681,7 @@ msgstr "Tipo de sombra"
 msgid "Style of bevel around the statusbar text"
 msgstr "Estilo de marco alrededor del texto de la barra de estado"
 
-#: ../app/display/gimpstatusbar.c:222
+#: ../app/display/gimpstatusbar.c:229
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -7747,7 +7721,7 @@ msgstr "El borrado de «%s» ha fallado: %s"
 
 #: ../app/gui/splash.c:118
 msgid "GIMP Startup"
-msgstr "Inicio de El Gimp"
+msgstr "Inicio de GIMP"
 
 #: ../app/gui/themes.c:231 ../app/plug-in/plug-ins.c:254
 #, c-format
@@ -7902,13 +7876,12 @@ msgstr "Transformación 2D..."
 msgid "Blending..."
 msgstr "Mezclando..."
 
-#: ../app/pdb/image_cmds.c:3756 ../app/text/gimptext-parasite.c:168
+#: ../app/pdb/image_cmds.c:3767 ../app/text/gimptext-parasite.c:168
 msgid "(invalid UTF-8 string)"
 msgstr "(cadena UTF-8 inválida)"
 
-#: ../app/pdb/image_cmds.c:3898
-msgid ""
-"Image resolution is out of bounds, using the default resolution instead."
+#: ../app/pdb/image_cmds.c:3909
+msgid "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 "La resolución de la Imagen se sale de los límites; usando la resolución "
 "predefinida en su lugar."
@@ -8048,7 +8021,7 @@ msgstr ""
 "Error de llamada PDB:\n"
 "No se encuentra el procedimiento «%s»"
 
-#: ../app/pdb/procedural_db.c:275 ../app/pdb/procedural_db.c:387
+#: ../app/pdb/procedural_db.c:275 ../app/pdb/procedural_db.c:392
 #, c-format
 msgid ""
 "PDB calling error for procedure '%s':\n"
@@ -8059,15 +8032,15 @@ msgstr ""
 
 #: ../app/pdb/procedural_db_cmds.c:80
 msgid "Internal GIMP procedure"
-msgstr "Procedimiento interno de El Gimp"
+msgstr "Procedimiento interno de GIMP"
 
 #: ../app/pdb/procedural_db_cmds.c:81
 msgid "GIMP Plug-In"
-msgstr "Extensión de El Gimp"
+msgstr "Extensión de GIMP"
 
 #: ../app/pdb/procedural_db_cmds.c:82
 msgid "GIMP Extension"
-msgstr "Añadido de El Gimp"
+msgstr "Añadido de GIMP"
 
 #: ../app/pdb/procedural_db_cmds.c:83
 msgid "Temporary Procedure"
@@ -8077,12 +8050,12 @@ msgstr "Procedimiento temporal"
 msgid "Free Select"
 msgstr "Selección libre"
 
-#: ../app/plug-in/plug-in.c:544 ../app/plug-in/plug-in.c:574
+#: ../app/plug-in/plug-in.c:551 ../app/plug-in/plug-in.c:581
 #, c-format
 msgid "Terminating plug-in: '%s'\n"
 msgstr "Terminando el complemento: «%s»\n"
 
-#: ../app/plug-in/plug-in.c:730
+#: ../app/plug-in/plug-in.c:737
 #, c-format
 msgid ""
 "Plug-In crashed: \"%s\"\n"
@@ -8095,13 +8068,13 @@ msgstr ""
 "(%s)\n"
 "\n"
 "El complemento que ha fallado puede haber estropeado el estado interno de El "
-"GIMP. Sería conveniente que guardase todas sus imágenes y reinicie El Gimp, "
+"GIMP. Sería conveniente que guardase todas sus imágenes y reinicie GIMP, "
 "para no arriesgarse."
 
 #: ../app/plug-in/plug-in-rc.c:176
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
-msgstr "Ignorando «%s»: Versión de protocolo de El Gimp incorrecta."
+msgstr "Ignorando «%s»: Versión de protocolo de GIMP incorrecta."
 
 #: ../app/plug-in/plug-in-rc.c:432
 #, c-format
@@ -8310,7 +8283,7 @@ msgstr "Número de líneas de la rejilla"
 msgid "Grid line spacing"
 msgstr "Espaciado de las líneas de la rejilla"
 
-#: ../app/tools/gimp-tools.c:283
+#: ../app/tools/gimp-tools.c:284
 msgid "This tool has no options."
 msgstr "Esta herramienta no tiene opciones."
 
@@ -8339,7 +8312,7 @@ msgstr "Deslizar:"
 msgid "Shape:"
 msgstr "Forma:"
 
-#: ../app/tools/gimpblendoptions.c:261 ../app/tools/gimppaintoptions-gui.c:417
+#: ../app/tools/gimpblendoptions.c:261 ../app/tools/gimppaintoptions-gui.c:419
 msgid "Repeat:"
 msgstr "Repetir:"
 
@@ -8457,15 +8430,15 @@ msgstr "Rellenar con un color o patrón"
 msgid "_Bucket Fill"
 msgstr "_Relleno"
 
-#: ../app/tools/gimpbycolorselecttool.c:82
+#: ../app/tools/gimpbycolorselecttool.c:83
 msgid "Select By Color"
 msgstr "Seleccionar por color"
 
-#: ../app/tools/gimpbycolorselecttool.c:83
+#: ../app/tools/gimpbycolorselecttool.c:84
 msgid "Select regions by color"
 msgstr "Seleccionar regiones por colores"
 
-#: ../app/tools/gimpbycolorselecttool.c:84
+#: ../app/tools/gimpbycolorselecttool.c:85
 msgid "_By Color Select"
 msgstr "_Por selección de colores"
 
@@ -8714,17 +8687,17 @@ msgstr "Guardar la configuración de curvas en un archivo"
 msgid "Curves for indexed layers cannot be adjusted."
 msgstr "Las curvas para capas indexadas no pueden ser ajustadas."
 
-#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:415
+#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:419
 #: ../app/widgets/gimphistogrameditor.c:161
 msgid "Channel:"
 msgstr "Canal:"
 
-#: ../app/tools/gimpcurvestool.c:494 ../app/tools/gimplevelstool.c:430
+#: ../app/tools/gimpcurvestool.c:494 ../app/tools/gimplevelstool.c:434
 msgid "R_eset channel"
 msgstr "R_einiciar el canal"
 
 #. Horizontal button box for load / save
-#: ../app/tools/gimpcurvestool.c:596 ../app/tools/gimplevelstool.c:640
+#: ../app/tools/gimpcurvestool.c:596 ../app/tools/gimplevelstool.c:644
 msgid "All Channels"
 msgstr "Todos los canales"
 
@@ -8991,33 +8964,33 @@ msgstr "Guardar la configuración de niveles en un archivo"
 msgid "Levels for indexed layers cannot be adjusted."
 msgstr "Los niveles para capas indexadas no pueden ser ajustados."
 
-#: ../app/tools/gimplevelstool.c:355
+#: ../app/tools/gimplevelstool.c:356
 msgid "Pick black point"
 msgstr "Seleccionar un punto negro"
 
-#: ../app/tools/gimplevelstool.c:359
+#: ../app/tools/gimplevelstool.c:360
 msgid "Pick gray point"
 msgstr "Seleccionar un punto gris"
 
-#: ../app/tools/gimplevelstool.c:363
+#: ../app/tools/gimplevelstool.c:364
 msgid "Pick white point"
 msgstr "Seleccionar un punto blanco"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:445
+#: ../app/tools/gimplevelstool.c:449
 msgid "Input Levels"
 msgstr "Niveles de entrada"
 
-#: ../app/tools/gimplevelstool.c:539
+#: ../app/tools/gimplevelstool.c:543
 msgid "Gamma"
 msgstr "Gamma"
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:569
+#: ../app/tools/gimplevelstool.c:573
 msgid "Output Levels"
 msgstr "Niveles de salida"
 
-#: ../app/tools/gimplevelstool.c:667
+#: ../app/tools/gimplevelstool.c:671
 msgid "Adjust levels automatically"
 msgstr "Ajustar los niveles automáticamente"
 
@@ -9132,7 +9105,7 @@ msgid "Brush:"
 msgstr "Brochas:"
 
 #: ../app/tools/gimppaintoptions-gui.c:135
-#: ../app/tools/gimppaintoptions-gui.c:394
+#: ../app/tools/gimppaintoptions-gui.c:395
 msgid "Gradient:"
 msgstr "Degradado:"
 
@@ -9165,11 +9138,11 @@ msgid "Fade out"
 msgstr "Desvanecimiento"
 
 #: ../app/tools/gimppaintoptions-gui.c:333
-#: ../app/tools/gimppaintoptions-gui.c:403
+#: ../app/tools/gimppaintoptions-gui.c:404
 msgid "Length:"
 msgstr "Largo:"
 
-#: ../app/tools/gimppaintoptions-gui.c:367
+#: ../app/tools/gimppaintoptions-gui.c:368
 msgid "Use color from gradient"
 msgstr "Utilizar color desde el degradado"
 
@@ -9229,23 +9202,23 @@ msgstr "Seleccionar regiones rectangulares"
 msgid "_Rect Select"
 msgstr "Selección _rectangular"
 
-#: ../app/tools/gimprectselecttool.c:224
+#: ../app/tools/gimprectselecttool.c:226
 msgid "Selection: ADD"
 msgstr "Selección: AÑADIR"
 
-#: ../app/tools/gimprectselecttool.c:227
+#: ../app/tools/gimprectselecttool.c:229
 msgid "Selection: SUBTRACT"
 msgstr "Selección: SUSTRAER"
 
-#: ../app/tools/gimprectselecttool.c:230
+#: ../app/tools/gimprectselecttool.c:232
 msgid "Selection: INTERSECT"
 msgstr "Selección: INTERSECTAR"
 
-#: ../app/tools/gimprectselecttool.c:233
+#: ../app/tools/gimprectselecttool.c:235
 msgid "Selection: REPLACE"
 msgstr "Selección: REEMPLAZAR"
 
-#: ../app/tools/gimprectselecttool.c:468
+#: ../app/tools/gimprectselecttool.c:414
 msgid "Selection: "
 msgstr "Selección: "
 
@@ -9317,8 +9290,7 @@ msgstr "Bordes suavizados"
 
 #: ../app/tools/gimpselectionoptions.c:150
 msgid "Allow completely transparent regions to be selected"
-msgstr ""
-"Permitir que las regiones completamente transparentes sean seleccionadas"
+msgstr "Permitir que las regiones completamente transparentes sean seleccionadas"
 
 #: ../app/tools/gimpselectionoptions.c:156
 msgid "Base selection on all visible layers"
@@ -9326,8 +9298,7 @@ msgstr "Selección base en todas las capas visibles"
 
 #: ../app/tools/gimpselectionoptions.c:171
 msgid "Use all visible layers when shrinking the selection"
-msgstr ""
-"Utilizar todas las capas visibles cuando se está achicando la selección"
+msgstr "Utilizar todas las capas visibles cuando se está achicando la selección"
 
 #: ../app/tools/gimpselectionoptions.c:382 ../app/tools/gimptextoptions.c:447
 msgid "Antialiasing"
@@ -9384,8 +9355,7 @@ msgid "_Smudge"
 msgstr "_Emborronar [Smudge]"
 
 #: ../app/tools/gimptextoptions.c:146
-msgid ""
-"Hinting alters the font outline to produce a crisp bitmap at small sizes"
+msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 "El «hinting» altera el contorno de la tipografía para producir un mapa de "
 "bits preciso en tamaños pequeños"
@@ -9456,7 +9426,7 @@ msgstr "Te_xto"
 
 #: ../app/tools/gimptexttool.c:744
 msgid "GIMP Text Editor"
-msgstr "Editor de textos de El Gimp"
+msgstr "Editor de textos de GIMP"
 
 #: ../app/tools/gimptexttool.c:854 ../app/tools/gimptexttool.c:857
 msgid "Confirm Text Editing"
@@ -9653,7 +9623,7 @@ msgstr "Pulse para crear una ruta nueva. (pruebe con Mayús.)"
 msgid "Click-Drag to move the anchor around."
 msgstr "Pulse y arrastre para mover el ancla."
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1211 ../app/tools/gimpvectortool.c:1218
 msgid "Click-Drag to move the anchors around."
 msgstr "Pulse y arrastre para mover las anclas."
 
@@ -9661,44 +9631,43 @@ msgstr "Pulse y arrastre para mover las anclas."
 msgid "Click-Drag to move the handle around. (try SHIFT)"
 msgstr "Pulse y arrastre para mover el ancla. (pruebe con Mayús.)"
 
-#: ../app/tools/gimpvectortool.c:1217
+#: ../app/tools/gimpvectortool.c:1220
 msgid "Click-Drag to change the shape of the curve. (SHIFT: symmetrical)"
-msgstr ""
-"Pulse y arrastre para cambiar la forma de la curva. (Mayús.: simétricamente)"
+msgstr "Pulse y arrastre para cambiar la forma de la curva. (Mayús.: simétricamente)"
 
-#: ../app/tools/gimpvectortool.c:1221
+#: ../app/tools/gimpvectortool.c:1224
 msgid "Click-Drag to move the component around. (try SHIFT)"
 msgstr "Pulse y arrastre para mover el componente. (pruebe con Mayús.)"
 
-#: ../app/tools/gimpvectortool.c:1225
+#: ../app/tools/gimpvectortool.c:1228
 msgid "Click-Drag to move the path around."
 msgstr "Pulse y arrastre para mover la ruta."
 
-#: ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1231
 msgid "Click to insert an anchor on the path. (try SHIFT)"
 msgstr "Pulse para insertar un ancla en la ruta. (pruebe con Mayús.)"
 
-#: ../app/tools/gimpvectortool.c:1231
+#: ../app/tools/gimpvectortool.c:1234
 msgid "Click to delete this anchor."
 msgstr "Pulse para borrar esta ancla."
 
-#: ../app/tools/gimpvectortool.c:1234
+#: ../app/tools/gimpvectortool.c:1237
 msgid "Click to connect this anchor with the selected endpoint."
 msgstr "Pulse para conectar esta ancla con el extremo seleccionado."
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1241
 msgid "Click to open up the path."
 msgstr "Pulse para abrir la ruta."
 
-#: ../app/tools/gimpvectortool.c:1241
+#: ../app/tools/gimpvectortool.c:1244
 msgid "Click to make this node angular."
 msgstr "Pulse para hacer este nodo angular."
 
-#: ../app/tools/gimpvectortool.c:1751
+#: ../app/tools/gimpvectortool.c:1761
 msgid "Delete Anchors"
 msgstr "Borrar anclas"
 
-#: ../app/tools/gimpvectortool.c:1918
+#: ../app/tools/gimpvectortool.c:1928
 msgid "There is no active layer or channel to stroke to"
 msgstr "No hay una capa o canal activo donde se pueda trazar"
 
@@ -10482,13 +10451,12 @@ msgstr "Visor de ayuda no encontrado"
 
 #: ../app/widgets/gimphelp.c:188
 msgid "Could not find GIMP help browser."
-msgstr "No se ha podido encontrar el navegador de ayuda de El Gimp."
+msgstr "No se ha podido encontrar el navegador de ayuda de GIMP."
 
 #: ../app/widgets/gimphelp.c:189
-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."
 msgstr ""
-"Parece que el complemento del visor de la ayuda de Gimp falta en su "
+"Parece que el complemento del visor de la ayuda de GIMP falta en su "
 "instalación."
 
 # feo, para mí. FVD
@@ -10498,8 +10466,7 @@ msgstr "El navegador de ayuda no inicia:"
 
 #: ../app/widgets/gimphelp.c:214
 msgid "Could not start the GIMP help browser plug-in."
-msgstr ""
-"No se ha podido iniciar el complemento del navegador de ayuda de El Gimp."
+msgstr "No se ha podido iniciar el complemento del navegador de ayuda de GIMP."
 
 #: ../app/widgets/gimphelp.c:240
 msgid "Use _web browser instead"
@@ -10534,8 +10501,7 @@ msgid "Auto"
 msgstr "Auto"
 
 #: ../app/widgets/gimpimagedock.c:214
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
+msgid "When enabled the dialog automatically follows the image you are working on."
 msgstr ""
 "Cuando está activado el diálogo automáticamente sigue a la imagen en la que "
 "está trabajando."
@@ -10561,12 +10527,12 @@ msgstr "Mantener transparencia"
 msgid "Empty Layer"
 msgstr "Capa vacía"
 
-#: ../app/widgets/gimpmessagebox.c:460
+#: ../app/widgets/gimpmessagebox.c:462
 #, c-format
 msgid "Message repeated %d times."
 msgstr "Mensaje repetido %d veces."
 
-#: ../app/widgets/gimpmessagebox.c:462
+#: ../app/widgets/gimpmessagebox.c:464
 msgid "Message repeated once."
 msgstr "Mensaje repetido una vez."
 
@@ -10699,7 +10665,7 @@ msgstr "No hay selección"
 msgid "Thumbnail %d of %d"
 msgstr "Miniatura %d de %d"
 
-#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740
+#: ../app/widgets/gimpthumbbox.c:733 ../app/widgets/gimpthumbbox.c:743
 msgid "Creating Preview ..."
 msgstr "Creando la vista previa..."
 
@@ -10766,12 +10732,11 @@ msgstr "Borrar las opciones guardadas..."
 
 #: ../app/widgets/gimpuimanager.c:495
 msgid "Your GIMP installation is incomplete:"
-msgstr "Su instalación de Gimp es incompleta:"
+msgstr "Su instalación de GIMP es incompleta:"
 
 #: ../app/widgets/gimpuimanager.c:497
 msgid "Plase make sure the menu XML files are correctly installed."
-msgstr ""
-"Asegúrese de que los archivos de menú XML están instalados correctamente."
+msgstr "Asegúrese de que los archivos de menú XML están instalados correctamente."
 
 #: ../app/widgets/gimpundoeditor.c:255
 msgid "[ Base Image ]"
@@ -10906,7 +10871,7 @@ msgstr "Saturación"
 msgid "<%s>"
 msgstr "<%s>"
 
-#: ../app/widgets/gimpwidgets-utils.c:795
+#: ../app/widgets/gimpwidgets-utils.c:796
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "Datos UTF-8 inválidos en el archivo «%s»."
@@ -10945,7 +10910,7 @@ msgstr "Fantasía"
 
 #: ../app/widgets/widgets-enums.c:199
 msgid "GIMP help browser"
-msgstr "Visualizador de ayuda de Gimp"
+msgstr "Visualizador de ayuda de GIMP"
 
 #: ../app/widgets/widgets-enums.c:200
 msgid "Web browser"
@@ -11036,13 +11001,12 @@ msgstr "No se ha podido buscar dentro del archivo XCF: %s"
 
 #: ../app/xcf/xcf.c:86 ../app/xcf/xcf.c:143
 msgid "GIMP XCF image"
-msgstr "Imagen XCF de Gimp"
+msgstr "Imagen XCF de GIMP"
 
 #: ../app/xcf/xcf.c:282
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
-msgstr ""
-"Error XCF: Se encontró una versión %d de archivo de tipo XCF no soportada"
+msgstr "Error XCF: Se encontró una versión %d de archivo de tipo XCF no soportada"
 
 #: ../data/misc/gimp.desktop.in.in.h:1
 msgid "Create and edit images or photographs"
@@ -11052,20 +11016,3 @@ msgstr "Cree y edite imágenes o fotografías"
 msgid "Image Editor"
 msgstr "Editor de imagen"
 
-# Quizá mejor Relación de aspecto. FVD
-#~ msgid "Keep aspect ratio"
-#~ msgstr "Mantener proporción"
-
-#~ msgid "Y:"
-#~ msgstr "Y:"
-
-#~ msgid "Transformations do not work on layers that contain layer masks."
-#~ msgstr ""
-#~ "Las transformaciones no funcionan sobre capas que contienen máscaras de "
-#~ "capa."
-
-#~ msgid "Main Keyboard"
-#~ msgstr "Teclado principal"
-
-#~ msgid "Main Mouse Wheel"
-#~ msgstr "Rueda del ratón principal"
diff --git a/po/eu.po b/po/eu.po
index 3f76a7d267..1076bb053b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,29 +1,33 @@
+# translation of eu3.po to Basque
 # translation of eu.po to Basque
 # translation of gimp.HEAD.po to basque
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Hizkuntza Politikarako Sailburuordetza , 2004.
-# Iñaki Larrañaga Murgoitio , 2004.
+# Iñaki Larrañaga Murgoitio , 2004, 2005, 2006.
+# Iñaki Larrañaga Murgoitio , 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-22 17:32+0100\n"
-"PO-Revision-Date: 2004-04-06 17:02+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio \n"
+"POT-Creation-Date: 2006-04-20 12:53+0000\n"
+"PO-Revision-Date: 2006-04-20 16:24+0000\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.0.2\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
+"\n"
 
-#: app/app_procs.c:144
+#: ../app/app_procs.c:144
 msgid "(This console window will close in ten seconds)\n"
 msgstr "(Kontsola-leiho hau hamar minutu barru itxiko da)\n"
 
-#: app/app_procs.c:238
+#: ../app/app_procs.c:239
 msgid ""
 "GIMP is not properly installed for the current user.\n"
 "User installation was skipped because the '--no-interface' flag was used.\n"
@@ -35,25 +39,28 @@ msgstr ""
 "Erabiltzailearen instalazioa egiteko, exekutatu GIMP '--no-interface' "
 "banderarik gabe."
 
-#: app/app_procs.c:289
+#: ../app/app_procs.c:290
 #, c-format
 msgid ""
 "Unable to open a test swap file. To avoid data loss please check the "
 "location and permissions of the swap directory defined in your Preferences "
 "(currently \"%s\")."
 msgstr ""
+"Ezin da testu-trukatzeko fitxategia ireki. Datuen galera sahiesteko, egiaztatu "
+"trukatze-direktorioaren (Hobespenean definituta duzun \"%s\") helbidea eta "
+"baimenak egokiak direla."
 
-#: app/app_procs.c:348 app/core/gimppalette-import.c:441
+#: ../app/app_procs.c:349 ../app/core/gimppalette-import.c:444
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "Ezin izan da '%s' ireki: %s"
 
-#: app/batch.c:84 app/batch.c:101
+#: ../app/batch.c:84 ../app/batch.c:101
 #, c-format
 msgid "The batch interpreter '%s' is not available, batch mode disabled."
-msgstr ""
+msgstr "'%s' batch interpretatzailea ez dago erabilgarri. Batch modua desgaituta."
 
-#: app/main.c:211
+#: ../app/main.c:211
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -61,15 +68,15 @@ msgstr ""
 "GIMPek ezin izan du erabiltzailearen interfaze grafikoa abiarazi.\n"
 "Ziurtatu zure pantaila-ingurunerako konfigurazio egokia badagoela."
 
-#: app/main.c:222 app/widgets/gimptoolbox.c:559
-#: data/misc/gimp.desktop.in.in.h:3
+#: ../app/main.c:222 ../app/widgets/gimptoolbox.c:559
+#: ../data/misc/gimp.desktop.in.in.h:3
 msgid "The GIMP"
 msgstr "GIMP"
 
 #.
 #. *  anything else starting with a '-' is an error.
 #.
-#: app/main.c:422
+#: ../app/main.c:422
 #, c-format
 msgid ""
 "\n"
@@ -78,11 +85,11 @@ msgstr ""
 "\n"
 "\"%s\" aukera baliogabea\n"
 
-#: app/main.c:501
+#: ../app/main.c:501
 msgid "GIMP version"
-msgstr "GIMP bertsioa"
+msgstr "GIMPen bertsioa"
 
-#: app/main.c:509
+#: ../app/main.c:509
 #, c-format
 msgid ""
 "\n"
@@ -93,98 +100,81 @@ msgstr ""
 "Erabilera: %s [aukera ... ] [fitxategia ... ]\n"
 "\n"
 
-#: app/main.c:511
+#: ../app/main.c:511
 msgid "Options:\n"
 msgstr "Aukerak:\n"
 
-#: app/main.c:512
+#: ../app/main.c:512
 msgid "  -h, --help               Output this help.\n"
 msgstr "  -h, --help               Bistaratu laguntza hau.\n"
 
-#: app/main.c:513
+#: ../app/main.c:513
 msgid "  -v, --version            Output version information.\n"
 msgstr "  -v, --version            Bistaratu bertsioari buruzko informazioa.\n"
 
-#: app/main.c:514
+#: ../app/main.c:514
 msgid "  --verbose                Show startup messages.\n"
 msgstr "  --verbose                Erakutsi abioko mezuak.\n"
 
-#: app/main.c:515
+#: ../app/main.c:515
 msgid ""
 "  --no-shm                 Do not use shared memory between GIMP and "
 "plugins.\n"
-msgstr ""
-"  --no-shm                 Ez erabili GIMP eta plugin-en arteko memoria "
-"partekatua.\n"
+msgstr "  --no-shm                 Ez erabili GIMP eta plugin-en arteko memoria partekatua\n"
 
-#: app/main.c:516
+#: ../app/main.c:516
 msgid "  --no-cpu-accel           Do not use special CPU accelerations.\n"
-msgstr ""
-"  --no-cpu-accel                 Ez erabili CPU azeleratzaile berezirik.\n"
+msgstr "  --no-cpu-accel           Ez erabili CPU azeleratzaile berezirik.\n"
 
-#: app/main.c:517
+#: ../app/main.c:517
 msgid ""
 "  -d, --no-data            Do not load brushes, gradients, palettes, "
 "patterns.\n"
-msgstr ""
-"  -d, --no-data            Ez kargatu brotxak, gradienteak, paletak, "
-"ereduak.\n"
+msgstr "  -d, --no-data            Ez kargatu brotxak, gradienteak, ereduak.\n"
 
-#: app/main.c:518
+#: ../app/main.c:518
 msgid "  -f, --no-fonts           Do not load any fonts.\n"
 msgstr "  -f, --no-fonts          Ez kargatu letra-tiporik.\n"
 
-#: app/main.c:519
+#: ../app/main.c:519
 msgid "  -i, --no-interface       Run without a user interface.\n"
-msgstr ""
-"  -i, --no-interface       Exekutatu erabiltzailearen interfaze bat erabili "
-"gabe.\n"
+msgstr "  -i, --no-interface       Exekutatu erabiltzailearen interfazea erabili gabe.\n"
 
-#: app/main.c:520
+#: ../app/main.c:520
 msgid "  --display       Use the designated X display.\n"
-msgstr "  --display       Erabili zehaztutako X pantaila.\n"
+msgstr "  --display       Erabili zehaztutako X pantaila.\n"
 
-#: app/main.c:521
+#: ../app/main.c:521
 msgid "  -s, --no-splash          Do not show the startup window.\n"
 msgstr "  -s, --no-splash          Ez erakutsi abioko leihoa.\n"
 
-#: app/main.c:522
+#: ../app/main.c:522
 msgid "  --session          Use an alternate sessionrc file.\n"
-msgstr "  --session     Erabili beste sessionrc fitxategi bat.\n"
+msgstr "  --session          Erabili beste sessionrc fitxategi bat.\n"
 
-#: app/main.c:523
+#: ../app/main.c:523
 msgid "  -g, --gimprc     Use an alternate gimprc file.\n"
-msgstr "  -g, --gimprc     Erabili beste gimprc fitxategi bat.\n"
+msgstr "  -g, --gimprc     Erabili gimprc sistema-fitxategi alternatibo bat.\n"
 
-#: app/main.c:524
+#: ../app/main.c:524
 msgid "  --system-gimprc  Use an alternate system gimprc file.\n"
-msgstr ""
-"  --system-gimprc  Erabili gimprc sistema-fitxategi alternatibo "
-"bat.\n"
+msgstr "  --system-gimprc  Erabili gimprc sistema-fitxategi alternatibo bat.\n"
 
-#: app/main.c:525
-msgid ""
-"  --dump-gimprc            Output a gimprc file with default settings.\n"
-msgstr ""
-"  --dump-gimprc            Ezarpen lehenetsiekin gimprc fitxategia idazten "
-"du.\n"
+#: ../app/main.c:525
+msgid "  --dump-gimprc            Output a gimprc file with default settings.\n"
+msgstr "  --dump-gimprc            Ezarpen lehenetsiekin gimprc fitxategia idazten du.\n"
 
-#: app/main.c:526
+#: ../app/main.c:526
 msgid ""
 "  -c, --console-messages   Display warnings to console instead of a dialog "
 "box.\n"
-msgstr ""
-"  -c, --console-messages   Bistaratu abisuak kontsolan elkarrizketa-koadroan "
-"bistaratu ordez.\n"
+msgstr "  -c, --console-messages   Bistaratu abisuak kontsolan elkarrizketa-koadroan bistaratu ordez.\n"
 
-#: app/main.c:527
-msgid ""
-"  --debug-handlers         Enable non-fatal debugging signal handlers.\n"
-msgstr ""
-"  --debug-handlers         Gaitu larriak ez diren arazketako seinale-"
-"kudeatzaileak.\n"
+#: ../app/main.c:527
+msgid "  --debug-handlers         Enable non-fatal debugging signal handlers.\n"
+msgstr "  --debug-handlers         Gaitu larriak ez diren arazketako seinale-kudeatzaileak.\n"
 
-#: app/main.c:528
+#: ../app/main.c:528
 msgid ""
 "  --stack-trace-mode \n"
 "                           Debugging mode for fatal signals.\n"
@@ -192,7 +182,7 @@ msgstr ""
 "  --stack-trace-mode \n"
 "                           Seinale larrien arazketa-modua.\n"
 
-#: app/main.c:530
+#: ../app/main.c:530
 msgid ""
 "  --pdb-compat-mode \n"
 "                           Procedural Database compatibility mode.\n"
@@ -200,25 +190,30 @@ msgstr ""
 "  --pdb-compat-mode \n"
 "                           Procedural Database-rekin baterakortasun modua.\n"
 
-#: app/main.c:532
+#: ../app/main.c:532
 msgid ""
 "  --batch-interpreter \n"
 "                           The procedure to process batch commands with.\n"
 msgstr ""
+"  --batch-interpreter \n"
+"                           Batch erako komandoak prozesatzeko prozedura.\n"
 
-#: app/main.c:534
+#: ../app/main.c:534
 msgid "  -b, --batch    Process commands in batch mode.\n"
-msgstr "  -b, --batch    Exekutatu batch moduan.\n"
+msgstr "  -b, --batch    Exekutatu batch moduan.\n"
 
-#: app/sanity.c:194
+#: ../app/sanity.c:194
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
 "\n"
 "Please check the value of the environment variable G_FILENAME_ENCODING."
 msgstr ""
+"Konfiguratutako fitxategi-izenaren kodeketaezin da UTF-8 gisa bihurtu: %s\n"
+"\n"
+"Egiaztatu inguruko G_FILENAME_ENCODING aldagaiaren balioa."
 
-#: app/sanity.c:213
+#: ../app/sanity.c:213
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -228,953 +223,827 @@ msgid ""
 "8 and you didn't tell GLib about this. Please set the environment variable "
 "G_FILENAME_ENCODING."
 msgstr ""
+"GIMP erabiltzaile-konfigurazioko direktorioaren izena ezin da UTF-8 gisa "
+"bihurtu: %s\n"
+"\n"
+"Litekeena da sistemak UTF-8 kodeketan fitxategiak ez gordetzea, eta ez "
+"diozula GLib-i honi buruz ezer zehaztu. Ezarri G_FILENAME_ENCODING "
+"inguruneko aldagaia."
 
 #. initialize the list of gimp brushes
-#: app/actions/actions.c:93 app/core/gimp.c:856 app/dialogs/dialogs.c:138
-#: app/dialogs/preferences-dialog.c:2297 app/pdb/internal_procs.c:92
+#: ../app/actions/actions.c:94 ../app/core/gimp.c:856
+#: ../app/dialogs/dialogs.c:138 ../app/dialogs/preferences-dialog.c:2297
+#: ../app/pdb/internal_procs.c:92
 msgid "Brushes"
 msgstr "Brotxak"
 
-#: app/actions/actions.c:96 app/dialogs/dialogs.c:150
+#: ../app/actions/actions.c:97 ../app/dialogs/dialogs.c:150
 msgid "Buffers"
 msgstr "Bufferrak"
 
-#: app/actions/actions.c:99 app/dialogs/dialogs.c:163
+#: ../app/actions/actions.c:100 ../app/dialogs/dialogs.c:163
 msgid "Channels"
 msgstr "Kanalak"
 
-#: app/actions/actions.c:102
-#, fuzzy
+#: ../app/actions/actions.c:103
 msgid "Colormap Editor"
-msgstr "Kolore-mapa"
+msgstr "Kolore-mapa editorea"
 
-#: app/actions/actions.c:105 app/pdb/internal_procs.c:101
-#, fuzzy
+#: ../app/actions/actions.c:106 ../app/pdb/internal_procs.c:101
 msgid "Context"
-msgstr "/Laguntza/_Testuinguru-laguntza"
+msgstr "Testuingurua"
 
-#: app/actions/actions.c:108
+#: ../app/actions/actions.c:109
 msgid "Debug"
-msgstr ""
+msgstr "Araztu"
 
-#: app/actions/actions.c:111
-#, fuzzy
+#: ../app/actions/actions.c:112
 msgid "Dialogs"
-msgstr "/E_lkarrizketa-koadroak"
+msgstr "Elkarrizketa-koadroak"
 
-#: app/actions/actions.c:114
-#, fuzzy
+#: ../app/actions/actions.c:115
 msgid "Dockable"
-msgstr "Marrazgaia"
+msgstr "Atrakagaia"
 
-#: app/actions/actions.c:117 app/dialogs/dialogs.c:152
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:152
 msgid "Document History"
 msgstr "Dokumentuaren historia"
 
-#: app/actions/actions.c:120 app/core/core-enums.c:1041
-#: app/core/core-enums.c:1071
+#: ../app/actions/actions.c:121 ../app/core/core-enums.c:1043
+#: ../app/core/core-enums.c:1073
 msgid "Drawable"
 msgstr "Marrazgaia"
 
-#: app/actions/actions.c:123 app/tools/tools-enums.c:144
+#: ../app/actions/actions.c:124 ../app/tools/tools-enums.c:144
 msgid "Edit"
 msgstr "Editatu"
 
-#: app/actions/actions.c:126 app/dialogs/dialogs.c:131
+#: ../app/actions/actions.c:127 ../app/dialogs/dialogs.c:131
 msgid "Error Console"
 msgstr "Errore-kontsola"
 
-#: app/actions/actions.c:129
-#, fuzzy
+#: ../app/actions/actions.c:130
 msgid "File"
-msgstr "/_Fitxategia"
+msgstr "Fitxategia"
 
 #. initialize the list of gimp fonts
-#: app/actions/actions.c:132 app/core/gimp.c:872 app/dialogs/dialogs.c:146
-#: app/dialogs/preferences-dialog.c:2313 app/pdb/internal_procs.c:128
+#: ../app/actions/actions.c:133 ../app/core/gimp.c:872
+#: ../app/dialogs/dialogs.c:146 ../app/dialogs/preferences-dialog.c:2313
+#: ../app/pdb/internal_procs.c:128
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: app/actions/actions.c:135 app/dialogs/dialogs.c:205
+#: ../app/actions/actions.c:136 ../app/dialogs/dialogs.c:205
 msgid "Gradient Editor"
 msgstr "Gradientearen editorea"
 
 #. initialize the list of gimp gradients
-#: app/actions/actions.c:138 app/core/gimp.c:868 app/dialogs/dialogs.c:142
-#: app/dialogs/preferences-dialog.c:2309 app/pdb/internal_procs.c:140
+#: ../app/actions/actions.c:139 ../app/core/gimp.c:868
+#: ../app/dialogs/dialogs.c:142 ../app/dialogs/preferences-dialog.c:2309
+#: ../app/pdb/internal_procs.c:140
 msgid "Gradients"
 msgstr "Gradienteak"
 
-#: app/actions/actions.c:141
-#, fuzzy
+#: ../app/actions/actions.c:142
 msgid "Help"
-msgstr "/Lagu_ntza"
+msgstr "Laguntza"
 
-#: app/actions/actions.c:144 app/pdb/internal_procs.c:149
-#: app/tools/tools-enums.c:176
+#: ../app/actions/actions.c:145 ../app/pdb/internal_procs.c:149
+#: ../app/tools/tools-enums.c:176
 msgid "Image"
 msgstr "Irudia"
 
 #. list & grid views
-#: app/actions/actions.c:147 app/dialogs/dialogs.c:136
+#: ../app/actions/actions.c:148 ../app/dialogs/dialogs.c:136
 msgid "Images"
 msgstr "Irudiak"
 
-#: app/actions/actions.c:150 app/dialogs/dialogs.c:159
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:159
 msgid "Layers"
 msgstr "Geruzak"
 
-#: app/actions/actions.c:153 app/dialogs/dialogs.c:209
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:209
 msgid "Palette Editor"
 msgstr "Paletaren editorea"
 
 #. initialize the list of gimp palettes
-#: app/actions/actions.c:156 app/core/gimp.c:864 app/dialogs/dialogs.c:144
-#: app/dialogs/preferences-dialog.c:2305 app/pdb/internal_procs.c:170
+#: ../app/actions/actions.c:157 ../app/core/gimp.c:864
+#: ../app/dialogs/dialogs.c:144 ../app/dialogs/preferences-dialog.c:2305
+#: ../app/pdb/internal_procs.c:170
 msgid "Palettes"
 msgstr "Paletak"
 
 #. initialize the list of gimp patterns
-#: app/actions/actions.c:159 app/core/gimp.c:860 app/dialogs/dialogs.c:140
-#: app/dialogs/preferences-dialog.c:2301 app/pdb/internal_procs.c:185
+#: ../app/actions/actions.c:160 ../app/core/gimp.c:860
+#: ../app/dialogs/dialogs.c:140 ../app/dialogs/preferences-dialog.c:2301
+#: ../app/pdb/internal_procs.c:185
 msgid "Patterns"
 msgstr "Ereduak"
 
-#: app/actions/actions.c:162 app/dialogs/preferences-dialog.c:2317
+#: ../app/actions/actions.c:163 ../app/dialogs/preferences-dialog.c:2317
 msgid "Plug-Ins"
 msgstr "Plugin-ak"
 
-#: app/actions/actions.c:165
-msgid "QuickMask"
-msgstr "Maskara bizkorra"
+#: ../app/actions/actions.c:166 ../app/core/core-enums.c:1040
+#: ../app/core/gimpchannel.c:383
+msgid "Quick Mask"
+msgstr "Maskara azkarra"
 
-#: app/actions/actions.c:168
-#, fuzzy
+#: ../app/actions/actions.c:169
 msgid "Select"
-msgstr "/_Hautatu"
+msgstr "Hautatu"
 
 #. initialize the template list
-#: app/actions/actions.c:171 app/core/gimp.c:880 app/dialogs/dialogs.c:154
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:880
+#: ../app/dialogs/dialogs.c:154
 msgid "Templates"
 msgstr "Txantiloiak"
 
-#: app/actions/actions.c:174
-#, fuzzy
+#: ../app/actions/actions.c:175
 msgid "Text Editor"
-msgstr "GIMP Testu-editorea"
+msgstr "Testu-editorea"
 
-#: app/actions/actions.c:177 app/dialogs/dialogs.c:123
-#: app/dialogs/preferences-dialog.c:1585 app/dialogs/preferences-dialog.c:1588
-#: app/gui/gui.c:410
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:123
+#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1588 ../app/gui/gui.c:410
 msgid "Tool Options"
 msgstr "Tresna-aukerak"
 
-#: app/actions/actions.c:180 app/dialogs/dialogs.c:148
+#: ../app/actions/actions.c:181 ../app/dialogs/dialogs.c:148
 msgid "Tools"
 msgstr "Tresnak"
 
-#: app/actions/actions.c:183 app/dialogs/dialogs.c:167
-#: app/pdb/internal_procs.c:176 app/tools/gimpvectortool.c:160
+#: ../app/actions/actions.c:184 ../app/dialogs/dialogs.c:167
+#: ../app/pdb/internal_procs.c:176 ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "Bideak"
 
-#: app/actions/actions.c:186
-#, fuzzy
+#: ../app/actions/actions.c:187
 msgid "View"
-msgstr "/I_kusi"
+msgstr "Ikusi"
 
-#: app/actions/brushes-actions.c:43
+#: ../app/actions/brushes-actions.c:43
 msgid "Brushes Menu"
 msgstr "Brotxa-menua"
 
-#: app/actions/brushes-actions.c:47
-#, fuzzy
+#: ../app/actions/brushes-actions.c:47
 msgid "_New Brush"
-msgstr "/_Brotxa berria"
+msgstr "_Brotxa berria"
 
-#: app/actions/brushes-actions.c:48
-#, fuzzy
+#: ../app/actions/brushes-actions.c:48
 msgid "New brush"
-msgstr "/_Brotxa berria"
+msgstr "Brotxa berria"
 
-#: app/actions/brushes-actions.c:53
-#, fuzzy
+#: ../app/actions/brushes-actions.c:53
 msgid "D_uplicate Brush"
-msgstr "/B_ikoiztu brotxa"
+msgstr "B_ikoiztu brotxa"
 
-#: app/actions/brushes-actions.c:54
-#, fuzzy
+#: ../app/actions/brushes-actions.c:54
 msgid "Duplicate brush"
-msgstr "/B_ikoiztu brotxa"
+msgstr "Bikoiztu brotxa"
 
-#: app/actions/brushes-actions.c:59
-#, fuzzy
+#: ../app/actions/brushes-actions.c:59
 msgid "_Delete Brush"
-msgstr "/_Ezabatu brotxa"
+msgstr "_Ezabatu brotxa"
 
-#: app/actions/brushes-actions.c:60
-#, fuzzy
+#: ../app/actions/brushes-actions.c:60
 msgid "Delete brush"
-msgstr "/_Ezabatu brotxa"
+msgstr "Ezabatu brotxa"
 
-#: app/actions/brushes-actions.c:65
-#, fuzzy
+#: ../app/actions/brushes-actions.c:65
 msgid "_Refresh Brushes"
-msgstr "/_Freskatu brotxak"
+msgstr "_Freskatu brotxak"
 
-#: app/actions/brushes-actions.c:66
-#, fuzzy
+#: ../app/actions/brushes-actions.c:66
 msgid "Refresh brushes"
-msgstr "/_Freskatu brotxak"
+msgstr "Freskatu brotxak"
 
-#: app/actions/brushes-actions.c:74
-#, fuzzy
+#: ../app/actions/brushes-actions.c:74
 msgid "_Edit Brush..."
-msgstr "/_Editatu brotxa..."
+msgstr "_Editatu brotxa..."
 
-#: app/actions/brushes-actions.c:75
-#, fuzzy
+#: ../app/actions/brushes-actions.c:75
 msgid "Edit brush"
-msgstr "/_Editatu brotxa..."
+msgstr "Editatu brotxa"
 
-#: app/actions/buffers-actions.c:42
+#: ../app/actions/buffers-actions.c:42
 msgid "Buffers Menu"
 msgstr "Bufferren menua"
 
-#: app/actions/buffers-actions.c:46
-#, fuzzy
+#: ../app/actions/buffers-actions.c:46
 msgid "_Paste Buffer"
-msgstr "/_Itsatsi bufferra"
+msgstr "_Itsatsi bufferra"
 
-#: app/actions/buffers-actions.c:47
-#, fuzzy
+#: ../app/actions/buffers-actions.c:47
 msgid "Paste the selected buffer"
-msgstr "Eraman gora hautatutako iragazkia"
+msgstr "Itsatsi hautatutako bufferra"
 
-#: app/actions/buffers-actions.c:52
-#, fuzzy
+#: ../app/actions/buffers-actions.c:52
 msgid "Paste Buffer _Into"
-msgstr "/Itsatsi bufferra _hemen"
+msgstr "Itsatsi bufferra _hemen"
 
-#: app/actions/buffers-actions.c:53
-#, fuzzy
+#: ../app/actions/buffers-actions.c:53
 msgid "Paste the selected buffer into the selection"
-msgstr "Biratu geruza edo hautapena"
+msgstr "Itsatsi hautatutako bufferra hautapenean"
 
-#: app/actions/buffers-actions.c:58
-#, fuzzy
+#: ../app/actions/buffers-actions.c:58
 msgid "Paste Buffer as _New"
-msgstr "/Itsatsi bufferra _berri gisa"
+msgstr "Itsatsi bufferra _berri gisa"
 
-#: app/actions/buffers-actions.c:59
-#, fuzzy
+#: ../app/actions/buffers-actions.c:59
 msgid "Paste the selected buffer as new image"
-msgstr "Berrezarri hautatutako iragazkia balio lehenetsiekin"
+msgstr "Itsatsi hautatutako bufferra irudi berri gisa"
 
-#: app/actions/buffers-actions.c:64
-#, fuzzy
+#: ../app/actions/buffers-actions.c:64
 msgid "_Delete Buffer"
-msgstr "/_Ezabatu bufferra"
+msgstr "_Ezabatu bufferra"
 
-#: app/actions/buffers-actions.c:65
-#, fuzzy
+#: ../app/actions/buffers-actions.c:65
 msgid "Delete the selected buffer"
-msgstr "Ezabatu hautatutako txantiloia"
+msgstr "Ezabatu hautatutako bufferra"
 
-#: app/actions/channels-actions.c:44
+#: ../app/actions/channels-actions.c:44
 msgid "Channels Menu"
 msgstr "Kanal-menua"
 
-#: app/actions/channels-actions.c:48
-#, fuzzy
+#: ../app/actions/channels-actions.c:48
 msgid "_Edit Channel Attributes..."
-msgstr "/_Editatu kanal-atributuak..."
+msgstr "_Editatu kanal-atributuak..."
 
-#: app/actions/channels-actions.c:49
-#, fuzzy
+#: ../app/actions/channels-actions.c:49
 msgid "Edit channel attributes"
 msgstr "Editatu kanal-atributuak"
 
-#: app/actions/channels-actions.c:54
-#, fuzzy
+#: ../app/actions/channels-actions.c:54
 msgid "_New Channel..."
-msgstr "/_Kanal berria..."
+msgstr "_Kanal berria..."
 
-#: app/actions/channels-actions.c:55
-#, fuzzy
+#: ../app/actions/channels-actions.c:55
 msgid "New channel..."
-msgstr "/_Kanal berria..."
+msgstr "Kanal berria..."
 
-#: app/actions/channels-actions.c:60
-#, fuzzy
+#: ../app/actions/channels-actions.c:60
 msgid "_New Channel"
-msgstr "Kanal berria"
+msgstr "_Kanal berria"
 
-#: app/actions/channels-actions.c:61
+#: ../app/actions/channels-actions.c:61
 msgid "New channel with last values"
-msgstr ""
+msgstr "Kanal berria azken balioekin"
 
-#: app/actions/channels-actions.c:66
-#, fuzzy
+#: ../app/actions/channels-actions.c:66
 msgid "D_uplicate Channel"
-msgstr "/Bikoi_ztu kanala"
+msgstr "Bikoi_ztu kanala"
 
-#: app/actions/channels-actions.c:67
-#, fuzzy
+#: ../app/actions/channels-actions.c:67
 msgid "Duplicate channel"
 msgstr "Bikoiztu kanala"
 
-#: app/actions/channels-actions.c:72
-#, fuzzy
+#: ../app/actions/channels-actions.c:72
 msgid "_Delete Channel"
-msgstr "/_Ezabatu kanala"
+msgstr "_Ezabatu kanala"
 
-#: app/actions/channels-actions.c:73 app/core/core-enums.c:1089
-#, fuzzy
+#: ../app/actions/channels-actions.c:73 ../app/core/core-enums.c:1091
 msgid "Delete channel"
 msgstr "Ezabatu kanala"
 
-#: app/actions/channels-actions.c:78
-#, fuzzy
+#: ../app/actions/channels-actions.c:78
 msgid "_Raise Channel"
-msgstr "/I_go kanala"
+msgstr "I_go kanala"
 
-#: app/actions/channels-actions.c:79
-#, fuzzy
+#: ../app/actions/channels-actions.c:79
 msgid "Raise channel"
 msgstr "Igo kanala"
 
-#: app/actions/channels-actions.c:84
-#, fuzzy
+#: ../app/actions/channels-actions.c:84
 msgid "Raise Channel to _Top"
-msgstr "Igo kanala goienera"
+msgstr "Igo kanala g_oienera"
 
-#: app/actions/channels-actions.c:85
-#, fuzzy
+#: ../app/actions/channels-actions.c:85
 msgid "Raise channel to top"
 msgstr "Igo kanala goienera"
 
-#: app/actions/channels-actions.c:90
-#, fuzzy
+#: ../app/actions/channels-actions.c:90
 msgid "_Lower Channel"
-msgstr "/_Jaitsi kanala"
+msgstr "_Jaitsi kanala"
 
-#: app/actions/channels-actions.c:91
-#, fuzzy
+#: ../app/actions/channels-actions.c:91
 msgid "Lower channel"
 msgstr "Jaitsi kanala"
 
-#: app/actions/channels-actions.c:96
-#, fuzzy
+#: ../app/actions/channels-actions.c:96
 msgid "Lower Channel to _Bottom"
-msgstr "Jaitsi kanala leku baxuenera"
+msgstr "Jaitsi kanala leku _baxuenera"
 
-#: app/actions/channels-actions.c:97
-#, fuzzy
+#: ../app/actions/channels-actions.c:97
 msgid "Lower channel to bottom"
 msgstr "Jaitsi kanala leku baxuenera"
 
-#: app/actions/channels-actions.c:105
-#, fuzzy
+#: ../app/actions/channels-actions.c:105
 msgid "Channel to Sele_ction"
-msgstr "/Kanala _hautapenera"
+msgstr "Kanala _hautapenera"
 
-#: app/actions/channels-actions.c:106
-#, fuzzy
+#: ../app/actions/channels-actions.c:106
 msgid "Channel to selection"
 msgstr "Kanala hautapenera"
 
-#: app/actions/channels-actions.c:111 app/actions/layers-actions.c:226
-#: app/actions/vectors-actions.c:173
-#, fuzzy
+#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:226
+#: ../app/actions/vectors-actions.c:173
 msgid "_Add to Selection"
-msgstr "/_Gehitu hautapenari"
+msgstr "_Gehitu hautapenari"
 
-#: app/actions/channels-actions.c:112 app/actions/vectors-actions.c:174
+#: ../app/actions/channels-actions.c:112 ../app/actions/vectors-actions.c:174
 msgid "Add"
-msgstr ""
+msgstr "Gehitu"
 
-#: app/actions/channels-actions.c:117 app/actions/layers-actions.c:231
-#: app/actions/layers-actions.c:254 app/actions/vectors-actions.c:179
-#, fuzzy
+#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:231
+#: ../app/actions/layers-actions.c:254 ../app/actions/vectors-actions.c:179
 msgid "_Subtract from Selection"
-msgstr "/_Kendu hautapenetik"
+msgstr "_Kendu hautapenetik"
 
-#: app/actions/channels-actions.c:118 app/actions/vectors-actions.c:180
-#: app/widgets/gimpwidgets-constructors.c:69
-#: app/widgets/gimpwidgets-constructors.c:102
+#: ../app/actions/channels-actions.c:118 ../app/actions/vectors-actions.c:180
+#: ../app/widgets/gimpwidgets-constructors.c:69
+#: ../app/widgets/gimpwidgets-constructors.c:102
 msgid "Subtract"
 msgstr "Kenketa"
 
-#: app/actions/channels-actions.c:123 app/actions/layers-actions.c:236
-#: app/actions/layers-actions.c:259 app/actions/vectors-actions.c:185
-#, fuzzy
+#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:236
+#: ../app/actions/layers-actions.c:259 ../app/actions/vectors-actions.c:185
 msgid "_Intersect with Selection"
-msgstr "/_Gurutzatu hautapenarekin"
+msgstr "_Gurutzatu hautapenarekin"
 
-#: app/actions/channels-actions.c:124 app/actions/vectors-actions.c:186
-#, fuzzy
+#: ../app/actions/channels-actions.c:124 ../app/actions/vectors-actions.c:186
 msgid "Intersect"
-msgstr "Interfazea"
+msgstr "Gurutzatu"
 
-#: app/actions/channels-commands.c:86 app/actions/channels-commands.c:383
+#: ../app/actions/channels-commands.c:86
+#: ../app/actions/channels-commands.c:383
 msgid "Channel Attributes"
 msgstr "Kanal-atributuak"
 
-#: app/actions/channels-commands.c:89
+#: ../app/actions/channels-commands.c:89
 msgid "Edit Channel Attributes"
 msgstr "Editatu kanal-atributuak"
 
-#: app/actions/channels-commands.c:91
+#: ../app/actions/channels-commands.c:91
 msgid "Edit Channel Color"
 msgstr "Editatu kanalaren kolorea"
 
-#: app/actions/channels-commands.c:92 app/actions/channels-commands.c:124
+#: ../app/actions/channels-commands.c:92
+#: ../app/actions/channels-commands.c:124
 msgid "Fill Opacity:"
 msgstr "Betegarriaren opakutasuna:"
 
-#: app/actions/channels-commands.c:117 app/actions/channels-commands.c:118
-#: app/actions/channels-commands.c:159 app/actions/channels-commands.c:163
-#: app/widgets/gimpchanneltreeview.c:256
+#: ../app/actions/channels-commands.c:117
+#: ../app/actions/channels-commands.c:118
+#: ../app/actions/channels-commands.c:159
+#: ../app/actions/channels-commands.c:163
+#: ../app/widgets/gimpchanneltreeview.c:256
 msgid "New Channel"
 msgstr "Kanal berria"
 
-#: app/actions/channels-commands.c:121
+#: ../app/actions/channels-commands.c:121
 msgid "New Channel Options"
 msgstr "Kanalaren aukera berriak"
 
-#: app/actions/channels-commands.c:123
+#: ../app/actions/channels-commands.c:123
 msgid "New Channel Color"
 msgstr "Kolorearen kanal berria"
 
-#: app/actions/channels-commands.c:246
+#: ../app/actions/channels-commands.c:246
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s kanalaren kopia"
 
-#: app/actions/channels-commands.c:311 app/core/gimpselection.c:595
-#: app/pdb/selection_cmds.c:921 app/pdb/selection_cmds.c:1045
+#: ../app/actions/channels-commands.c:311 ../app/core/gimpselection.c:595
+#: ../app/pdb/selection_cmds.c:921 ../app/pdb/selection_cmds.c:1045
 msgid "Channel to Selection"
 msgstr "Kanala hautapenera"
 
-#: app/actions/colormap-editor-actions.c:43
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:43
 msgid "Colormap Menu"
-msgstr "Kolore-mapa"
+msgstr "Kolore-mapa menua"
 
-#: app/actions/colormap-editor-actions.c:47
-#: app/actions/palette-editor-actions.c:47
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:47
+#: ../app/actions/palette-editor-actions.c:47
 msgid "_Edit Color..."
-msgstr "/_Editatu kolorea..."
+msgstr "_Editatu kolorea..."
 
-#: app/actions/colormap-editor-actions.c:48
-#: app/actions/palette-editor-actions.c:48
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:48
+#: ../app/actions/palette-editor-actions.c:48
 msgid "Edit color"
 msgstr "Editatu kolorea"
 
-#: app/actions/colormap-editor-actions.c:56
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:56
 msgid "_Add Color from FG"
-msgstr "/_Gehitu kolorea AurPl-tik"
+msgstr "_Gehitu kolorea AurPl-tik"
 
-#: app/actions/colormap-editor-actions.c:57
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:57
 msgid "Add color from FG"
-msgstr "/_Gehitu kolorea AurPl-tik"
+msgstr "Gehitu kolorea AurPl-tik"
 
-#: app/actions/colormap-editor-actions.c:62
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:62
 msgid "_Add Color from BG"
-msgstr "/_Gehitu kolorea AtzPl-tik"
+msgstr "_Gehitu kolorea AtzPl-tik"
 
-#: app/actions/colormap-editor-actions.c:63
-#, fuzzy
+#: ../app/actions/colormap-editor-actions.c:63
 msgid "Add color from BG"
-msgstr "/_Gehitu kolorea AtzPl-tik"
+msgstr "Gehitu kolorea AtzPl-tik"
 
-#: app/actions/colormap-editor-commands.c:70
-#, fuzzy, c-format
+#: ../app/actions/colormap-editor-commands.c:70
+#, c-format
 msgid "Edit colormap entry #%d"
-msgstr "Editatu kolore-paletaren sarrera"
+msgstr "Editatu kolore-paletaren #%d sarrera"
 
-#: app/actions/colormap-editor-commands.c:76
-#, fuzzy
+#: ../app/actions/colormap-editor-commands.c:76
 msgid "Edit Colormap Entry"
 msgstr "Editatu kolore-paletaren sarrera"
 
-#: app/actions/context-actions.c:46
-#, fuzzy
+#: ../app/actions/context-actions.c:46
 msgid "_Context"
-msgstr "/Laguntza/_Testuinguru-laguntza"
+msgstr "_Testuingurua"
 
-#: app/actions/context-actions.c:47 app/actions/layers-actions.c:53
-#: app/actions/plug-in-actions.c:64
-#, fuzzy
+#: ../app/actions/context-actions.c:47 ../app/actions/layers-actions.c:53
+#: ../app/actions/plug-in-actions.c:64
 msgid "_Colors"
-msgstr "Kolorea"
+msgstr "_Koloreak"
 
-#: app/actions/context-actions.c:48 app/actions/layers-actions.c:59
-#, fuzzy
+#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:59
 msgid "_Opacity"
-msgstr "Opakutasuna"
+msgstr "_Opakutasuna"
 
-#: app/actions/context-actions.c:49
-#, fuzzy
+#: ../app/actions/context-actions.c:49
 msgid "Paint _Mode"
-msgstr "Editatze-modua"
+msgstr "Margotze-modua"
 
-#: app/actions/context-actions.c:50
-#, fuzzy
+#: ../app/actions/context-actions.c:50
 msgid "_Tool"
-msgstr "/_Tresnak"
+msgstr "_Tresnak"
 
-#: app/actions/context-actions.c:51 app/dialogs/preferences-dialog.c:1627
+#: ../app/actions/context-actions.c:51
+#: ../app/dialogs/preferences-dialog.c:1627
 msgid "_Brush"
 msgstr "_Brotxa"
 
-#: app/actions/context-actions.c:52 app/actions/plug-in-actions.c:78
-#: app/dialogs/preferences-dialog.c:1630
+#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:78
+#: ../app/dialogs/preferences-dialog.c:1630
 msgid "_Pattern"
 msgstr "_Eredua"
 
-#: app/actions/context-actions.c:53
-#, fuzzy
+#: ../app/actions/context-actions.c:53
 msgid "_Palette"
-msgstr "Paleta"
+msgstr "_Paleta"
 
-#: app/actions/context-actions.c:54 app/dialogs/palette-import-dialog.c:219
-#: app/dialogs/preferences-dialog.c:1633
+#: ../app/actions/context-actions.c:54
+#: ../app/dialogs/palette-import-dialog.c:219
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "_Gradient"
 msgstr "_Gradientea"
 
-#: app/actions/context-actions.c:55
-#, fuzzy
+#: ../app/actions/context-actions.c:55
 msgid "_Font"
-msgstr "_Letra-tipoa:"
+msgstr "_Letra-tipoa"
 
-#: app/actions/context-actions.c:57
-#, fuzzy
+#: ../app/actions/context-actions.c:57
 msgid "_Shape"
-msgstr "Forma"
+msgstr "_Forma"
 
-#: app/actions/context-actions.c:58
-#, fuzzy
+#: ../app/actions/context-actions.c:58
 msgid "_Radius"
-msgstr "Erradioa:"
+msgstr "_Erradioa"
 
-#: app/actions/context-actions.c:59
-#, fuzzy
+#: ../app/actions/context-actions.c:59
 msgid "S_pikes"
-msgstr "pixel"
+msgstr "_Erpinak"
 
-#: app/actions/context-actions.c:60
-#, fuzzy
+#: ../app/actions/context-actions.c:60
 msgid "_Hardness"
-msgstr "Gogortasuna"
+msgstr "_Gogortasuna"
 
-#: app/actions/context-actions.c:61
-#, fuzzy
+#: ../app/actions/context-actions.c:61
 msgid "_Aspect"
-msgstr "Perspektiba"
+msgstr "A_spektua"
 
-#: app/actions/context-actions.c:62
-#, fuzzy
+#: ../app/actions/context-actions.c:62
 msgid "A_ngle"
-msgstr "Angelua:"
+msgstr "A_ngelua"
 
-#: app/actions/context-actions.c:65
-#, fuzzy
+#: ../app/actions/context-actions.c:65
 msgid "_Default Colors"
-msgstr "/Tresnak/Ko_lore lehenetsiak"
+msgstr "Ko_lore lehenetsiak"
 
-#: app/actions/context-actions.c:70
-#, fuzzy
+#: ../app/actions/context-actions.c:70
 msgid "S_wap Colors"
-msgstr "/Tresnak/Trukatu k_oloreak"
+msgstr "Trukatu k_oloreak"
 
-#: app/actions/data-commands.c:79 app/core/gimpimage.c:1283
-#: app/core/gimppalette-import.c:219 app/core/gimppalette.c:523
-#: app/core/gimppalette.c:634 app/dialogs/palette-import-dialog.c:684
-#: app/pdb/image_cmds.c:3760
+#: ../app/actions/data-commands.c:79 ../app/core/gimpimage.c:1285
+#: ../app/core/gimppalette-import.c:219 ../app/core/gimppalette.c:523
+#: ../app/core/gimppalette.c:634 ../app/dialogs/palette-import-dialog.c:684
+#: ../app/pdb/image_cmds.c:3771
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: app/actions/data-commands.c:149
-#, fuzzy
+#: ../app/actions/data-commands.c:149
 msgid "Delete Object"
-msgstr "Ezabatu datuen objektua"
+msgstr "Ezabatu objektua"
 
-#: app/actions/data-commands.c:167
+#: ../app/actions/data-commands.c:167
 #, c-format
 msgid "Are you sure you want to delete '%s' from the list and from disk?"
 msgstr "Ziur zaude \"%s\" ezabatu nahi duzula zerrendatik eta diskotik?"
 
-#: app/actions/dialogs-actions.c:38
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:38
 msgid "_Dialogs"
-msgstr "/E_lkarrizketa-koadroak"
+msgstr "E_lkarrizketa-koadroak"
 
-#: app/actions/dialogs-actions.c:39
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:39
 msgid "Create New Doc_k"
-msgstr "/Elkarrizketa-koadroak/Sortu leiho atrakagarri be_rria"
+msgstr "Sortu leiho atrakagarri be_rria"
 
-#: app/actions/dialogs-actions.c:42
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:42
 msgid "_Layers, Channels & Paths"
-msgstr ""
-"/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/_Geruzak, kanalak eta "
-"bideak"
+msgstr "_Geruzak, kanalak eta bideak"
 
-#: app/actions/dialogs-actions.c:47
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:47
 msgid "_Brushes, Patterns & Gradients"
-msgstr ""
-"/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/_Brotxak, ereduak eta "
-"gradienteak"
+msgstr "_Brotxak, ereduak eta gradienteak"
 
-#: app/actions/dialogs-actions.c:52
+#: ../app/actions/dialogs-actions.c:52
 msgid "_Misc. Stuff"
-msgstr ""
+msgstr "_Hainbat gauza"
 
-#: app/actions/dialogs-actions.c:57
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:57
 msgid "Tool_box"
-msgstr "/Tresnak/Tresna-kut_xa"
+msgstr "Tresna-kut_xa"
 
-#: app/actions/dialogs-actions.c:65
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:65
 msgid "Tool _Options"
 msgstr "Tresna-aukerak"
 
-#: app/actions/dialogs-actions.c:70
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:70
 msgid "_Device Status"
-msgstr "Gailuaren egoera"
+msgstr "_Gailuaren egoera"
 
-#: app/actions/dialogs-actions.c:75
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:75
 msgid "_Layers"
-msgstr "Geruzak"
+msgstr "_Geruzak"
 
-#: app/actions/dialogs-actions.c:80
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:80
 msgid "_Channels"
-msgstr "Kanalak"
+msgstr "_Kanalak"
 
-#: app/actions/dialogs-actions.c:85 app/tools/gimpvectortool.c:162
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:85 ../app/tools/gimpvectortool.c:162
 msgid "_Paths"
-msgstr "Bideak"
+msgstr "_Bideak"
 
-#: app/actions/dialogs-actions.c:90
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:90
 msgid "Color_map"
-msgstr "Kolore-mapa"
+msgstr "_Kolore-mapa"
 
-#: app/actions/dialogs-actions.c:95
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:95
 msgid "Histogra_m"
-msgstr "Histograma"
+msgstr "_Histograma"
 
-#: app/actions/dialogs-actions.c:100
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:100
 msgid "_Selection Editor"
-msgstr "Hautapenaren editorea"
+msgstr "_Hautapenaren editorea"
 
-#: app/actions/dialogs-actions.c:105
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:105
 msgid "Na_vigation"
-msgstr "Nabigazioa"
+msgstr "_Nabigazioa"
 
-#: app/actions/dialogs-actions.c:110
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:110
 msgid "Undo _History"
-msgstr "Desegin historia"
+msgstr "_Desegin historia"
 
-#: app/actions/dialogs-actions.c:115
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:115
 msgid "Colo_rs"
-msgstr "Kolorea"
+msgstr "Kolo_reak"
 
-#: app/actions/dialogs-actions.c:120
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:120
 msgid "_Brushes"
-msgstr "Brotxak"
+msgstr "_Brotxak"
 
-#: app/actions/dialogs-actions.c:125
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:125
 msgid "P_atterns"
-msgstr "Ereduak"
+msgstr "_Ereduak"
 
-#: app/actions/dialogs-actions.c:130
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:130
 msgid "_Gradients"
-msgstr "_Gradientea"
+msgstr "_Gradienteak"
 
-#: app/actions/dialogs-actions.c:135
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:135
 msgid "Pal_ettes"
-msgstr "Paletak"
+msgstr "Pal_etak"
 
-#: app/actions/dialogs-actions.c:140
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:140
 msgid "_Fonts"
-msgstr "Letra-tipoak"
+msgstr "_Letra-tipoak"
 
-#: app/actions/dialogs-actions.c:145
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:145
 msgid "B_uffers"
-msgstr "Bufferrak"
+msgstr "B_ufferrak"
 
-#: app/actions/dialogs-actions.c:150
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:150
 msgid "_Images"
-msgstr "Irudiak"
+msgstr "_Irudiak"
 
-#: app/actions/dialogs-actions.c:155
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:155
 msgid "Document Histor_y"
-msgstr "Dokumentuaren historia"
+msgstr "Dokumentuaren h_istoria"
 
-#: app/actions/dialogs-actions.c:160
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:160
 msgid "_Templates"
-msgstr "Txantiloiak"
+msgstr "_Txantiloiak"
 
-#: app/actions/dialogs-actions.c:165
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:165
 msgid "T_ools"
-msgstr "Tresnak"
+msgstr "T_resnak"
 
-#: app/actions/dialogs-actions.c:170
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:170
 msgid "Error Co_nsole"
-msgstr "Errore-kontsola"
+msgstr "Errore-_kontsola"
 
-#: app/actions/dialogs-actions.c:180
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:180
 msgid "_Preferences"
-msgstr "Hobespenak"
+msgstr "_Hobespenak"
 
-#: app/actions/dialogs-actions.c:185
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:185
 msgid "_Module Manager"
-msgstr "Modulu-kudeatzailea"
+msgstr "_Modulu-kudeatzailea"
 
-#: app/actions/dialogs-actions.c:190
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:190
 msgid "_Tip of the Day"
-msgstr "/Laguntza/_Eguneko aholkua"
+msgstr "_Eguneko aholkua"
 
-#: app/actions/dialogs-actions.c:195
-#, fuzzy
+#: ../app/actions/dialogs-actions.c:195
 msgid "_About"
-msgstr "_Automatikoa"
+msgstr "_Honi buruz"
 
-#: app/actions/dockable-actions.c:49
+#: ../app/actions/dockable-actions.c:49
 msgid "Dialogs Menu"
 msgstr "Elkarrizketa-koadroen menua"
 
-#: app/actions/dockable-actions.c:53
-#, fuzzy
+#: ../app/actions/dockable-actions.c:53
 msgid "_Add Tab"
-msgstr "/_Gehitu fitxa"
+msgstr "_Gehitu fitxa"
 
-#: app/actions/dockable-actions.c:54
-#, fuzzy
+#: ../app/actions/dockable-actions.c:54
 msgid "_Preview Size"
-msgstr "/Aurrebistaren tamaina"
+msgstr "_Aurrebistaren tamaina"
 
-#: app/actions/dockable-actions.c:55
-#, fuzzy
+#: ../app/actions/dockable-actions.c:55
 msgid "_Tab Style"
-msgstr "/_Fitxa-estiloa"
+msgstr "_Fitxa-estiloa"
 
-#: app/actions/dockable-actions.c:58
-#, fuzzy
+#: ../app/actions/dockable-actions.c:58
 msgid "_Close Tab"
-msgstr "/_Kendu fitxa"
+msgstr "_Kendu fitxa"
 
-#: app/actions/dockable-actions.c:63
-#, fuzzy
+#: ../app/actions/dockable-actions.c:63
 msgid "_Detach Tab"
-msgstr "/_Desuztartu fitxa"
+msgstr "_Desuztartu fitxa"
 
-#: app/actions/dockable-actions.c:68
+#: ../app/actions/dockable-actions.c:68
 msgid "M_ove to Screen..."
-msgstr ""
+msgstr "E_raman pantailara..."
 
-#: app/actions/dockable-actions.c:76
-#, fuzzy
+#: ../app/actions/dockable-actions.c:76
 msgid "_Show Image Selection"
-msgstr "Erakutsi _hautapena"
+msgstr "_Erakutsi irudi-hautapena"
 
-#: app/actions/dockable-actions.c:82
-#, fuzzy
+#: ../app/actions/dockable-actions.c:82
 msgid "Auto _Follow Active Image"
-msgstr "/Jarraitu automatikoki _irudi aktiboari"
+msgstr "Jarraitu automatikoki _irudi aktiboari"
 
-#: app/actions/dockable-actions.c:101
-#, fuzzy
+#: ../app/actions/dockable-actions.c:101
 msgid "_Tiny"
-msgstr "Txikia"
+msgstr "Tx_ikitxoa"
 
-#: app/actions/dockable-actions.c:102
-#, fuzzy
+#: ../app/actions/dockable-actions.c:102
 msgid "E_xtra Small"
-msgstr "Oso txikia"
+msgstr "O_so txikia"
 
-#: app/actions/dockable-actions.c:103
-#, fuzzy
+#: ../app/actions/dockable-actions.c:103
 msgid "_Small"
-msgstr "Txikia"
+msgstr "T_xikia"
 
-#: app/actions/dockable-actions.c:104
-#, fuzzy
+#: ../app/actions/dockable-actions.c:104
 msgid "_Medium"
-msgstr "Tartekoa"
+msgstr "_Tartekoa"
 
-#: app/actions/dockable-actions.c:105
-#, fuzzy
+#: ../app/actions/dockable-actions.c:105
 msgid "_Large"
-msgstr "Handia"
+msgstr "_Handia"
 
-#: app/actions/dockable-actions.c:106
-#, fuzzy
+#: ../app/actions/dockable-actions.c:106
 msgid "Ex_tra Large"
-msgstr "Oso handia"
+msgstr "Oso h_andia"
 
-#: app/actions/dockable-actions.c:107
-#, fuzzy
+#: ../app/actions/dockable-actions.c:107
 msgid "_Huge"
-msgstr "Itzela"
+msgstr "_Itzela"
 
-#: app/actions/dockable-actions.c:108
-#, fuzzy
+#: ../app/actions/dockable-actions.c:108
 msgid "_Enormous"
-msgstr "Ikaragarria"
+msgstr "I_karagarria"
 
-#: app/actions/dockable-actions.c:109
-#, fuzzy
+#: ../app/actions/dockable-actions.c:109
 msgid "_Gigantic"
-msgstr "Erraldoia"
+msgstr "_Erraldoia"
 
-#: app/actions/dockable-actions.c:114
-#, fuzzy
+#: ../app/actions/dockable-actions.c:114
 msgid "_Icon"
-msgstr "I_konoa:"
+msgstr "I_konoa"
 
-#: app/actions/dockable-actions.c:115
-#, fuzzy
+#: ../app/actions/dockable-actions.c:115
 msgid "Current _Status"
-msgstr "Uneko egoera"
+msgstr "Uneko _egoera"
 
-#: app/actions/dockable-actions.c:116
-#, fuzzy
+#: ../app/actions/dockable-actions.c:116
 msgid "_Text"
-msgstr "Testua"
+msgstr "_Testua"
 
-#: app/actions/dockable-actions.c:117
-#, fuzzy
+#: ../app/actions/dockable-actions.c:117
 msgid "I_con & Text"
-msgstr "Ikonoa eta testua"
+msgstr "I_konoa eta testua"
 
-#: app/actions/dockable-actions.c:118
-#, fuzzy
+#: ../app/actions/dockable-actions.c:118
 msgid "St_atus & Text"
-msgstr "Egoera eta testua"
+msgstr "_Egoera eta testua"
 
-#: app/actions/dockable-actions.c:127
-#, fuzzy
+#: ../app/actions/dockable-actions.c:127
 msgid "View as _List"
-msgstr "/Ikusi _zerrenda gisa"
+msgstr "Ikusi _zerrenda gisa"
 
-#: app/actions/dockable-actions.c:132
-#, fuzzy
+#: ../app/actions/dockable-actions.c:132
 msgid "View as _Grid"
-msgstr "/Ikusi _sareta gisa"
+msgstr "Ikusi _sareta gisa"
 
-#: app/actions/documents-actions.c:42
+#: ../app/actions/documents-actions.c:42
 msgid "Documents Menu"
 msgstr "Dokumentu-menua"
 
-#: app/actions/documents-actions.c:46
-#, fuzzy
+#: ../app/actions/documents-actions.c:46
 msgid "_Open Image"
-msgstr "/_Ireki irudia"
+msgstr "_Ireki irudia"
 
-#: app/actions/documents-actions.c:47
-#, fuzzy
+#: ../app/actions/documents-actions.c:47
 msgid "Open the selected entry"
-msgstr "Kendu hautatutako sarrera"
+msgstr "Ireki hautatutako sarrera"
 
-#: app/actions/documents-actions.c:52
-#, fuzzy
+#: ../app/actions/documents-actions.c:52
 msgid "_Raise or Open Image"
-msgstr "/Igo edo ire_ki irudia"
+msgstr "Igo edo ire_ki irudia"
 
-#: app/actions/documents-actions.c:53
+#: ../app/actions/documents-actions.c:53
 msgid "Raise window if already open"
-msgstr ""
+msgstr "Igo leihoa irekita badago"
 
-#: app/actions/documents-actions.c:58
-#, fuzzy
+#: ../app/actions/documents-actions.c:58
 msgid "File Open _Dialog"
-msgstr "/_Fitxategiak irekitzeko elkarrizketa-koadroa"
+msgstr "_Fitxategiak irekitzeko elkarrizketa-koadroa"
 
-#: app/actions/documents-actions.c:59
-#, fuzzy
+#: ../app/actions/documents-actions.c:59
 msgid "Open image dialog"
-msgstr "Ireki irudia"
+msgstr "Ireki irudi-elkarrizketa"
 
-#: app/actions/documents-actions.c:64
-#, fuzzy
+#: ../app/actions/documents-actions.c:64
 msgid "Remove _Entry"
-msgstr "/Kendu _sarrera"
+msgstr "Kendu _sarrera"
 
-#: app/actions/documents-actions.c:65
-#, fuzzy
+#: ../app/actions/documents-actions.c:65
 msgid "Remove the selected entry"
 msgstr "Kendu hautatutako sarrera"
 
-#: app/actions/documents-actions.c:70
-#, fuzzy
+#: ../app/actions/documents-actions.c:70
 msgid "Recreate _Preview"
-msgstr "/Sortu berriro _aurrebista"
+msgstr "Sortu berriro _aurrebista"
 
-#: app/actions/documents-actions.c:71
-#, fuzzy
+#: ../app/actions/documents-actions.c:71
 msgid "Recreate preview"
-msgstr "/Sortu berriro _aurrebista"
+msgstr "Sortu berriro aurrebista"
 
-#: app/actions/documents-actions.c:76
-#, fuzzy
+#: ../app/actions/documents-actions.c:76
 msgid "Reload _all Previews"
-msgstr "/Birkargatu aurrebis_ta guztiak"
+msgstr "Birkargatu aurrebis_ta guztiak"
 
-#: app/actions/documents-actions.c:77
-#, fuzzy
+#: ../app/actions/documents-actions.c:77
 msgid "Reload all previews"
-msgstr "/Birkargatu aurrebis_ta guztiak"
+msgstr "Birkargatu aurrebis_ta guztiak"
 
-#: app/actions/documents-actions.c:82
-#, fuzzy
+#: ../app/actions/documents-actions.c:82
 msgid "Remove Dangling E_ntries"
-msgstr "/Kendu zintzilik dauden _sarrerak "
+msgstr "Kendu zintzilik dauden _sarrerak "
 
-#: app/actions/documents-actions.c:83
-#, fuzzy
+#: ../app/actions/documents-actions.c:83
 msgid "Remove dangling entries"
-msgstr "/Kendu zintzilik dauden _sarrerak "
+msgstr "Kendu zintzilik dauden sarrerak"
 
-#: app/actions/documents-commands.c:251 app/actions/file-commands.c:170
-#: app/dialogs/file-open-dialog.c:198 app/dialogs/file-open-dialog.c:249
-#: app/dialogs/file-open-location-dialog.c:193
-#: app/display/gimpdisplayshell-dnd.c:334 app/widgets/gimplayertreeview.c:804
-#: app/widgets/gimptoolbox-dnd.c:125
+#: ../app/actions/documents-commands.c:251 ../app/actions/file-commands.c:170
+#: ../app/dialogs/file-open-dialog.c:198 ../app/dialogs/file-open-dialog.c:249
+#: ../app/dialogs/file-open-location-dialog.c:195
+#: ../app/display/gimpdisplayshell-dnd.c:334
+#: ../app/widgets/gimplayertreeview.c:804 ../app/widgets/gimptoolbox-dnd.c:125
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1185,272 +1054,236 @@ msgstr ""
 "\n"
 "%s"
 
-#: app/actions/drawable-actions.c:45
-#, fuzzy
+#: ../app/actions/drawable-actions.c:45
 msgid "_Desaturate"
-msgstr "Desasetu"
+msgstr "_Desasetu"
 
-#: app/actions/drawable-actions.c:50
-#, fuzzy
+#: ../app/actions/drawable-actions.c:50
 msgid "_Equalize"
-msgstr "Ekualizatu"
+msgstr "_Ekualizatu"
 
-#: app/actions/drawable-actions.c:55
-#, fuzzy
+#: ../app/actions/drawable-actions.c:55
 msgid "In_vert"
-msgstr "Alderantzikatu"
+msgstr "_Alderantzikatu"
 
-#: app/actions/drawable-actions.c:60
+#: ../app/actions/drawable-actions.c:60
 msgid "_White Balance"
-msgstr ""
+msgstr "_Zuri-balantzea"
 
-#: app/actions/drawable-actions.c:65
-#, fuzzy
+#: ../app/actions/drawable-actions.c:65
 msgid "_Offset..."
-msgstr "Desplazatu"
+msgstr "_Desplazamendua..."
 
-#: app/actions/drawable-actions.c:73 app/actions/vectors-actions.c:153
-#, fuzzy
+#: ../app/actions/drawable-actions.c:73 ../app/actions/vectors-actions.c:153
 msgid "_Linked"
-msgstr "Marra"
+msgstr "_Estekatua"
 
-#: app/actions/drawable-actions.c:79 app/actions/vectors-actions.c:147
-#, fuzzy
+#: ../app/actions/drawable-actions.c:79 ../app/actions/vectors-actions.c:147
 msgid "_Visible"
-msgstr "/_Fitxategia"
+msgstr "_Ikusgai"
 
-#: app/actions/drawable-actions.c:88 app/actions/image-actions.c:141
-#, fuzzy
+#: ../app/actions/drawable-actions.c:88 ../app/actions/image-actions.c:141
 msgid "Flip _Horizontally"
-msgstr "_Horizontala:"
+msgstr "Irauli _horizontalki"
 
-#: app/actions/drawable-actions.c:93 app/actions/image-actions.c:146
-#, fuzzy
+#: ../app/actions/drawable-actions.c:93 ../app/actions/image-actions.c:146
 msgid "Flip _Vertically"
-msgstr "_Bertikala:"
+msgstr "Irauli _bertikalki"
 
 #. please use the degree symbol in the translation
-#: app/actions/drawable-actions.c:101 app/actions/image-actions.c:155
-#, fuzzy
+#: ../app/actions/drawable-actions.c:101 ../app/actions/image-actions.c:155
 msgid "Rotate 90 degrees _CW"
-msgstr "/Geruza/Eraldatu/Bira_tu 90 gradu erlojuaren noranzkoan"
+msgstr "Biratu 90 gradu _EN"
 
-#: app/actions/drawable-actions.c:106 app/actions/image-actions.c:160
-#, fuzzy
+#: ../app/actions/drawable-actions.c:106 ../app/actions/image-actions.c:160
 msgid "Rotate _180 degrees"
-msgstr "/Irudia/Eraldatu/Bi_ratu 180 gradu"
+msgstr "Biratu _180 gradu"
 
-#: app/actions/drawable-actions.c:111 app/actions/image-actions.c:165
-#, fuzzy
+#: ../app/actions/drawable-actions.c:111 ../app/actions/image-actions.c:165
 msgid "Rotate 90 degrees CC_W"
-msgstr "/Irudia/Eraldatu/Biratu 90 gradu erlo_juaren kontrako noranzkoan"
+msgstr "Biratu 90 gradu E_KN"
 
-#: app/actions/drawable-commands.c:58
+#: ../app/actions/drawable-commands.c:58
 msgid "Desaturate operates only on RGB color layers."
-msgstr "Desasetuk RGB koloreko marrazgaietan bakarrik funtzionatzen du."
+msgstr "Desasetuk GBU koloreko marrazgaietan bakarrik funtzionatzen du."
 
-#: app/actions/drawable-commands.c:76
+#: ../app/actions/drawable-commands.c:76
 msgid "Equalize does not operate on indexed layers."
 msgstr "Ekualizatzeak ez du marrazgai indexatuetan funtzionatzen."
 
-#: app/actions/drawable-commands.c:94
+#: ../app/actions/drawable-commands.c:94
 msgid "Invert does not operate on indexed layers."
 msgstr "Alderantzikatzeak ez du marrazgai indexatuetan funtzionatzen."
 
-#: app/actions/drawable-commands.c:114
-#, fuzzy
+#: ../app/actions/drawable-commands.c:114
 msgid "White Balance operates only on RGB color layers."
-msgstr "Kolore-balantzeak RGB koloreko geruzetan bakarrik funtzionatzen du."
+msgstr "Zuri-balantzeak GBU koloreko geruzetan bakarrik funtzionatzen du."
 
-#: app/actions/edit-actions.c:61
-#, fuzzy
+#: ../app/actions/edit-actions.c:61
 msgid "_Edit"
-msgstr "/_Editatu"
+msgstr "_Editatu"
 
-#: app/actions/edit-actions.c:62
-#, fuzzy
+#: ../app/actions/edit-actions.c:62
 msgid "_Buffer"
-msgstr "Bufferrak"
+msgstr "_Bufferra"
 
-#: app/actions/edit-actions.c:65 app/actions/edit-actions.c:230
+#: ../app/actions/edit-actions.c:65 ../app/actions/edit-actions.c:230
 msgid "_Undo"
 msgstr "_Desegin"
 
-#: app/actions/edit-actions.c:66 app/dialogs/dialogs.c:183
-#: app/pdb/internal_procs.c:209
+#: ../app/actions/edit-actions.c:66 ../app/dialogs/dialogs.c:183
+#: ../app/pdb/internal_procs.c:209
 msgid "Undo"
 msgstr "Desegin"
 
-#: app/actions/edit-actions.c:71 app/actions/edit-actions.c:231
+#: ../app/actions/edit-actions.c:71 ../app/actions/edit-actions.c:231
 msgid "_Redo"
 msgstr "_Berregin"
 
-#: app/actions/edit-actions.c:72
+#: ../app/actions/edit-actions.c:72
 msgid "Redo"
 msgstr "Berregin"
 
-#: app/actions/edit-actions.c:77
-#, fuzzy
+#: ../app/actions/edit-actions.c:77
 msgid "_Clear Undo History"
-msgstr "Desegin historia"
+msgstr "_Garbitu desegite-historia"
 
-#: app/actions/edit-actions.c:78
-#, fuzzy
+#: ../app/actions/edit-actions.c:78
 msgid "Clear undo history..."
-msgstr "Desegin historia"
+msgstr "Garbitu desegite-historia..."
 
-#: app/actions/edit-actions.c:83
-#, fuzzy
+#: ../app/actions/edit-actions.c:83
 msgid "Cu_t"
-msgstr "Ebaki"
+msgstr "_Ebaki"
 
-#: app/actions/edit-actions.c:88
-#, fuzzy
+#: ../app/actions/edit-actions.c:88
 msgid "_Copy"
-msgstr "Kopiatu"
+msgstr "_Kopiatu"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: app/actions/edit-actions.c:93
-#, fuzzy
+#: ../app/actions/edit-actions.c:93
 msgid "Copy _Visible"
-msgstr "/_Fitxategia"
+msgstr "Kopia i_kusgaia"
 
-#: app/actions/edit-actions.c:98
-#, fuzzy
+#: ../app/actions/edit-actions.c:98
 msgid "_Paste"
-msgstr "Itsatsi"
+msgstr "_Itsatsi"
 
-#: app/actions/edit-actions.c:103
-#, fuzzy
+#: ../app/actions/edit-actions.c:103
 msgid "Paste _Into"
-msgstr "Itsatsi hemen"
+msgstr "Itsatsi _hemen"
 
-#: app/actions/edit-actions.c:108
-#, fuzzy
+#: ../app/actions/edit-actions.c:108
 msgid "Paste as _New"
-msgstr "Itsatsi berri gisa"
+msgstr "Itsatsi _berri gisa"
 
-#: app/actions/edit-actions.c:113
-#, fuzzy
+#: ../app/actions/edit-actions.c:113
 msgid "Cu_t Named..."
-msgstr "Ebaki izenduna"
+msgstr "E_baki izenduna..."
 
-#: app/actions/edit-actions.c:118
-#, fuzzy
+#: ../app/actions/edit-actions.c:118
 msgid "_Copy Named..."
-msgstr "Kopiatu izenduna"
+msgstr "_Kopiatu izenduna..."
 
-#: app/actions/edit-actions.c:123
-#, fuzzy
+#: ../app/actions/edit-actions.c:123
 msgid "_Paste Named..."
-msgstr "/Editatu/Bufferra/I_tsatsi izenduna..."
+msgstr "I_tsatsi izenduna..."
 
-#: app/actions/edit-actions.c:128
-#, fuzzy
+#: ../app/actions/edit-actions.c:128
 msgid "Cl_ear"
-msgstr "Garbitu"
+msgstr "_Garbitu"
 
-#: app/actions/edit-actions.c:136
-#, fuzzy
+#: ../app/actions/edit-actions.c:136
 msgid "Fill with _FG Color"
-msgstr "Bete aurreko planoaren koloreaz"
+msgstr "Bete AurPl-ren koloreaz."
 
-#: app/actions/edit-actions.c:141
-#, fuzzy
+#: ../app/actions/edit-actions.c:141
 msgid "Fill with B_G Color"
-msgstr "Bete atzeko planoaren koloreaz"
+msgstr "Bete A_tzPl-aren koloreaz"
 
-#: app/actions/edit-actions.c:146
-#, fuzzy
+#: ../app/actions/edit-actions.c:146
 msgid "Fill with P_attern"
-msgstr "Bete ereduarekin"
+msgstr "Bete _ereduarekin"
 
-#: app/actions/edit-actions.c:214
+#: ../app/actions/edit-actions.c:214
 #, c-format
 msgid "_Undo %s"
 msgstr "_Desegin %s"
 
-#: app/actions/edit-actions.c:219
+#: ../app/actions/edit-actions.c:219
 #, c-format
 msgid "_Redo %s"
 msgstr "_Berregin %s"
 
-#: app/actions/edit-commands.c:104
-#, fuzzy
+#: ../app/actions/edit-commands.c:104
 msgid "Clear Undo History"
-msgstr "Desegin historia"
+msgstr "Garbitu desegite-historia"
 
-#: app/actions/edit-commands.c:122
+#: ../app/actions/edit-commands.c:122
 msgid "Really clear image's undo history?"
-msgstr ""
+msgstr "Irudiaren desegite-historia ezabatzea nahi duzu?"
 
-#: app/actions/edit-commands.c:210
+#: ../app/actions/edit-commands.c:210
 msgid "Cut Named"
 msgstr "Ebaki izenduna"
 
-#: app/actions/edit-commands.c:213 app/actions/edit-commands.c:233
+#: ../app/actions/edit-commands.c:213 ../app/actions/edit-commands.c:233
 msgid "Enter a name for this buffer"
 msgstr "Sartu buffer honen izena"
 
-#: app/actions/edit-commands.c:230
+#: ../app/actions/edit-commands.c:230
 msgid "Copy Named"
 msgstr "Kopiatu izenduna"
 
-#: app/actions/edit-commands.c:337
+#: ../app/actions/edit-commands.c:337
 msgid "There is no active layer or channel to cut from."
 msgstr "Ez dago ebakitzeko geruza edo kanal aktiborik."
 
-#: app/actions/edit-commands.c:349 app/actions/edit-commands.c:386
+#: ../app/actions/edit-commands.c:349 ../app/actions/edit-commands.c:386
 msgid "(Unnamed Buffer)"
 msgstr "(Buffer izengabea)"
 
-#: app/actions/edit-commands.c:374
+#: ../app/actions/edit-commands.c:374
 msgid "There is no active layer or channel to copy from."
 msgstr "Ez dago kopiatzeko geruza edo kanal aktiborik."
 
-#: app/actions/error-console-actions.c:40
+#: ../app/actions/error-console-actions.c:40
 msgid "Error Console Menu"
 msgstr "Errore-kontsolaren menua"
 
-#: app/actions/error-console-actions.c:44
-#, fuzzy
+#: ../app/actions/error-console-actions.c:44
 msgid "_Clear Errors"
-msgstr "/_Garbitu erroreak"
+msgstr "_Garbitu erroreak"
 
-#: app/actions/error-console-actions.c:45
-#, fuzzy
+#: ../app/actions/error-console-actions.c:45
 msgid "Clear errors"
 msgstr "Garbitu erroreak"
 
-#: app/actions/error-console-actions.c:53
-#, fuzzy
+#: ../app/actions/error-console-actions.c:53
 msgid "Save _All Errors to File..."
-msgstr "/Gorde _errore guztiak fitxategian..."
+msgstr "Gorde _errore guztiak fitxategian..."
 
-#: app/actions/error-console-actions.c:54
-#, fuzzy
+#: ../app/actions/error-console-actions.c:54
 msgid "Save all errors"
-msgstr "Garbitu erroreak"
+msgstr "Garbitu errore guztiak"
 
-#: app/actions/error-console-actions.c:59
-#, fuzzy
+#: ../app/actions/error-console-actions.c:59
 msgid "Save _Selection to File..."
-msgstr "/Gorde _hautapena fitxategian..."
+msgstr "Gorde _hautapena fitxategian..."
 
-#: app/actions/error-console-actions.c:60
-#, fuzzy
+#: ../app/actions/error-console-actions.c:60
 msgid "Save selection"
-msgstr "Aldatu hautapena lekuz"
+msgstr "Gorde hautapena"
 
-#: app/actions/error-console-commands.c:69
+#: ../app/actions/error-console-commands.c:69
 msgid "Cannot save. Nothing is selected."
 msgstr "Ezin da gorde. Ez dago ezer hautatuta."
 
-#: app/actions/error-console-commands.c:80
+#: ../app/actions/error-console-commands.c:80
 msgid "Save Error Log to File"
 msgstr "Gorde errore-egunkaria fitxategian"
 
-#: app/actions/error-console-commands.c:132
+#: ../app/actions/error-console-commands.c:132
 #, c-format
 msgid ""
 "Error writing file '%s':\n"
@@ -1459,67 +1292,55 @@ msgstr ""
 "Errorea '%s' fitxategia idaztean:\n"
 "%s"
 
-#: app/actions/file-actions.c:61
-#, fuzzy
+#: ../app/actions/file-actions.c:61
 msgid "_File"
-msgstr "/_Fitxategia"
+msgstr "_Fitxategia"
 
-#: app/actions/file-actions.c:62
-#, fuzzy
+#: ../app/actions/file-actions.c:62
 msgid "Open _Recent"
-msgstr "/Fitxategia/Ire_ki erabili berria"
+msgstr "Ire_ki erabili berria"
 
-#: app/actions/file-actions.c:63
-#, fuzzy
+#: ../app/actions/file-actions.c:63
 msgid "_Acquire"
-msgstr "/Fitxategia/E_skuratu"
+msgstr "E_skuratu"
 
-#: app/actions/file-actions.c:66 app/actions/file-actions.c:71
-#, fuzzy
+#: ../app/actions/file-actions.c:66 ../app/actions/file-actions.c:71
 msgid "_Open..."
-msgstr "/Fitxategia/_Ireki..."
+msgstr "_Ireki..."
 
-#: app/actions/file-actions.c:76
-#, fuzzy
+#: ../app/actions/file-actions.c:76
 msgid "Op_en as Layer..."
-msgstr "/_Geruza berria..."
+msgstr "I_reki geruza gisa..."
 
-#: app/actions/file-actions.c:81
-#, fuzzy
+#: ../app/actions/file-actions.c:81
 msgid "Open _Location..."
-msgstr "Kokalekua:"
+msgstr "Ireki _kokalekua..."
 
-#: app/actions/file-actions.c:86
-#, fuzzy
+#: ../app/actions/file-actions.c:86
 msgid "_Save"
-msgstr "Gorde"
+msgstr "_Gorde"
 
-#: app/actions/file-actions.c:91
-#, fuzzy
+#: ../app/actions/file-actions.c:91
 msgid "Save _as..."
-msgstr "/Fitxategia/Gorde _honela..."
+msgstr "Gorde _honela..."
 
-#: app/actions/file-actions.c:96
-#, fuzzy
+#: ../app/actions/file-actions.c:96
 msgid "Save a Cop_y..."
-msgstr "/Fitxategia/Gode _kopia..."
+msgstr "Gorde _kopia..."
 
-#: app/actions/file-actions.c:101
-#, fuzzy
+#: ../app/actions/file-actions.c:101
 msgid "Save as _Template..."
-msgstr "/Fitxategia/Gorde _txantiloi gisa..."
+msgstr "Gorde _txantiloi gisa..."
 
-#: app/actions/file-actions.c:106
-#, fuzzy
+#: ../app/actions/file-actions.c:106
 msgid "Re_vert..."
-msgstr "Leheneratu"
+msgstr "_Leheneratu..."
 
-#: app/actions/file-actions.c:111
-#, fuzzy
+#: ../app/actions/file-actions.c:111
 msgid "_Quit"
-msgstr "/Fitxategia/_Irten"
+msgstr "_Irten"
 
-#: app/actions/file-commands.c:215 app/dialogs/file-save-dialog.c:281
+#: ../app/actions/file-commands.c:215 ../app/dialogs/file-save-dialog.c:282
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -1530,60 +1351,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: app/actions/file-commands.c:238 app/dialogs/file-save-dialog.c:78
+#: ../app/actions/file-commands.c:238 ../app/dialogs/file-save-dialog.c:78
 msgid "Save Image"
 msgstr "Gorde irudia"
 
-#: app/actions/file-commands.c:254
+#: ../app/actions/file-commands.c:254
 msgid "Save a Copy of the Image"
 msgstr "Gorde irudiaren kopia bat"
 
-#: app/actions/file-commands.c:265
+#: ../app/actions/file-commands.c:265
 msgid "Create New Template"
 msgstr "Sortu txantiloi berria"
 
-#: app/actions/file-commands.c:269
+#: ../app/actions/file-commands.c:269
 msgid "Enter a name for this template"
 msgstr "Sartu txantiloi honentzako izena"
 
-#: app/actions/file-commands.c:291
+#: ../app/actions/file-commands.c:291
 msgid "Revert failed. No file name associated with this image."
 msgstr "Ezin izan da leheneratu. Ez dago irudi honi lotutako fitxategi-izenik."
 
-#: app/actions/file-commands.c:303
+#: ../app/actions/file-commands.c:303
 msgid "Revert Image"
 msgstr "Leheneratu irudia"
 
-#: app/actions/file-commands.c:324
+#: ../app/actions/file-commands.c:324
 #, c-format
 msgid "Revert '%s' to '%s'?"
-msgstr ""
+msgstr "Leheneratu '%s' '%s'(e)ra?"
 
-#: app/actions/file-commands.c:330
-#, fuzzy
+#: ../app/actions/file-commands.c:330
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
 msgstr ""
-"'%s' leheneratu egin nahi duzu\n"
-"'%s'(e)ra?\n"
-"\n"
-"Aldaketa gutiak galduko dituzu, desegiteko informazio guztia barne."
+"Diskoan gordetako irudira leheneratzean, aldaketa guztiak galduko dituzu, "
+"desegiteko informazio guztia barne."
 
-#: app/actions/file-commands.c:380
-#, fuzzy
+#: ../app/actions/file-commands.c:380
 msgid "Open Image as Layer"
-msgstr "Ireki irudia"
+msgstr "Ireki irudia geruza gis"
 
-#: app/actions/file-commands.c:385 app/dialogs/file-open-dialog.c:74
+#: ../app/actions/file-commands.c:385 ../app/dialogs/file-open-dialog.c:74
 msgid "Open Image"
 msgstr "Ireki irudia"
 
-#: app/actions/file-commands.c:451
+#: ../app/actions/file-commands.c:451
 msgid "(Unnamed Template)"
 msgstr "(Txantiloi izengabea)"
 
-#: app/actions/file-commands.c:500
+#: ../app/actions/file-commands.c:500
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -1594,283 +1411,256 @@ msgstr ""
 "\n"
 "%s"
 
-#: app/actions/fonts-actions.c:44
+#: ../app/actions/fonts-actions.c:44
 msgid "Fonts Menu"
 msgstr "Letra-tipoen menua"
 
-#: app/actions/fonts-actions.c:48
-#, fuzzy
+#: ../app/actions/fonts-actions.c:48
 msgid "_Rescan Font List"
-msgstr "/_Eskaneatu berriro letra-tipoen zerrenda"
+msgstr "_Eskaneatu berriro letra-tipoen zerrenda"
 
-#: app/actions/fonts-actions.c:49
-#, fuzzy
+#: ../app/actions/fonts-actions.c:49
 msgid "Rescan font list"
 msgstr "Eskaneatu berriro letra-tipoen zerrenda"
 
-#: app/actions/gradient-editor-actions.c:46
+#: ../app/actions/gradient-editor-actions.c:46
 msgid "Gradient Editor Menu"
 msgstr "Gradientearen editorearen menua"
 
-#: app/actions/gradient-editor-actions.c:50
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:50
 msgid "_Load Left Color From"
-msgstr "/Ka_rgatu ezkerreko kolorea hemendik"
+msgstr "Ka_rgatu ezkerreko kolorea hemendik"
 
-#: app/actions/gradient-editor-actions.c:52
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:52
 msgid "_Save Left Color To"
-msgstr "/_Gorde ezkerreko kolorea hemen"
+msgstr "_Gorde ezkerreko kolorea hemen"
 
-#: app/actions/gradient-editor-actions.c:55
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:55
 msgid "Load Right Color Fr_om"
-msgstr "/Kargatu eskuineko ko_lorea hemendik"
+msgstr "Kargatu eskuineko ko_lorea hemendik"
 
-#: app/actions/gradient-editor-actions.c:57
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:57
 msgid "Sa_ve Right Color To"
-msgstr "/G_orde eskuineko kolorea hemen"
+msgstr "G_orde eskuineko kolorea hemen"
 
-#: app/actions/gradient-editor-actions.c:63
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:63
 msgid "L_eft Endpoint's Color..."
-msgstr "/Ez_kerreko amaiera-puntuaren kolorea..."
+msgstr "Ez_kerreko amaiera-puntuaren kolorea..."
 
-#: app/actions/gradient-editor-actions.c:68
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:68
 msgid "R_ight Endpoint's Color..."
-msgstr "/Esku_ineko amaiera-puntuaren kolorea..."
+msgstr "Esku_ineko amaiera-puntuaren kolorea..."
 
-#: app/actions/gradient-editor-actions.c:108
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:108
 msgid "Ble_nd Endpoints' Colors"
-msgstr "/Na_hastu amaiera-puntuen koloreak"
+msgstr "Na_hastu amaiera-puntuen koloreak"
 
-#: app/actions/gradient-editor-actions.c:113
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:113
 msgid "Blend Endpoints' Opacit_y"
-msgstr "/Nahastu amaiera-puntuen opakuta_suna"
+msgstr "Nahastu amaiera-puntuen opakuta_suna"
 
-#: app/actions/gradient-editor-actions.c:143
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:143
 msgid "_Left Neighbor's Right Endpoint"
-msgstr ""
-"/Kargatu ezkerreko kolorea hemendik/_Ezkerreko bizilagunaren eskuineko "
-"amaiera-puntua"
+msgstr "_Ezkerreko bizilagunaren eskuineko amaiera-puntua"
 
-#: app/actions/gradient-editor-actions.c:148
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:148
 msgid "_Right Endpoint"
-msgstr "Eskuineko amaiera-puntuaren kolorea"
+msgstr "E_skuineko amaiera-puntua"
 
-#: app/actions/gradient-editor-actions.c:153
-#: app/actions/gradient-editor-actions.c:201
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:153
+#: ../app/actions/gradient-editor-actions.c:201
 msgid "_FG Color"
-msgstr "AurPl-ren/AtzPl-ren kolorea"
+msgstr "A_urPl-ren kolorea"
 
-#: app/actions/gradient-editor-actions.c:158
-#: app/actions/gradient-editor-actions.c:206
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:158
+#: ../app/actions/gradient-editor-actions.c:206
 msgid "_BG Color"
-msgstr "AurPl-ren/AtzPl-ren kolorea"
+msgstr "A_tzPl-ren kolorea"
 
-#: app/actions/gradient-editor-actions.c:191
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:191
 msgid "_Right Neighbor's Left Endpoint"
-msgstr ""
-"/Kargatu eskuineko kolorea hemendik/Eskui_neko bizilagunaren ezkerreko "
-"amaiera-puntua"
+msgstr "Eskui_neko bizilagunaren ezkerreko amaiera-puntua"
 
-#: app/actions/gradient-editor-actions.c:196
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:196
 msgid "_Left Endpoint"
-msgstr "Ezkerreko amaiera-puntuaren kolorea"
+msgstr "E_zkerreko amaiera-puntua"
 
-#: app/actions/gradient-editor-actions.c:245
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:245
 msgid "_Linear"
-msgstr "Lineala"
+msgstr "_Lineala"
 
-#: app/actions/gradient-editor-actions.c:250
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:250
 msgid "_Curved"
-msgstr "Kurbak"
+msgstr "_Kurbatua"
 
-#: app/actions/gradient-editor-actions.c:255
+#: ../app/actions/gradient-editor-actions.c:255
 msgid "_Sinusoidal"
-msgstr ""
+msgstr "_Sinusoidala"
 
-#: app/actions/gradient-editor-actions.c:260
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:260
 msgid "Spherical (i_ncreasing)"
-msgstr "/nahaste-funtzioa/Esferikoa (ge_hitzen)"
+msgstr "Esferikoa (ge_hitzen)"
 
-#: app/actions/gradient-editor-actions.c:265
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:265
 msgid "Spherical (_decreasing)"
-msgstr "/nahaste-funtzioa/Esferikoa (gut_xitzen)"
+msgstr "Esferikoa (gut_xitzen)"
 
-#: app/actions/gradient-editor-actions.c:270
-#: app/actions/gradient-editor-actions.c:293
+#: ../app/actions/gradient-editor-actions.c:270
+#: ../app/actions/gradient-editor-actions.c:293
 msgid "(Varies)"
-msgstr ""
+msgstr "(aldatu egiten da)"
 
-#: app/actions/gradient-editor-actions.c:278 app/actions/image-actions.c:123
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:278
+#: ../app/actions/image-actions.c:123
 msgid "_RGB"
-msgstr "RGB"
+msgstr "_GBU"
 
-#: app/actions/gradient-editor-actions.c:283
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:283
 msgid "HSV (_counter-clockwise hue)"
-msgstr "/koloreztatze-mota/HSV (ñabardura erlo_juaren kontrako noranzkoan)"
+msgstr "ÑSB (ñabardura _EKN)"
 
-#: app/actions/gradient-editor-actions.c:288
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:288
 msgid "HSV (clockwise _hue)"
-msgstr "FG BGra (HSV erlojuaren noranzko ñabardura)"
+msgstr "ÑSB (_ñabardura EN)"
 
-#: app/actions/gradient-editor-actions.c:301
+#: ../app/actions/gradient-editor-actions.c:301
 msgid "Zoom In"
 msgstr "Zooma handiagotu"
 
-#: app/actions/gradient-editor-actions.c:302
-#: app/actions/palette-editor-actions.c:78 app/actions/view-actions.c:216
-#: app/widgets/widgets-enums.c:353
+#: ../app/actions/gradient-editor-actions.c:302
+#: ../app/actions/palette-editor-actions.c:78
+#: ../app/actions/view-actions.c:216 ../app/widgets/widgets-enums.c:353
 msgid "Zoom in"
 msgstr "Zooma handiagotu"
 
-#: app/actions/gradient-editor-actions.c:307
+#: ../app/actions/gradient-editor-actions.c:307
 msgid "Zoom Out"
 msgstr "Zooma txikiagotu"
 
-#: app/actions/gradient-editor-actions.c:308
-#: app/actions/palette-editor-actions.c:84 app/actions/view-actions.c:210
-#: app/widgets/widgets-enums.c:354
+#: ../app/actions/gradient-editor-actions.c:308
+#: ../app/actions/palette-editor-actions.c:84
+#: ../app/actions/view-actions.c:210 ../app/widgets/widgets-enums.c:354
 msgid "Zoom out"
 msgstr "Zooma txikiagotu"
 
-#: app/actions/gradient-editor-actions.c:313
+#: ../app/actions/gradient-editor-actions.c:313
 msgid "Zoom All"
 msgstr "Handiagotu dena"
 
-#: app/actions/gradient-editor-actions.c:314
-#: app/actions/palette-editor-actions.c:90
-#, fuzzy
+#: ../app/actions/gradient-editor-actions.c:314
+#: ../app/actions/palette-editor-actions.c:90
 msgid "Zoom all"
 msgstr "Handiagotu dena"
 
-#: app/actions/gradient-editor-actions.c:589
+#: ../app/actions/gradient-editor-actions.c:589
 msgid "_Blending Function for Segment"
 msgstr "Segmentuaren nahas_te-funtzioa"
 
-#: app/actions/gradient-editor-actions.c:591
+#: ../app/actions/gradient-editor-actions.c:591
 msgid "Coloring _Type for Segment"
 msgstr "Seg_mentuaren koloreztatze-mota"
 
-#: app/actions/gradient-editor-actions.c:594
+#: ../app/actions/gradient-editor-actions.c:594
 msgid "_Flip Segment"
 msgstr "_Irauli segmentua"
 
-#: app/actions/gradient-editor-actions.c:596
+#: ../app/actions/gradient-editor-actions.c:596
 msgid "_Replicate Segment..."
 msgstr "Egin _segmentuaren erreplika..."
 
-#: app/actions/gradient-editor-actions.c:598
+#: ../app/actions/gradient-editor-actions.c:598
 msgid "Split Segment at _Midpoint"
 msgstr "Zatitu segmentua _erditik"
 
-#: app/actions/gradient-editor-actions.c:600
+#: ../app/actions/gradient-editor-actions.c:600
 msgid "Split Segment _Uniformly..."
 msgstr "Zatitu segmentua _modu uniformean..."
 
-#: app/actions/gradient-editor-actions.c:602
+#: ../app/actions/gradient-editor-actions.c:602
 msgid "_Delete Segment"
 msgstr "_Ezabatu segmentua"
 
-#: app/actions/gradient-editor-actions.c:604
+#: ../app/actions/gradient-editor-actions.c:604
 msgid "Re-_center Segment's Midpoint"
 msgstr "Zentratu berriro segmen_tuaren erdiko puntua"
 
-#: app/actions/gradient-editor-actions.c:606
+#: ../app/actions/gradient-editor-actions.c:606
 msgid "Re-distribute _Handles in Segment"
 msgstr "Banatu berriro _heldulekuak segmentuan"
 
-#: app/actions/gradient-editor-actions.c:611
+#: ../app/actions/gradient-editor-actions.c:611
 msgid "_Blending Function for Selection"
 msgstr "Hautapenaren nahas_te-funtzioa"
 
-#: app/actions/gradient-editor-actions.c:613
+#: ../app/actions/gradient-editor-actions.c:613
 msgid "Coloring _Type for Selection"
 msgstr "Hautapenaren kolore_ztatze-mota"
 
-#: app/actions/gradient-editor-actions.c:616
+#: ../app/actions/gradient-editor-actions.c:616
 msgid "_Flip Selection"
 msgstr "_Irauli hautapena"
 
-#: app/actions/gradient-editor-actions.c:618
+#: ../app/actions/gradient-editor-actions.c:618
 msgid "_Replicate Selection..."
 msgstr "_Egin hautapenaren erreplika..."
 
-#: app/actions/gradient-editor-actions.c:620
+#: ../app/actions/gradient-editor-actions.c:620
 msgid "Split Segments at _Midpoints"
 msgstr "Zatitu segmentuak e_rditik"
 
-#: app/actions/gradient-editor-actions.c:622
+#: ../app/actions/gradient-editor-actions.c:622
 msgid "Split Segments _Uniformly..."
 msgstr "Zatitu segmentuak _modu uniformean..."
 
-#: app/actions/gradient-editor-actions.c:624
+#: ../app/actions/gradient-editor-actions.c:624
 msgid "_Delete Selection"
 msgstr "E_zabatu hautapena"
 
-#: app/actions/gradient-editor-actions.c:626
+#: ../app/actions/gradient-editor-actions.c:626
 msgid "Re-_center Midpoints in Selection"
 msgstr "Zentratu _berriro erdiko puntuak hautapenean"
 
-#: app/actions/gradient-editor-actions.c:628
+#: ../app/actions/gradient-editor-actions.c:628
 msgid "Re-distribute _Handles in Selection"
 msgstr "Banatu berriro _heldulekuak hautapenean"
 
-#: app/actions/gradient-editor-commands.c:85
+#: ../app/actions/gradient-editor-commands.c:85
 msgid "Left Endpoint Color"
 msgstr "Ezkerreko amaiera-puntuaren kolorea"
 
-#: app/actions/gradient-editor-commands.c:87
+#: ../app/actions/gradient-editor-commands.c:87
 msgid "Gradient Segment's Left Endpoint Color"
 msgstr "Gradientearen segmentuaren ezkerreko amaiera-puntuaren kolorea"
 
-#: app/actions/gradient-editor-commands.c:189
+#: ../app/actions/gradient-editor-commands.c:189
 msgid "Right Endpoint Color"
 msgstr "Eskuineko amaiera-puntuaren kolorea"
 
-#: app/actions/gradient-editor-commands.c:191
+#: ../app/actions/gradient-editor-commands.c:191
 msgid "Gradient Segment's Right Endpoint Color"
 msgstr "Gradientearen segmentuaren eskuineko amaiera-puntuaren kolorea"
 
-#: app/actions/gradient-editor-commands.c:358
+#: ../app/actions/gradient-editor-commands.c:358
 msgid "Replicate Segment"
 msgstr "Egin segmentuaren erreplika"
 
-#: app/actions/gradient-editor-commands.c:359
+#: ../app/actions/gradient-editor-commands.c:359
 msgid "Replicate Gradient Segment"
 msgstr "Egin gradientearen segmentuaren erreplika"
 
-#: app/actions/gradient-editor-commands.c:363
+#: ../app/actions/gradient-editor-commands.c:363
 msgid "Replicate Selection"
 msgstr "Egin hautapenaren erreplika"
 
-#: app/actions/gradient-editor-commands.c:364
+#: ../app/actions/gradient-editor-commands.c:364
 msgid "Replicate Gradient Selection"
 msgstr "Egin gradientearen hautapenaren erreplika"
 
-#: app/actions/gradient-editor-commands.c:376
+#: ../app/actions/gradient-editor-commands.c:376
 msgid "Replicate"
 msgstr "Egin erreplika"
 
-#: app/actions/gradient-editor-commands.c:391
+#: ../app/actions/gradient-editor-commands.c:391
 msgid ""
 "Select the number of times\n"
 "to replicate the selected segment."
@@ -1878,7 +1668,7 @@ msgstr ""
 "Hautatu hautatutako segmentuaren erreplika\n"
 "zenbat aldiz egin behar den."
 
-#: app/actions/gradient-editor-commands.c:394
+#: ../app/actions/gradient-editor-commands.c:394
 msgid ""
 "Select the number of times\n"
 "to replicate the selection."
@@ -1886,27 +1676,27 @@ msgstr ""
 "Hautatu hautapenaren erreplika\n"
 "zenbat aldiz egin behar den."
 
-#: app/actions/gradient-editor-commands.c:452
+#: ../app/actions/gradient-editor-commands.c:452
 msgid "Split Segment Uniformly"
 msgstr "Zatitu segmentua modu uniformean"
 
-#: app/actions/gradient-editor-commands.c:453
+#: ../app/actions/gradient-editor-commands.c:453
 msgid "Split Gradient Segment Uniformly"
 msgstr "Zatitu gradientearen segmentua modu uniformean"
 
-#: app/actions/gradient-editor-commands.c:457
+#: ../app/actions/gradient-editor-commands.c:457
 msgid "Split Segments Uniformly"
 msgstr "Zatitu segmentuak modu uniformean"
 
-#: app/actions/gradient-editor-commands.c:458
+#: ../app/actions/gradient-editor-commands.c:458
 msgid "Split Gradient Segments Uniformly"
 msgstr "Zatitu gradientearen segmentuak modu uniformean"
 
-#: app/actions/gradient-editor-commands.c:470
+#: ../app/actions/gradient-editor-commands.c:470
 msgid "Split"
 msgstr "Zatitu"
 
-#: app/actions/gradient-editor-commands.c:486
+#: ../app/actions/gradient-editor-commands.c:486
 msgid ""
 "Select the number of uniform parts\n"
 "in which to split the selected segment."
@@ -1914,7 +1704,7 @@ msgstr ""
 "Hautatu zenbat zati uniformetan zatitu \n"
 "behar den hautatutako segmentua."
 
-#: app/actions/gradient-editor-commands.c:489
+#: ../app/actions/gradient-editor-commands.c:489
 msgid ""
 "Select the number of uniform parts\n"
 "in which to split the segments in the selection."
@@ -1922,1900 +1712,1638 @@ msgstr ""
 "Hautatu zenbat zati uniformetan zatitu \n"
 "behar diren segmentuak hautapenean."
 
-#: app/actions/gradients-actions.c:44
+#: ../app/actions/gradients-actions.c:44
 msgid "Gradients Menu"
 msgstr "Gradiente-menua"
 
-#: app/actions/gradients-actions.c:48
-#, fuzzy
+#: ../app/actions/gradients-actions.c:48
 msgid "_New Gradient"
-msgstr "/_Gradiente berria"
+msgstr "_Gradiente berria"
 
-#: app/actions/gradients-actions.c:49
-#, fuzzy
+#: ../app/actions/gradients-actions.c:49
 msgid "New gradient"
-msgstr "/_Gradiente berria"
+msgstr "Gradiente berria"
 
-#: app/actions/gradients-actions.c:54
-#, fuzzy
+#: ../app/actions/gradients-actions.c:54
 msgid "D_uplicate Gradient"
-msgstr "/Bi_koiztu gradientea"
+msgstr "Bi_koiztu gradientea"
 
-#: app/actions/gradients-actions.c:55
-#, fuzzy
+#: ../app/actions/gradients-actions.c:55
 msgid "Duplicate gradient"
-msgstr "/Bi_koiztu gradientea"
+msgstr "Bikoiztu gradientea"
 
-#: app/actions/gradients-actions.c:60
-#, fuzzy
+#: ../app/actions/gradients-actions.c:60
 msgid "Save as _POV-Ray..."
-msgstr "/Gorde _POV-Ray gisa..."
+msgstr "Gorde _POV-Ray gisa..."
 
-#: app/actions/gradients-actions.c:61
-#, fuzzy
+#: ../app/actions/gradients-actions.c:61
 msgid "Save gradient as POV-Ray"
-msgstr "Gorde \"%s\" POV-Ray gisa"
+msgstr "Gorde gradientea POV-Ray gisa"
 
-#: app/actions/gradients-actions.c:66
-#, fuzzy
+#: ../app/actions/gradients-actions.c:66
 msgid "_Delete Gradient..."
-msgstr "/_Ezabatu gradientea..."
+msgstr "_Ezabatu gradientea..."
 
-#: app/actions/gradients-actions.c:67
-#, fuzzy
+#: ../app/actions/gradients-actions.c:67
 msgid "Delete gradient"
-msgstr "/_Ezabatu gradientea..."
+msgstr "Ezabatu gradientea"
 
-#: app/actions/gradients-actions.c:72
-#, fuzzy
+#: ../app/actions/gradients-actions.c:72
 msgid "_Refresh Gradients"
-msgstr "/_Freskatu gradienteak"
+msgstr "_Freskatu gradienteak"
 
-#: app/actions/gradients-actions.c:73
-#, fuzzy
+#: ../app/actions/gradients-actions.c:73
 msgid "Refresh gradients"
-msgstr "/_Freskatu gradienteak"
+msgstr "Freskatu gradienteak"
 
-#: app/actions/gradients-actions.c:81
-#, fuzzy
+#: ../app/actions/gradients-actions.c:81
 msgid "_Edit Gradient..."
-msgstr "/_Editatu gradientea..."
+msgstr "_Editatu gradientea..."
 
-#: app/actions/gradients-actions.c:82
-#, fuzzy
+#: ../app/actions/gradients-actions.c:82
 msgid "Edit gradient"
-msgstr "/_Editatu gradientea..."
+msgstr "Editatu gradientea"
 
-#: app/actions/gradients-commands.c:65
+#: ../app/actions/gradients-commands.c:65
 #, c-format
 msgid "Save '%s' as POV-Ray"
 msgstr "Gorde \"%s\" POV-Ray gisa"
 
-#: app/actions/help-actions.c:38 app/actions/help-actions.c:41
-#, fuzzy
+#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
 msgid "_Help"
-msgstr "/Lagu_ntza"
+msgstr "_Laguntza"
 
-#: app/actions/help-actions.c:46
-#, fuzzy
+#: ../app/actions/help-actions.c:46
 msgid "_Context Help"
-msgstr "/Laguntza/_Testuinguru-laguntza"
+msgstr "_Testuinguru-laguntza"
 
-#: app/actions/image-actions.c:47
+#: ../app/actions/image-actions.c:47
 msgid "Toolbox Menu"
-msgstr ""
+msgstr "Tresna-kutxa menua"
 
-#: app/actions/image-actions.c:51 app/actions/image-actions.c:55
+#: ../app/actions/image-actions.c:51 ../app/actions/image-actions.c:55
 msgid "Image Menu"
 msgstr "Irudi-menua"
 
-#: app/actions/image-actions.c:58
-#, fuzzy
+#: ../app/actions/image-actions.c:58
 msgid "_Xtns"
-msgstr "/_Luzp"
+msgstr "_Luzp"
 
-#: app/actions/image-actions.c:59
-#, fuzzy
+#: ../app/actions/image-actions.c:59
 msgid "_Image"
-msgstr "/_Irudia"
+msgstr "_Irudia"
 
-#: app/actions/image-actions.c:60
-#, fuzzy
+#: ../app/actions/image-actions.c:60
 msgid "_Mode"
-msgstr "Modua"
+msgstr "_Modua"
 
-#: app/actions/image-actions.c:61 app/actions/layers-actions.c:57
-#, fuzzy
+#: ../app/actions/image-actions.c:61 ../app/actions/layers-actions.c:57
 msgid "_Transform"
-msgstr "Eraldatu"
+msgstr "_Eraldatu"
 
-#: app/actions/image-actions.c:62
-#, fuzzy
+#: ../app/actions/image-actions.c:62
 msgid "_Guides"
-msgstr "Gida"
+msgstr "_Gidak"
 
-#: app/actions/image-actions.c:65 app/actions/image-actions.c:70
-#, fuzzy
+#: ../app/actions/image-actions.c:65 ../app/actions/image-actions.c:70
 msgid "_New..."
-msgstr "/_Bide berria..."
+msgstr "_Berria..."
 
-#: app/actions/image-actions.c:75
-#, fuzzy
+#: ../app/actions/image-actions.c:75
 msgid "Can_vas Size..."
-msgstr "Oihalaren tamaina"
+msgstr "_Oihalaren tamaina..."
 
-#: app/actions/image-actions.c:80
+#: ../app/actions/image-actions.c:80
 msgid "F_it Canvas to Layers"
-msgstr ""
+msgstr "_Doitu oihala geruzetara"
 
-#: app/actions/image-actions.c:85
-#, fuzzy
+#: ../app/actions/image-actions.c:85
 msgid "_Print Size..."
-msgstr "Inprimatze-tamaina:"
+msgstr "_Inprimatze-tamaina..."
 
-#: app/actions/image-actions.c:90
-#, fuzzy
+#: ../app/actions/image-actions.c:90
 msgid "_Scale Image..."
-msgstr "Eskalatu irudia"
+msgstr "_Eskalatu irudia..."
 
-#: app/actions/image-actions.c:95
-#, fuzzy
+#: ../app/actions/image-actions.c:95
 msgid "_Crop Image"
-msgstr "Ebaki irudia"
+msgstr "_Ebaki irudia"
 
-#: app/actions/image-actions.c:100
-#, fuzzy
+#: ../app/actions/image-actions.c:100
 msgid "_Duplicate"
-msgstr "Bikoiztu"
+msgstr "_Bikoiztu"
 
-#: app/actions/image-actions.c:105
-#, fuzzy
+#: ../app/actions/image-actions.c:105
 msgid "Merge Visible _Layers..."
-msgstr "/Batu _ikusgai dauden geruzak"
+msgstr "Batu _ikusgai dauden geruzak"
 
-#: app/actions/image-actions.c:110 app/actions/layers-actions.c:138
-#, fuzzy
+#: ../app/actions/image-actions.c:110 ../app/actions/layers-actions.c:138
 msgid "_Flatten Image"
-msgstr "/_Berdindu irudia"
+msgstr "_Berdindu irudia"
 
-#: app/actions/image-actions.c:115
-#, fuzzy
+#: ../app/actions/image-actions.c:115
 msgid "Configure G_rid..."
-msgstr "Konfiguratu sareta"
+msgstr "Konfiguratu _sareta..."
 
-#: app/actions/image-actions.c:128
-#, fuzzy
+#: ../app/actions/image-actions.c:128
 msgid "_Grayscale"
-msgstr "Gris-eskala"
+msgstr "_Gris-eskala"
 
-#: app/actions/image-actions.c:133
-#, fuzzy
+#: ../app/actions/image-actions.c:133
 msgid "_Indexed..."
-msgstr "Indexatua"
+msgstr "_Indexatua..."
 
-#: app/actions/image-commands.c:192
+#: ../app/actions/image-commands.c:192
 msgid "Set Image Canvas Size"
 msgstr "Ezarri irudiaren oihalaren tamaina"
 
-#: app/actions/image-commands.c:219 app/actions/image-commands.c:449
+#: ../app/actions/image-commands.c:219 ../app/actions/image-commands.c:449
 msgid "Resizing..."
 msgstr "Tamaina aldatzen..."
 
-#: app/actions/image-commands.c:242
-#, fuzzy
+#: ../app/actions/image-commands.c:242
 msgid "Set Image Print Resolution"
-msgstr "Aldatu irudiaren bereizmena"
+msgstr "Ezarri irudiaren inprimazio bereizmena"
 
-#: app/actions/image-commands.c:289
+#: ../app/actions/image-commands.c:289
 msgid "Flipping..."
 msgstr "Iraultzen..."
 
-#: app/actions/image-commands.c:310 app/pdb/drawable_transform_cmds.c:1035
-#: app/pdb/drawable_transform_cmds.c:1193 app/pdb/transform_tools_cmds.c:339
-#: app/tools/gimprotatetool.c:159
+#: ../app/actions/image-commands.c:310
+#: ../app/pdb/drawable_transform_cmds.c:1035
+#: ../app/pdb/drawable_transform_cmds.c:1193
+#: ../app/pdb/transform_tools_cmds.c:339 ../app/tools/gimprotatetool.c:159
 msgid "Rotating..."
 msgstr "Biratzen..."
 
-#: app/actions/image-commands.c:332 app/actions/layers-commands.c:535
+#: ../app/actions/image-commands.c:332 ../app/actions/layers-commands.c:535
 msgid "Cannot crop because the current selection is empty."
 msgstr "Ezin da ebaki uneko hautapena hutsik dagoelako."
 
-#: app/actions/image-commands.c:484
-#, fuzzy
+#: ../app/actions/image-commands.c:484
 msgid "Change Print Size"
-msgstr "Inprimatze-tamaina:"
+msgstr "Aldatu inprimatze-tamaina"
 
-#: app/actions/image-commands.c:508 app/core/gimpimage-scale.c:71
-#: app/dialogs/image-scale-dialog.c:91
+#: ../app/actions/image-commands.c:508 ../app/core/gimpimage-scale.c:71
+#: ../app/dialogs/image-scale-dialog.c:91
 msgid "Scale Image"
 msgstr "Eskalatu irudia"
 
-#: app/actions/image-commands.c:521 app/actions/layers-commands.c:959
-#: app/pdb/drawable_transform_cmds.c:1346
-#: app/pdb/drawable_transform_cmds.c:1503 app/pdb/transform_tools_cmds.c:458
-#: app/tools/gimpscaletool.c:153
+#: ../app/actions/image-commands.c:521 ../app/actions/layers-commands.c:959
+#: ../app/pdb/drawable_transform_cmds.c:1346
+#: ../app/pdb/drawable_transform_cmds.c:1503
+#: ../app/pdb/transform_tools_cmds.c:458 ../app/tools/gimpscaletool.c:153
 msgid "Scaling..."
 msgstr "Eskalatzen..."
 
-#: app/actions/images-actions.c:43
+#: ../app/actions/images-actions.c:43
 msgid "Images Menu"
 msgstr "Irudien menua"
 
-#: app/actions/images-actions.c:47
-#, fuzzy
+#: ../app/actions/images-actions.c:47
 msgid "_Raise Views"
-msgstr "/_Igo ikuspegiak"
+msgstr "_Igo ikuspegiak"
 
-#: app/actions/images-actions.c:48
+#: ../app/actions/images-actions.c:48
 msgid "Raise this image's displays"
 msgstr "Igo irudi honen ikuspegiak"
 
-#: app/actions/images-actions.c:53 app/actions/view-actions.c:68
-#, fuzzy
+#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:68
 msgid "_New View"
-msgstr "/I_kuspegi berria"
+msgstr "I_kuspegi berria"
 
-#: app/actions/images-actions.c:54
+#: ../app/actions/images-actions.c:54
 msgid "Create a new display for this image"
-msgstr "Sortu ikuspegi berria irudi honentzat\t"
+msgstr "Sortu ikuspegi berria irudi honentzat"
 
-#: app/actions/images-actions.c:59
-#, fuzzy
+#: ../app/actions/images-actions.c:59
 msgid "_Delete Image"
-msgstr "/_Ezabatu irudia"
+msgstr "_Ezabatu irudia"
 
-#: app/actions/images-actions.c:60
+#: ../app/actions/images-actions.c:60
 msgid "Delete this image"
 msgstr "Ezabatu irudi hau"
 
-#: app/actions/layers-actions.c:48
+#: ../app/actions/layers-actions.c:48
 msgid "Layers Menu"
 msgstr "Geruza-menua"
 
-#: app/actions/layers-actions.c:51
-#, fuzzy
+#: ../app/actions/layers-actions.c:51
 msgid "_Layer"
-msgstr "/Geru_za"
+msgstr "Geru_za"
 
-#: app/actions/layers-actions.c:52
-#, fuzzy
+#: ../app/actions/layers-actions.c:52
 msgid "Stac_k"
-msgstr "/Geruza/Pi_la"
+msgstr "Pi_la"
 
-#: app/actions/layers-actions.c:54 app/tools/gimplevelstool.c:665
+#: ../app/actions/layers-actions.c:54 ../app/tools/gimplevelstool.c:669
 msgid "_Auto"
 msgstr "_Automatikoa"
 
-#: app/actions/layers-actions.c:55
-#, fuzzy
+#: ../app/actions/layers-actions.c:55
 msgid "_Mask"
-msgstr "_Maisua"
+msgstr "_Maskara"
 
-#: app/actions/layers-actions.c:56
-#, fuzzy
+#: ../app/actions/layers-actions.c:56
 msgid "Tr_ansparency"
-msgstr "Gardentasuna"
+msgstr "_Gardentasuna"
 
-#: app/actions/layers-actions.c:58
-#, fuzzy
+#: ../app/actions/layers-actions.c:58
 msgid "_Properties"
-msgstr "Perspektiba"
+msgstr "Propietateak"
 
-#: app/actions/layers-actions.c:60
-#, fuzzy
+#: ../app/actions/layers-actions.c:60
 msgid "Layer _Mode"
-msgstr "Geruza-aldaketa"
+msgstr "Geruza _modua"
 
-#: app/actions/layers-actions.c:63
-#, fuzzy
+#: ../app/actions/layers-actions.c:63
 msgid "Te_xt Tool"
-msgstr "/Te_stu-tresna"
+msgstr "Te_stu-tresna"
 
-#: app/actions/layers-actions.c:68
-#, fuzzy
+#: ../app/actions/layers-actions.c:68
 msgid "_Edit Layer Attributes..."
-msgstr "/_Editatu geruza-atributuak..."
+msgstr "_Editatu geruza-atributuak..."
 
-#: app/actions/layers-actions.c:69
-#, fuzzy
+#: ../app/actions/layers-actions.c:69
 msgid "Edit layer attributes"
 msgstr "Editatu geruza-atributuak"
 
-#: app/actions/layers-actions.c:74
-#, fuzzy
+#: ../app/actions/layers-actions.c:74
 msgid "_New Layer..."
-msgstr "/_Geruza berria..."
+msgstr "_Geruza berria..."
 
-#: app/actions/layers-actions.c:75
-#, fuzzy
+#: ../app/actions/layers-actions.c:75
 msgid "New layer..."
-msgstr "/_Geruza berria..."
+msgstr "Geruza berria..."
 
-#: app/actions/layers-actions.c:80
-#, fuzzy
+#: ../app/actions/layers-actions.c:80
 msgid "_New Layer"
-msgstr "Geruza berria"
+msgstr "_Geruza berria"
 
-#: app/actions/layers-actions.c:81
+#: ../app/actions/layers-actions.c:81
 msgid "New layer with last values"
-msgstr ""
+msgstr "Geruza berria azken balioekin"
 
-#: app/actions/layers-actions.c:86
-#, fuzzy
+#: ../app/actions/layers-actions.c:86
 msgid "D_uplicate Layer"
-msgstr "/_Bikoiztu geruza"
+msgstr "_Bikoiztu geruza"
 
-#: app/actions/layers-actions.c:87
-#, fuzzy
+#: ../app/actions/layers-actions.c:87
 msgid "Duplicate layer"
 msgstr "Bikoiztu geruza"
 
-#: app/actions/layers-actions.c:92
-#, fuzzy
+#: ../app/actions/layers-actions.c:92
 msgid "_Delete Layer"
-msgstr "/_Ezabatu geruza"
+msgstr "_Ezabatu geruza"
 
-#: app/actions/layers-actions.c:93 app/core/core-enums.c:1079
-#, fuzzy
+#: ../app/actions/layers-actions.c:93 ../app/core/core-enums.c:1081
 msgid "Delete layer"
 msgstr "Ezabatu geruza"
 
-#: app/actions/layers-actions.c:98
-#, fuzzy
+#: ../app/actions/layers-actions.c:98
 msgid "_Raise Layer"
-msgstr "/_Igo geruza"
+msgstr "_Igo geruza"
 
-#: app/actions/layers-actions.c:99
-#, fuzzy
+#: ../app/actions/layers-actions.c:99
 msgid "Raise layer"
 msgstr "Igo geruza"
 
-#: app/actions/layers-actions.c:104
-#, fuzzy
+#: ../app/actions/layers-actions.c:104
 msgid "Layer to _Top"
-msgstr "/Geru_za gora"
+msgstr "Geru_za gora"
 
-#: app/actions/layers-actions.c:105
-#, fuzzy
+#: ../app/actions/layers-actions.c:105
 msgid "Raise layer to top"
 msgstr "Igo geruza goienera"
 
-#: app/actions/layers-actions.c:110
-#, fuzzy
+#: ../app/actions/layers-actions.c:110
 msgid "_Lower Layer"
-msgstr "/_Jaitsi geruza"
+msgstr "_Jaitsi geruza"
 
-#: app/actions/layers-actions.c:111
-#, fuzzy
+#: ../app/actions/layers-actions.c:111
 msgid "Lower layer"
 msgstr "Jaitsi geruza"
 
-#: app/actions/layers-actions.c:116
-#, fuzzy
+#: ../app/actions/layers-actions.c:116
 msgid "Layer to _Bottom"
-msgstr "/Geruza be_hera"
+msgstr "Geruza be_hera"
 
-#: app/actions/layers-actions.c:117
-#, fuzzy
+#: ../app/actions/layers-actions.c:117
 msgid "Lower layer to bottom"
 msgstr "Jaitsi geruza leku baxuenera"
 
-#: app/actions/layers-actions.c:122
-#, fuzzy
+#: ../app/actions/layers-actions.c:122
 msgid "_Anchor Layer"
-msgstr "/_Ainguratu geruza"
+msgstr "_Ainguratu geruza"
 
-#: app/actions/layers-actions.c:123
-#, fuzzy
+#: ../app/actions/layers-actions.c:123
 msgid "Anchor floating layer"
 msgstr "Ainguratu geruza mugikorra"
 
-#: app/actions/layers-actions.c:128
-#, fuzzy
+#: ../app/actions/layers-actions.c:128
 msgid "Merge Do_wn"
-msgstr "/Ba_tu beherantz"
+msgstr "Ba_tu beherantz"
 
-#: app/actions/layers-actions.c:133
-#, fuzzy
+#: ../app/actions/layers-actions.c:133
 msgid "Merge _Visible Layers..."
-msgstr "/Batu _ikusgai dauden geruzak"
+msgstr "Batu _ikusgai dauden geruzak..."
 
-#: app/actions/layers-actions.c:143
-#, fuzzy
+#: ../app/actions/layers-actions.c:143
 msgid "_Discard Text Information"
-msgstr "/_Baztertu testuaren informazioa"
+msgstr "_Baztertu testuaren informazioa"
 
-#: app/actions/layers-actions.c:148
-#, fuzzy
+#: ../app/actions/layers-actions.c:148
 msgid "Layer B_oundary Size..."
-msgstr "/Geruzaren _mugaren tamaina..."
+msgstr "Geruzaren _mugaren tamaina..."
 
-#: app/actions/layers-actions.c:153
-#, fuzzy
+#: ../app/actions/layers-actions.c:153
 msgid "Layer to _Image Size"
-msgstr "/Geruza _irudi-tamainara"
+msgstr "Geruza _irudi-tamainara"
 
-#: app/actions/layers-actions.c:158
-#, fuzzy
+#: ../app/actions/layers-actions.c:158
 msgid "_Scale Layer..."
-msgstr "/_Eskalatu geruza..."
+msgstr "_Eskalatu geruza..."
 
-#: app/actions/layers-actions.c:163
-#, fuzzy
+#: ../app/actions/layers-actions.c:163
 msgid "Cr_op Layer"
-msgstr "Ebaki geruza"
+msgstr "E_baki geruza"
 
-#: app/actions/layers-actions.c:168
-#, fuzzy
+#: ../app/actions/layers-actions.c:168
 msgid "Add La_yer Mask..."
-msgstr "/Ge_hitu geruza-maskara..."
+msgstr "Ge_hitu geruza-maskara..."
 
-#: app/actions/layers-actions.c:173
-#, fuzzy
+#: ../app/actions/layers-actions.c:173
 msgid "Add Alpha C_hannel"
-msgstr "/Gehitu al_fa kanala"
+msgstr "Gehitu al_fa kanala"
 
-#: app/actions/layers-actions.c:181
-#, fuzzy
+#: ../app/actions/layers-actions.c:181
 msgid "Keep Transparency"
 msgstr "Mantendu gardentasuna"
 
-#: app/actions/layers-actions.c:187
-#, fuzzy
+#: ../app/actions/layers-actions.c:187
 msgid "Edit Layer Mask"
-msgstr "Gehitu geruza-maskara"
+msgstr "Editatu geruza-maskara"
 
-#: app/actions/layers-actions.c:193
-#, fuzzy
+#: ../app/actions/layers-actions.c:193
 msgid "Show Layer Mask"
-msgstr "Aldatu geruza-maskara lekuz"
+msgstr "Erakutsi geruza-maskara"
 
-#: app/actions/layers-actions.c:199
-#, fuzzy
+#: ../app/actions/layers-actions.c:199
 msgid "Disable Layer Mask"
-msgstr "Ezabatu geruza-maskara"
+msgstr "Desgaitu geruza-maskara"
 
-#: app/actions/layers-actions.c:208
-#, fuzzy
+#: ../app/actions/layers-actions.c:208
 msgid "Apply Layer _Mask"
-msgstr "/Aplikatu geruza-mas_kara"
+msgstr "Aplikatu geruza-mas_kara"
 
-#: app/actions/layers-actions.c:213
-#, fuzzy
+#: ../app/actions/layers-actions.c:213
 msgid "Delete Layer Mas_k"
-msgstr "/E_zabatu geruza-maskara"
+msgstr "E_zabatu geruza-maskara"
 
-#: app/actions/layers-actions.c:221
-#, fuzzy
+#: ../app/actions/layers-actions.c:221
 msgid "_Mask to Selection"
-msgstr "/Maskara hautapenera"
+msgstr "_Maskara hautapenera"
 
-#: app/actions/layers-actions.c:244
-#, fuzzy
+#: ../app/actions/layers-actions.c:244
 msgid "Al_pha to Selection"
-msgstr "/_Alfa hautapenera"
+msgstr "_Alfa hautapenera"
 
-#: app/actions/layers-actions.c:249
-#, fuzzy
+#: ../app/actions/layers-actions.c:249
 msgid "A_dd to Selection"
-msgstr "/_Gehitu hautapenari"
+msgstr "_Gehitu hautapenari"
 
-#: app/actions/layers-actions.c:267
-#, fuzzy
+#: ../app/actions/layers-actions.c:267
 msgid "Select _Top Layer"
-msgstr "/Geruza/Pila/_Hautatu goiko geruza"
+msgstr "_Hautatu goiko geruza"
 
-#: app/actions/layers-actions.c:272
-#, fuzzy
+#: ../app/actions/layers-actions.c:272
 msgid "Select _Bottom Layer"
-msgstr "/Geruza/Pila/Hautatu beheko geru_za"
+msgstr "Hautatu beheko geru_za"
 
-#: app/actions/layers-actions.c:277
-#, fuzzy
+#: ../app/actions/layers-actions.c:277
 msgid "Select _Previous Layer"
-msgstr "/Geruza/Pila/_Hautatu aurreko geruza"
+msgstr "_Hautatu aurreko geruza"
 
-#: app/actions/layers-actions.c:282
-#, fuzzy
+#: ../app/actions/layers-actions.c:282
 msgid "Select _Next Layer"
-msgstr "/Geruza/Pila/Hautatu h_urrengo geruza"
+msgstr "Hautatu h_urrengo geruza"
 
-#: app/actions/layers-actions.c:290
-#, fuzzy
+#: ../app/actions/layers-actions.c:290
 msgid "Set Opacity"
-msgstr "Ezarri geruzaren opakutasuna"
+msgstr "Ezarri opakutasuna"
 
-#: app/actions/layers-commands.c:196
+#: ../app/actions/layers-commands.c:196
 msgid "Layer Attributes"
 msgstr "Geruza-atributuak"
 
-#: app/actions/layers-commands.c:199
+#: ../app/actions/layers-commands.c:199
 msgid "Edit Layer Attributes"
 msgstr "Editatu geruza-atributuak"
 
-#: app/actions/layers-commands.c:232 app/actions/layers-commands.c:234
-#: app/actions/layers-commands.c:291 app/actions/layers-commands.c:295
-#: app/widgets/gimpdrawabletreeview.c:238 app/widgets/gimplayertreeview.c:842
+#: ../app/actions/layers-commands.c:232 ../app/actions/layers-commands.c:234
+#: ../app/actions/layers-commands.c:291 ../app/actions/layers-commands.c:295
+#: ../app/widgets/gimpdrawabletreeview.c:238
+#: ../app/widgets/gimplayertreeview.c:842
 msgid "New Layer"
 msgstr "Geruza berria"
 
-#: app/actions/layers-commands.c:237
+#: ../app/actions/layers-commands.c:237
 msgid "Create a New Layer"
 msgstr "Sortu geruza berria"
 
-#: app/actions/layers-commands.c:470
+#: ../app/actions/layers-commands.c:470
 msgid "Set Layer Boundary Size"
 msgstr "Ezarri geruzaren mugaren tamaina"
 
-#: app/actions/layers-commands.c:512 app/core/gimplayer.c:253
+#: ../app/actions/layers-commands.c:512 ../app/core/gimplayer.c:253
 msgid "Scale Layer"
 msgstr "Eskalatu geruza"
 
-#: app/actions/layers-commands.c:545
+#: ../app/actions/layers-commands.c:545
 msgid "Crop Layer"
 msgstr "Ebaki geruza"
 
-#: app/actions/layers-commands.c:683
+#: ../app/actions/layers-commands.c:683
 msgid "Layer Mask to Selection"
-msgstr "/Geruza/Maskara/_Maskara hautapenera"
+msgstr "Geruzaren maskara hautapenera"
 
-#: app/actions/layers-commands.c:904 app/core/gimplayer.c:1065
-#: app/dialogs/layer-add-mask-dialog.c:62
+#: ../app/actions/layers-commands.c:904 ../app/core/gimplayer.c:1065
+#: ../app/dialogs/layer-add-mask-dialog.c:62
 msgid "Add Layer Mask"
 msgstr "Gehitu geruza-maskara"
 
-#: app/actions/layers-commands.c:975 app/actions/layers-commands.c:1007
+#: ../app/actions/layers-commands.c:975 ../app/actions/layers-commands.c:1007
 msgid "Invalid width or height. Both must be positive."
 msgstr "Zabalera edo altuera baliogabea. Biek positiboa izan behar dute."
 
-#: app/actions/palette-editor-actions.c:43
+#: ../app/actions/palette-editor-actions.c:43
 msgid "Palette Editor Menu"
 msgstr "Paletaren editoreren menua"
 
-#: app/actions/palette-editor-actions.c:53
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:53
 msgid "_Delete Color"
-msgstr "/_Ezabatu kolorea"
+msgstr "_Ezabatu kolorea"
 
-#: app/actions/palette-editor-actions.c:54
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:54
 msgid "Delete color"
 msgstr "Ezabatu kolorea"
 
-#: app/actions/palette-editor-actions.c:62
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:62
 msgid "New Color from _FG"
-msgstr "/Kolore berria _AurPl-tik"
+msgstr "Kolore berria _AurPl-tik"
 
-#: app/actions/palette-editor-actions.c:63
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:63
 msgid "New color from FG"
-msgstr "/Kolore berria _AurPl-tik"
+msgstr "Kolore berria AurPl-tik"
 
-#: app/actions/palette-editor-actions.c:68
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:68
 msgid "New Color from _BG"
-msgstr "/Kolore berria A_tzPl-tik"
+msgstr "Kolore berria A_tzPl-tik"
 
-#: app/actions/palette-editor-actions.c:69
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:69
 msgid "New color from BG"
-msgstr "/Kolore berria A_tzPl-tik"
+msgstr "Kolore berria AtzPl-tik"
 
-#: app/actions/palette-editor-actions.c:77 app/actions/view-actions.c:215
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:77
+#: ../app/actions/view-actions.c:215
 msgid "Zoom _In"
-msgstr "/Zooma ha_ndiagotu"
+msgstr "Zooma ha_ndiagotu"
 
-#: app/actions/palette-editor-actions.c:83 app/actions/view-actions.c:209
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:83
+#: ../app/actions/view-actions.c:209
 msgid "Zoom _Out"
-msgstr "/Zooma t_xikiagotu"
+msgstr "Zooma t_xikiagotu"
 
-#: app/actions/palette-editor-actions.c:89
-#, fuzzy
+#: ../app/actions/palette-editor-actions.c:89
 msgid "Zoom _All"
-msgstr "/Handiagotu _dena"
+msgstr "Handiagotu _dena"
 
-#: app/actions/palette-editor-commands.c:68
+#: ../app/actions/palette-editor-commands.c:68
 msgid "Edit Palette Color"
 msgstr "Editatu paletaren kolorea"
 
-#: app/actions/palette-editor-commands.c:70
+#: ../app/actions/palette-editor-commands.c:70
 msgid "Edit Color Palette Entry"
 msgstr "Editatu kolore-paletaren sarrera"
 
-#: app/actions/palettes-actions.c:44
+#: ../app/actions/palettes-actions.c:44
 msgid "Palettes Menu"
 msgstr "Paleta-menua"
 
-#: app/actions/palettes-actions.c:48
-#, fuzzy
+#: ../app/actions/palettes-actions.c:48
 msgid "_New Palette"
-msgstr "/_Paleta berria"
+msgstr "_Paleta berria"
 
-#: app/actions/palettes-actions.c:49
-#, fuzzy
+#: ../app/actions/palettes-actions.c:49
 msgid "New palette"
-msgstr "/_Paleta berria"
+msgstr "_Paleta berria"
 
-#: app/actions/palettes-actions.c:54
-#, fuzzy
+#: ../app/actions/palettes-actions.c:54
 msgid "_Import Palette..."
-msgstr "/_Inportatu paleta..."
+msgstr "_Inportatu paleta..."
 
-#: app/actions/palettes-actions.c:55
-#, fuzzy
+#: ../app/actions/palettes-actions.c:55
 msgid "Import palette"
 msgstr "Inportatu paleta"
 
-#: app/actions/palettes-actions.c:60
-#, fuzzy
+#: ../app/actions/palettes-actions.c:60
 msgid "D_uplicate Palette"
-msgstr "/_Bikoiztu paleta"
+msgstr "_Bikoiztu paleta"
 
-#: app/actions/palettes-actions.c:61
-#, fuzzy
+#: ../app/actions/palettes-actions.c:61
 msgid "Duplicate palette"
-msgstr "/_Bikoiztu paleta"
+msgstr "Bikoiztu paleta"
 
-#: app/actions/palettes-actions.c:66
-#, fuzzy
+#: ../app/actions/palettes-actions.c:66
 msgid "_Merge Palettes..."
-msgstr "/Ba_tu paletak..."
+msgstr "Ba_tu paletak..."
 
-#: app/actions/palettes-actions.c:67
-#, fuzzy
+#: ../app/actions/palettes-actions.c:67
 msgid "Merge palettes"
 msgstr "Batu paleta"
 
-#: app/actions/palettes-actions.c:72
-#, fuzzy
+#: ../app/actions/palettes-actions.c:72
 msgid "_Delete Palette"
-msgstr "/_Ezabatu paleta"
+msgstr "_Ezabatu paleta"
 
-#: app/actions/palettes-actions.c:73
-#, fuzzy
+#: ../app/actions/palettes-actions.c:73
 msgid "Delete palette"
-msgstr "/_Ezabatu paleta"
+msgstr "Ezabatu paleta"
 
-#: app/actions/palettes-actions.c:78
-#, fuzzy
+#: ../app/actions/palettes-actions.c:78
 msgid "_Refresh Palettes"
-msgstr "/_Freskatu paletak"
+msgstr "_Freskatu paletak"
 
-#: app/actions/palettes-actions.c:79
-#, fuzzy
+#: ../app/actions/palettes-actions.c:79
 msgid "Refresh palettes"
-msgstr "/_Freskatu paletak"
+msgstr "Freskatu paletak"
 
-#: app/actions/palettes-actions.c:87
-#, fuzzy
+#: ../app/actions/palettes-actions.c:87
 msgid "_Edit Palette..."
-msgstr "/_Editatu paleta..."
+msgstr "_Editatu paleta..."
 
-#: app/actions/palettes-actions.c:88
-#, fuzzy
+#: ../app/actions/palettes-actions.c:88
 msgid "Edit palette"
-msgstr "/_Editatu paleta..."
+msgstr "Editatu paleta..."
 
-#: app/actions/palettes-commands.c:72
+#: ../app/actions/palettes-commands.c:72
 msgid "Merge Palette"
 msgstr "Batu paleta"
 
-#: app/actions/palettes-commands.c:76
+#: ../app/actions/palettes-commands.c:76
 msgid "Enter a name for the merged palette"
 msgstr "Sartu izena batutako paletarentzat"
 
-#: app/actions/patterns-actions.c:43
+#: ../app/actions/patterns-actions.c:43
 msgid "Patterns Menu"
 msgstr "Eredu-menua"
 
-#: app/actions/patterns-actions.c:47
-#, fuzzy
+#: ../app/actions/patterns-actions.c:47
 msgid "_New Pattern"
-msgstr "/_Eredu berria"
+msgstr "_Eredu berria"
 
-#: app/actions/patterns-actions.c:48
-#, fuzzy
+#: ../app/actions/patterns-actions.c:48
 msgid "New pattern"
-msgstr "/_Eredu berria"
+msgstr "Eredu berria"
 
-#: app/actions/patterns-actions.c:53
-#, fuzzy
+#: ../app/actions/patterns-actions.c:53
 msgid "D_uplicate Pattern"
-msgstr "/_Bikoiztu eredua"
+msgstr "_Bikoiztu eredua"
 
-#: app/actions/patterns-actions.c:54
-#, fuzzy
+#: ../app/actions/patterns-actions.c:54
 msgid "Duplicate pattern"
-msgstr "/_Bikoiztu eredua"
+msgstr "Bikoiztu eredua"
 
-#: app/actions/patterns-actions.c:59
-#, fuzzy
+#: ../app/actions/patterns-actions.c:59
 msgid "_Delete Pattern..."
-msgstr "/_Ezabatu eredua..."
+msgstr "_Ezabatu eredua..."
 
-#: app/actions/patterns-actions.c:60
-#, fuzzy
+#: ../app/actions/patterns-actions.c:60
 msgid "Delete pattern"
-msgstr "/_Ezabatu eredua..."
+msgstr "Ezabatu eredua"
 
-#: app/actions/patterns-actions.c:65
-#, fuzzy
+#: ../app/actions/patterns-actions.c:65
 msgid "_Refresh Patterns"
-msgstr "/_Freskatu ereduak"
+msgstr "_Freskatu ereduak"
 
-#: app/actions/patterns-actions.c:66
-#, fuzzy
+#: ../app/actions/patterns-actions.c:66
 msgid "Refresh patterns"
-msgstr "/_Freskatu ereduak"
+msgstr "Freskatu ereduak"
 
-#: app/actions/patterns-actions.c:74
-#, fuzzy
+#: ../app/actions/patterns-actions.c:74
 msgid "_Edit Pattern..."
-msgstr "/_Editatu eredua"
+msgstr "_Editatu eredua..."
 
-#: app/actions/patterns-actions.c:75
-#, fuzzy
+#: ../app/actions/patterns-actions.c:75
 msgid "Edit pattern"
-msgstr "/_Editatu eredua"
+msgstr "Editatu eredua"
 
-#: app/actions/plug-in-actions.c:62
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:62
 msgid "Filte_rs"
-msgstr "/_Iragazkiak"
+msgstr "_Iragazkiak"
 
-#: app/actions/plug-in-actions.c:63
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:63
 msgid "_Blur"
-msgstr "Lausotu"
+msgstr "_Lausotu"
 
-#: app/actions/plug-in-actions.c:65
+#: ../app/actions/plug-in-actions.c:65
 msgid "Ma_p"
-msgstr ""
+msgstr "M_apa"
 
-#: app/actions/plug-in-actions.c:66
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:66
 msgid "_Noise"
-msgstr "Bat ere ez"
+msgstr "_Zarata"
 
-#: app/actions/plug-in-actions.c:67
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:67
 msgid "Edge-De_tect"
-msgstr "/Iragazkiak/Detektatu e_rtzak"
+msgstr "Detektatu e_rtzak"
 
-#: app/actions/plug-in-actions.c:68
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:68
 msgid "En_hance"
-msgstr "/Iragazkiak/_Nabarmendu"
+msgstr "_Nabarmendu"
 
-#: app/actions/plug-in-actions.c:69
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:69
 msgid "_Generic"
-msgstr "_Erdia"
+msgstr "_Generikoa"
 
-#: app/actions/plug-in-actions.c:70
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:70
 msgid "Gla_ss Effects"
-msgstr "/Iragazkiak/_Beira-efektuak"
+msgstr "_Beira-efektuak"
 
-#: app/actions/plug-in-actions.c:71
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:71
 msgid "_Light Effects"
-msgstr "/Iragazkiak/_Argi-efektuak"
+msgstr "_Argi-efektuak"
 
-#: app/actions/plug-in-actions.c:72
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:72
 msgid "_Distorts"
-msgstr "/Iragazkiak/_Desitxuratzea"
+msgstr "_Desitxuratzea"
 
-#: app/actions/plug-in-actions.c:73
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:73
 msgid "_Artistic"
-msgstr "/Iragazkiak/_Artistikoa"
+msgstr "_Artistikoa"
 
-#: app/actions/plug-in-actions.c:74
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:74
 msgid "_Map"
-msgstr "_M"
+msgstr "_Mapa"
 
-#: app/actions/plug-in-actions.c:75
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:75
 msgid "_Render"
-msgstr "_Erdia"
+msgstr "_Errendatuak"
 
-#: app/actions/plug-in-actions.c:76
+#: ../app/actions/plug-in-actions.c:76
 msgid "_Clouds"
-msgstr ""
+msgstr "_Hodeiak"
 
-#: app/actions/plug-in-actions.c:77
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:77
 msgid "_Nature"
-msgstr "_Izena:"
+msgstr "_Natura"
 
-#: app/actions/plug-in-actions.c:79
+#: ../app/actions/plug-in-actions.c:79
 msgid "_Web"
-msgstr ""
+msgstr "_Web"
 
-#: app/actions/plug-in-actions.c:80
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:80
 msgid "An_imation"
-msgstr "/Iragazkiak/An_imazioa"
+msgstr "An_imazioa"
 
-#: app/actions/plug-in-actions.c:81
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:81
 msgid "C_ombine"
-msgstr "/Iragazkiak/Ko_nbinatu"
+msgstr "Ko_nbinatu"
 
-#: app/actions/plug-in-actions.c:82
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:82
 msgid "To_ys"
-msgstr "Tresnak"
+msgstr "_Jostagarriak"
 
-#: app/actions/plug-in-actions.c:85
-#, fuzzy
+#: ../app/actions/plug-in-actions.c:85
 msgid "Reset all Filters..."
-msgstr "/Berrasieratu tresna-aukerak g_uztiak..."
+msgstr "Berrasieratu iragazki guztiak..."
 
-#: app/actions/plug-in-actions.c:93 app/actions/plug-in-actions.c:363
+#: ../app/actions/plug-in-actions.c:93 ../app/actions/plug-in-actions.c:363
 msgid "Repeat Last"
 msgstr "Errepikatu azkena"
 
-#: app/actions/plug-in-actions.c:98 app/actions/plug-in-actions.c:365
+#: ../app/actions/plug-in-actions.c:98 ../app/actions/plug-in-actions.c:365
 msgid "Re-Show Last"
 msgstr "Erakutsi berriro azkena"
 
-#: app/actions/plug-in-actions.c:349
+#: ../app/actions/plug-in-actions.c:349
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "Erre_pikatu \"%s\""
 
-#: app/actions/plug-in-actions.c:350
+#: ../app/actions/plug-in-actions.c:350
 #, c-format
 msgid "R_e-show \"%s\""
 msgstr "Erakutsi _berriro \"%s\""
 
-#: app/actions/plug-in-commands.c:193
-#, fuzzy
+#: ../app/actions/plug-in-commands.c:193
 msgid "Reset all Filters"
-msgstr "Iragazki erabilgarriak"
+msgstr "Berrasieratu iragazki guztiak"
 
-#: app/actions/plug-in-commands.c:207
-#, fuzzy
+#: ../app/actions/plug-in-commands.c:207
 msgid "Do you really want to reset all filters to default values?"
-msgstr ""
-"Nahi duzu tresna-aukera guztiak lehenespeneko balioekin berrasieratzea?"
+msgstr "Nahi duzu iragazki guztiak lehenespeneko balioekin berrasieratzea?"
 
-#: app/actions/qmask-actions.c:42
-#, fuzzy
+#: ../app/actions/qmask-actions.c:42
 msgid "Quick Mask Menu"
-msgstr "Maskara bizkorraren menua"
+msgstr "Maskara azkarraren menua"
 
-#: app/actions/qmask-actions.c:46
-#, fuzzy
+#: ../app/actions/qmask-actions.c:46
 msgid "_Configure Color and Opacity..."
-msgstr "/_Konfiguratu kolorea eta opakutasuna..."
+msgstr "_Konfiguratu kolorea eta opakutasuna..."
 
-#: app/actions/qmask-actions.c:54
-#, fuzzy
+#: ../app/actions/qmask-actions.c:54
 msgid "_Quick Mask Active"
-msgstr "/_Maskara azkar aktiboa"
+msgstr "_Maskara bizkor aktiboa"
 
-#: app/actions/qmask-actions.c:60
-#, fuzzy
+#: ../app/actions/qmask-actions.c:60
 msgid "Toggle _Quick Mask"
-msgstr "Maskara bizkorra bai/ez"
+msgstr "Txandakatu _maskara azkarra"
 
-#: app/actions/qmask-actions.c:70
-#, fuzzy
+#: ../app/actions/qmask-actions.c:70
 msgid "Mask _Selected Areas"
-msgstr "/Maskaratu _hautatutako areak"
+msgstr "Maskaratu _hautatutako areak"
 
-#: app/actions/qmask-actions.c:75
-#, fuzzy
+#: ../app/actions/qmask-actions.c:75
 msgid "Mask _Unselected Areas"
-msgstr "/Maskaratu _deshautatutako areak"
+msgstr "Maskaratu _deshautatutako areak"
 
-#: app/actions/qmask-commands.c:106
-#, fuzzy
+#: ../app/actions/qmask-commands.c:106
 msgid "Quick Mask Attributes"
-msgstr "Editatu maskara azkarraren atributuak"
+msgstr "Maskara azkarraren atributuak"
 
-#: app/actions/qmask-commands.c:109
-#, fuzzy
+#: ../app/actions/qmask-commands.c:109
 msgid "Edit Quick Mask Attributes"
 msgstr "Editatu maskara azkarraren atributuak"
 
-#: app/actions/qmask-commands.c:111
-#, fuzzy
+#: ../app/actions/qmask-commands.c:111
 msgid "Edit Quick Mask Color"
 msgstr "Editatu maskara azkarraren kolorea"
 
-#: app/actions/qmask-commands.c:112
+#: ../app/actions/qmask-commands.c:112
 msgid "Mask Opacity:"
 msgstr "Maskararen opakutasuna:"
 
-#: app/actions/select-actions.c:44
-#, fuzzy
+#: ../app/actions/select-actions.c:44
 msgid "Selection Editor Menu"
-msgstr "Hautapenaren editorea"
+msgstr "Hautapen-editorearen menua"
 
-#: app/actions/select-actions.c:47
-#, fuzzy
+#: ../app/actions/select-actions.c:47
 msgid "_Select"
-msgstr "/_Hautatu"
+msgstr "_Hautatu"
 
-#: app/actions/select-actions.c:50
+#: ../app/actions/select-actions.c:50
 msgid "_All"
-msgstr ""
+msgstr "_Dena"
 
-#: app/actions/select-actions.c:51
-#, fuzzy
+#: ../app/actions/select-actions.c:51
 msgid "Select all"
 msgstr "Hautatu dena"
 
-#: app/actions/select-actions.c:56
-#, fuzzy
+#: ../app/actions/select-actions.c:56
 msgid "_None"
-msgstr "Bat ere ez"
+msgstr "_Bat ere ez"
 
-#: app/actions/select-actions.c:57
-#, fuzzy
+#: ../app/actions/select-actions.c:57
 msgid "Select none"
 msgstr "Bat ere ez hautatu"
 
-#: app/actions/select-actions.c:62
-#, fuzzy
+#: ../app/actions/select-actions.c:62
 msgid "_Invert"
-msgstr "Alderantzikatu"
+msgstr "_Alderantzikatu"
 
-#: app/actions/select-actions.c:63
-#, fuzzy
+#: ../app/actions/select-actions.c:63
 msgid "Invert selection"
 msgstr "Alderantzikatu hautapena"
 
-#: app/actions/select-actions.c:68
-#, fuzzy
+#: ../app/actions/select-actions.c:68
 msgid "_Float"
-msgstr "_Letra-tipoa:"
+msgstr "_Mugikorra"
 
-#: app/actions/select-actions.c:73
-#, fuzzy
+#: ../app/actions/select-actions.c:73
 msgid "Fea_ther..."
-msgstr "/Hautatu/Lau_sotu..."
+msgstr "Difumina_tu..."
 
-#: app/actions/select-actions.c:78
-#, fuzzy
+#: ../app/actions/select-actions.c:78
 msgid "_Sharpen"
-msgstr "Garbitu"
+msgstr "_Enfokatu"
 
-#: app/actions/select-actions.c:83
-#, fuzzy
+#: ../app/actions/select-actions.c:83
 msgid "S_hrink..."
-msgstr "Zizailatzen..."
+msgstr "_Uzkurtu..."
 
-#: app/actions/select-actions.c:88
-#, fuzzy
+#: ../app/actions/select-actions.c:88
 msgid "_Grow..."
-msgstr "/Hautatu/_Handitu..."
+msgstr "_Handitu..."
 
-#: app/actions/select-actions.c:93
-#, fuzzy
+#: ../app/actions/select-actions.c:93
 msgid "Bo_rder..."
-msgstr "/Hautatu/Ert_za..."
+msgstr "Ert_za..."
 
-#: app/actions/select-actions.c:98
-#, fuzzy
+#: ../app/actions/select-actions.c:98
 msgid "Save to _Channel"
-msgstr "/Hautatu/Gorde ka_nalean"
+msgstr "Gorde ka_nalean"
 
-#: app/actions/select-actions.c:99
-#, fuzzy
+#: ../app/actions/select-actions.c:99
 msgid "Save selection to channel"
 msgstr "Gorde hautapena kanalean"
 
-#: app/actions/select-actions.c:104
-#, fuzzy
+#: ../app/actions/select-actions.c:104
 msgid "_Stroke Selection..."
-msgstr "Trazatu hautapena"
+msgstr "_Trazatu hautapena..."
 
-#: app/actions/select-actions.c:105
-#, fuzzy
+#: ../app/actions/select-actions.c:105
 msgid "Stroke selection..."
-msgstr "Trazatu hautapena"
+msgstr "Trazatu hautapena..."
 
-#: app/actions/select-actions.c:110
-#, fuzzy
+#: ../app/actions/select-actions.c:110
 msgid "_Stroke Selection"
-msgstr "Trazatu hautapena"
+msgstr "_Trazatu hautapena"
 
-#: app/actions/select-actions.c:111
-#, fuzzy
+#: ../app/actions/select-actions.c:111
 msgid "Stroke selection with last values"
-msgstr "Trazatu hautapena"
+msgstr "Trazatu hautapena azken balioekin"
 
-#: app/actions/select-commands.c:136 app/core/gimpselection.c:201
+#: ../app/actions/select-commands.c:136 ../app/core/gimpselection.c:201
 msgid "Feather Selection"
 msgstr "Difuminatu hautapena"
 
-#: app/actions/select-commands.c:140
+#: ../app/actions/select-commands.c:140
 msgid "Feather selection by"
 msgstr "Difuminatu hautapena:"
 
-#: app/actions/select-commands.c:171 app/core/gimpselection.c:208
+#: ../app/actions/select-commands.c:171 ../app/core/gimpselection.c:208
 msgid "Shrink Selection"
 msgstr "Txikitu hautapena"
 
-#: app/actions/select-commands.c:175
+#: ../app/actions/select-commands.c:175
 msgid "Shrink selection by"
 msgstr "Uzkurtu hautapena:"
 
-#: app/actions/select-commands.c:184
+#: ../app/actions/select-commands.c:184
 msgid "Shrink from image border"
 msgstr "Uzkurtu irudiaren ertzetik"
 
-#: app/actions/select-commands.c:205 app/core/gimpselection.c:207
+#: ../app/actions/select-commands.c:205 ../app/core/gimpselection.c:207
 msgid "Grow Selection"
 msgstr "Handitu hautapena"
 
-#: app/actions/select-commands.c:209
+#: ../app/actions/select-commands.c:209
 msgid "Grow selection by"
 msgstr "Handitu hautapena:"
 
-#: app/actions/select-commands.c:228 app/core/gimpselection.c:206
+#: ../app/actions/select-commands.c:228 ../app/core/gimpselection.c:206
 msgid "Border Selection"
 msgstr "Hautapenaren ertza"
 
-#: app/actions/select-commands.c:232
+#: ../app/actions/select-commands.c:232
 msgid "Border selection by"
 msgstr "Ertzaren hautapena:"
 
-#: app/actions/select-commands.c:275 app/actions/select-commands.c:301
-#: app/actions/vectors-commands.c:365 app/actions/vectors-commands.c:392
-#: app/dialogs/stroke-dialog.c:275
+#: ../app/actions/select-commands.c:275 ../app/actions/select-commands.c:301
+#: ../app/actions/vectors-commands.c:365 ../app/actions/vectors-commands.c:392
+#: ../app/dialogs/stroke-dialog.c:275
 msgid "There is no active layer or channel to stroke to."
 msgstr "Ez dago trazatzeko geruza edo kanal aktiborik."
 
-#: app/actions/select-commands.c:280 app/core/gimpselection.c:184
+#: ../app/actions/select-commands.c:280 ../app/core/gimpselection.c:184
 msgid "Stroke Selection"
 msgstr "Trazatu hautapena"
 
-#: app/actions/templates-actions.c:42
+#: ../app/actions/templates-actions.c:42
 msgid "Templates Menu"
 msgstr "Txantiloi-menua"
 
-#: app/actions/templates-actions.c:46
-#, fuzzy
+#: ../app/actions/templates-actions.c:46
 msgid "_Create Image from Template..."
-msgstr "/_Sortu irudia txantiloitik..."
+msgstr "_Sortu irudia txantiloitik..."
 
-#: app/actions/templates-actions.c:47
+#: ../app/actions/templates-actions.c:47
 msgid "Create a new image from the selected template"
 msgstr "Sortu irudi berria hautatutako txantiloitik"
 
-#: app/actions/templates-actions.c:52
-#, fuzzy
+#: ../app/actions/templates-actions.c:52
 msgid "_New Template..."
-msgstr "/_Txantiloi berria..."
+msgstr "_Txantiloi berria..."
 
-#: app/actions/templates-actions.c:53
+#: ../app/actions/templates-actions.c:53
 msgid "Create a new template"
 msgstr "Sortu txantiloi berria"
 
-#: app/actions/templates-actions.c:58
-#, fuzzy
+#: ../app/actions/templates-actions.c:58
 msgid "D_uplicate Template..."
-msgstr "/_Bikoiztu txantiloia..."
+msgstr "_Bikoiztu txantiloia..."
 
-#: app/actions/templates-actions.c:59
+#: ../app/actions/templates-actions.c:59
 msgid "Duplicate the selected template"
 msgstr "Bikoiztu hautatutako txantiloia"
 
-#: app/actions/templates-actions.c:64
-#, fuzzy
+#: ../app/actions/templates-actions.c:64
 msgid "_Edit Template..."
-msgstr "/_Editatu txantiloia..."
+msgstr "_Editatu txantiloia..."
 
-#: app/actions/templates-actions.c:65
+#: ../app/actions/templates-actions.c:65
 msgid "Edit the selected template"
 msgstr "Editatu hautatutako txantiloia"
 
-#: app/actions/templates-actions.c:70
-#, fuzzy
+#: ../app/actions/templates-actions.c:70
 msgid "_Delete Template"
-msgstr "/_Ezabatu txantiloia"
+msgstr "_Ezabatu txantiloia"
 
-#: app/actions/templates-actions.c:71
+#: ../app/actions/templates-actions.c:71
 msgid "Delete the selected template"
 msgstr "Ezabatu hautatutako txantiloia"
 
-#: app/actions/templates-commands.c:123
+#: ../app/actions/templates-commands.c:123
 msgid "New Template"
 msgstr "Txantiloi berria"
 
-#: app/actions/templates-commands.c:126
+#: ../app/actions/templates-commands.c:126
 msgid "Create a New Template"
 msgstr "Sortu txantiloi berria"
 
-#: app/actions/templates-commands.c:185 app/actions/templates-commands.c:188
+#: ../app/actions/templates-commands.c:185
+#: ../app/actions/templates-commands.c:188
 msgid "Edit Template"
 msgstr "Editatu txantiloia"
 
-#: app/actions/templates-commands.c:224
+#: ../app/actions/templates-commands.c:224
 msgid "Delete Template"
 msgstr "Ezabatu txantiloia"
 
-#: app/actions/templates-commands.c:243
+#: ../app/actions/templates-commands.c:243
 #, c-format
-msgid ""
-"Are you sure you want to delete template '%s' from the list and from disk?"
-msgstr ""
-"Ziur zaude \"%s\"txantiloia  ezabatu nahi duzula zerrendatik eta diskotik?"
+msgid "Are you sure you want to delete template '%s' from the list and from disk?"
+msgstr "Ziur zaude \"%s\"txantiloia  ezabatu nahi duzula zerrendatik eta diskotik?"
 
-#: app/actions/text-editor-actions.c:44
-#, fuzzy
+#: ../app/actions/text-editor-actions.c:44
 msgid "Open"
-msgstr "/Fitxategia/_Ireki..."
+msgstr "Ireki"
 
-#: app/actions/text-editor-actions.c:45
-#, fuzzy
+#: ../app/actions/text-editor-actions.c:45
 msgid "Load text from file"
 msgstr "Kargatu testua fitxategitik"
 
-#: app/actions/text-editor-actions.c:50 app/core/gimp-edit.c:350
+#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:353
 msgid "Clear"
 msgstr "Garbitu"
 
-#: app/actions/text-editor-actions.c:51
-#, fuzzy
+#: ../app/actions/text-editor-actions.c:51
 msgid "Clear all text"
 msgstr "Garbitu testu osoa"
 
-#: app/actions/text-editor-actions.c:59
+#: ../app/actions/text-editor-actions.c:59
 msgid "LTR"
-msgstr ""
+msgstr "Ezk->Esk"
 
-#: app/actions/text-editor-actions.c:60 app/text/text-enums.c:51
-#, fuzzy
+#: ../app/actions/text-editor-actions.c:60 ../app/text/text-enums.c:51
 msgid "From left to right"
 msgstr "Ezkerretik eskuinera"
 
-#: app/actions/text-editor-actions.c:65
+#: ../app/actions/text-editor-actions.c:65
 msgid "RTL"
-msgstr ""
+msgstr "Esk->Ezk"
 
-#: app/actions/text-editor-actions.c:66 app/text/text-enums.c:52
-#, fuzzy
+#: ../app/actions/text-editor-actions.c:66 ../app/text/text-enums.c:52
 msgid "From right to left"
 msgstr "Eskuinetik ezkerrera"
 
-#: app/actions/text-editor-commands.c:60
+#: ../app/actions/text-editor-commands.c:60
 msgid "Open Text File (UTF-8)"
 msgstr "Ireki testu-fitxategia (UTF-8)"
 
-#: app/actions/text-editor-commands.c:132 app/config/gimpconfig-utils.c:552
-#: app/config/gimpscanner.c:92 app/core/gimpbrush.c:396
-#: app/core/gimpbrushgenerated.c:601 app/core/gimpbrushpipe.c:338
-#: app/core/gimpgradient-load.c:63 app/core/gimppalette.c:360
-#: app/core/gimppattern.c:328 app/tools/gimpimagemaptool.c:608
-#: app/xcf/xcf.c:291
+#: ../app/actions/text-editor-commands.c:132
+#: ../app/config/gimpconfig-utils.c:552 ../app/config/gimpscanner.c:92
+#: ../app/core/gimpbrush.c:396 ../app/core/gimpbrushgenerated.c:601
+#: ../app/core/gimpbrushpipe.c:338 ../app/core/gimpgradient-load.c:63
+#: ../app/core/gimppalette.c:360 ../app/core/gimppattern.c:328
+#: ../app/tools/gimpimagemaptool.c:608 ../app/xcf/xcf.c:291
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "Ezin izan da '%s' ireki irakurtzeko: %s"
 
-#: app/actions/tool-options-actions.c:56
+#: ../app/actions/tool-options-actions.c:56
 msgid "Tool Options Menu"
 msgstr "Tresna-aukeren menua"
 
-#: app/actions/tool-options-actions.c:60
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:60
 msgid "_Save Options to"
-msgstr "/_Gorde aukerak"
+msgstr "_Gorde aukerak"
 
-#: app/actions/tool-options-actions.c:64
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:64
 msgid "_Restore Options from"
-msgstr "Leheneratu aukerak hemendik..."
+msgstr "_Leheneratu aukerak hemendik..."
 
-#: app/actions/tool-options-actions.c:68
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:68
 msgid "Re_name Saved Options"
-msgstr "/_Aldatu gordetako aukeren izena"
+msgstr "_Aldatu gordetako aukeren izena"
 
-#: app/actions/tool-options-actions.c:72
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:72
 msgid "_Delete Saved Options"
-msgstr "/E_zabatu gordetako aukerak"
+msgstr "E_zabatu gordetako aukerak"
 
-#: app/actions/tool-options-actions.c:76
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:76
 msgid "_New Entry..."
-msgstr "/_Bide berria..."
+msgstr "_Sarrera berria..."
 
-#: app/actions/tool-options-actions.c:81
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:81
 msgid "R_eset Tool Options"
-msgstr "/_Berrasieratu tresna-aukerak"
+msgstr "_Berrasieratu tresna-aukerak"
 
-#: app/actions/tool-options-actions.c:82
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:82
 msgid "Reset to default values"
-msgstr "Leheneratu gordetako balio lehenetsiak"
+msgstr "Berrasieratu balio lehenetsiak"
 
-#: app/actions/tool-options-actions.c:87
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:87
 msgid "Reset _all Tool Options..."
-msgstr "/Berrasieratu tresna-aukerak g_uztiak..."
+msgstr "Berrasieratu tresna-aukerak g_uztiak..."
 
-#: app/actions/tool-options-actions.c:88
-#, fuzzy
+#: ../app/actions/tool-options-actions.c:88
 msgid "Reset all tool options"
-msgstr "/Berrasieratu tresna-aukerak g_uztiak..."
+msgstr "Berrasieratu tresna-aukerak guztiak"
 
-#: app/actions/tool-options-commands.c:73
+#: ../app/actions/tool-options-commands.c:73
 msgid "Save Tool Options"
 msgstr "Gorde tresna-aukerak"
 
-#: app/actions/tool-options-commands.c:77
+#: ../app/actions/tool-options-commands.c:77
 msgid "Enter a name for the saved options"
 msgstr "Sartu izena gordetako aukerentzako"
 
-#: app/actions/tool-options-commands.c:78
-#: app/actions/tool-options-commands.c:251
-#: app/actions/tool-options-commands.c:269
+#: ../app/actions/tool-options-commands.c:78
+#: ../app/actions/tool-options-commands.c:251
+#: ../app/actions/tool-options-commands.c:269
 msgid "Saved Options"
 msgstr "Aukerak gordeta"
 
-#: app/actions/tool-options-commands.c:146
+#: ../app/actions/tool-options-commands.c:146
 msgid "Rename Saved Tool Options"
 msgstr "Aldatu gordetako tresna-aukeren izena"
 
-#: app/actions/tool-options-commands.c:150
+#: ../app/actions/tool-options-commands.c:150
 msgid "Enter a new name for the saved options"
 msgstr "Sartu izen berri bat gordetako aukerentzako"
 
-#: app/actions/tool-options-commands.c:215
+#: ../app/actions/tool-options-commands.c:215
 msgid "Reset Tool Options"
 msgstr "Berrasieratu tresna-aukerak"
 
-#: app/actions/tool-options-commands.c:233
+#: ../app/actions/tool-options-commands.c:233
 msgid "Do you really want to reset all tool options to default values?"
-msgstr ""
-"Nahi duzu tresna-aukera guztiak lehenespeneko balioekin berrasieratzea?"
+msgstr "Nahi duzu tresna-aukera guztiak lehenespeneko balioekin berrasieratzea?"
 
-#: app/actions/tools-actions.c:47
-#, fuzzy
+#: ../app/actions/tools-actions.c:47
 msgid "Tools Menu"
-msgstr "Tresna-aukeren menua"
+msgstr "Tresnen menua"
 
-#: app/actions/tools-actions.c:50
-#, fuzzy
+#: ../app/actions/tools-actions.c:50
 msgid "_Tools"
-msgstr "/_Tresnak"
+msgstr "_Tresnak"
 
-#: app/actions/tools-actions.c:51
-#, fuzzy
+#: ../app/actions/tools-actions.c:51
 msgid "_Selection Tools"
-msgstr "/Tresnak/_Hautapen-tresnak"
+msgstr "_Hautapen-tresnak"
 
-#: app/actions/tools-actions.c:52
-#, fuzzy
+#: ../app/actions/tools-actions.c:52
 msgid "_Paint Tools"
-msgstr "Margotzeko tresna:"
+msgstr "_Margotze-tresnak"
 
-#: app/actions/tools-actions.c:53
-#, fuzzy
+#: ../app/actions/tools-actions.c:53
 msgid "_Transform Tools"
-msgstr "/Tresnak/_Eraldatze-tresnak"
+msgstr "_Eraldatze-tresnak"
 
-#: app/actions/tools-actions.c:54
-#, fuzzy
+#: ../app/actions/tools-actions.c:54
 msgid "_Color Tools"
-msgstr "/Tresnak/_Kolore-tresnak"
+msgstr "_Kolore-tresnak"
 
-#: app/actions/tools-actions.c:57
-#, fuzzy
+#: ../app/actions/tools-actions.c:57
 msgid "_Reset Order & Visibility"
-msgstr "Elementuaren ikusgaitasuna"
+msgstr "_Berrasieratu antolaketa eta ikusgaitasuna"
 
-#: app/actions/tools-actions.c:58
+#: ../app/actions/tools-actions.c:58
 msgid "Reset tool order and visibility"
-msgstr ""
+msgstr "Berrasieratu tresnaren antolaketa eta ikusgaitasuna"
 
-#: app/actions/tools-actions.c:66
-#, fuzzy
+#: ../app/actions/tools-actions.c:66
 msgid "_Show in Toolbox"
-msgstr "Erakutsi aho_lkuak"
+msgstr "_Erakutsi tresna-kutxan"
 
-#: app/actions/tools-actions.c:75
-#, fuzzy
+#: ../app/actions/tools-actions.c:75
 msgid "_By Color"
-msgstr "RGB kolorea"
+msgstr "_Kolorearen arabera"
 
-#: app/actions/tools-actions.c:80
-#, fuzzy
+#: ../app/actions/tools-actions.c:80
 msgid "_Arbitrary Rotation..."
-msgstr "/Geruza/Eraldatu/_Biraketa arbitrarioa..."
+msgstr "_Biraketa arbitrarioa..."
 
-#: app/actions/vectors-actions.c:44
+#: ../app/actions/vectors-actions.c:44
 msgid "Paths Menu"
 msgstr "Bide-menua"
 
-#: app/actions/vectors-actions.c:48
-#, fuzzy
+#: ../app/actions/vectors-actions.c:48
 msgid "Path _Tool"
-msgstr "/Bidearen _tresna"
+msgstr "Bidearen _tresna"
 
-#: app/actions/vectors-actions.c:53
-#, fuzzy
+#: ../app/actions/vectors-actions.c:53
 msgid "_Edit Path Attributes..."
-msgstr "/_Editatu bidearen atributuak..."
+msgstr "_Editatu bidearen atributuak..."
 
-#: app/actions/vectors-actions.c:54
-#, fuzzy
+#: ../app/actions/vectors-actions.c:54
 msgid "Edit path attributes"
 msgstr "Editatu bidearen atributuak"
 
-#: app/actions/vectors-actions.c:59
-#, fuzzy
+#: ../app/actions/vectors-actions.c:59
 msgid "_New Path..."
-msgstr "/_Bide berria..."
+msgstr "_Bide berria..."
 
-#: app/actions/vectors-actions.c:60
-#, fuzzy
+#: ../app/actions/vectors-actions.c:60
 msgid "New path..."
-msgstr "/_Bide berria..."
+msgstr "Bide berria..."
 
-#: app/actions/vectors-actions.c:65
-#, fuzzy
+#: ../app/actions/vectors-actions.c:65
 msgid "_New Path"
-msgstr "Bide berria"
+msgstr "_Bide berria"
 
-#: app/actions/vectors-actions.c:66
-#, fuzzy
+#: ../app/actions/vectors-actions.c:66
 msgid "New path with last values"
-msgstr ""
-"Bide berria\n"
-"%s bide elkarrizketa-koadro berria"
+msgstr "Bide berria azken balioekin"
 
-#: app/actions/vectors-actions.c:71
-#, fuzzy
+#: ../app/actions/vectors-actions.c:71
 msgid "D_uplicate Path"
-msgstr "/Bi_koiztu bidea"
+msgstr "Bi_koiztu bidea"
 
-#: app/actions/vectors-actions.c:72
-#, fuzzy
+#: ../app/actions/vectors-actions.c:72
 msgid "Duplicate path"
 msgstr "Bikoiztu bidea"
 
-#: app/actions/vectors-actions.c:77
-#, fuzzy
+#: ../app/actions/vectors-actions.c:77
 msgid "_Delete Path"
-msgstr "/E_zabatu bidea"
+msgstr "E_zabatu bidea"
 
-#: app/actions/vectors-actions.c:78
-#, fuzzy
+#: ../app/actions/vectors-actions.c:78
 msgid "Delete path"
 msgstr "Ezabatu bidea"
 
-#: app/actions/vectors-actions.c:83
-#, fuzzy
+#: ../app/actions/vectors-actions.c:83
 msgid "Merge _Visible Paths"
-msgstr "Batu ikusgai dauden bideak"
+msgstr "Batu _ikusgai dauden bideak"
 
-#: app/actions/vectors-actions.c:88
-#, fuzzy
+#: ../app/actions/vectors-actions.c:88
 msgid "_Raise Path"
-msgstr "/_Igo bidea"
+msgstr "_Igo bidea"
 
-#: app/actions/vectors-actions.c:89
-#, fuzzy
+#: ../app/actions/vectors-actions.c:89
 msgid "Raise path"
 msgstr "Igo bidea"
 
-#: app/actions/vectors-actions.c:94
-#, fuzzy
+#: ../app/actions/vectors-actions.c:94
 msgid "Raise Path to _Top"
-msgstr "Igo bidea goienera"
+msgstr "Igo bidea g_oienera"
 
-#: app/actions/vectors-actions.c:95
-#, fuzzy
+#: ../app/actions/vectors-actions.c:95
 msgid "Raise path to top"
 msgstr "Igo bidea goienera"
 
-#: app/actions/vectors-actions.c:100
-#, fuzzy
+#: ../app/actions/vectors-actions.c:100
 msgid "_Lower Path"
-msgstr "/_Jaitsi bidea"
+msgstr "_Jaitsi bidea"
 
-#: app/actions/vectors-actions.c:101
-#, fuzzy
+#: ../app/actions/vectors-actions.c:101
 msgid "Lower path"
 msgstr "Jaitsi bidea"
 
-#: app/actions/vectors-actions.c:106
-#, fuzzy
+#: ../app/actions/vectors-actions.c:106
 msgid "Lower Path to _Bottom"
-msgstr "Jaitsi bidea leku baxuenera"
+msgstr "Jaitsi bidea leku _baxuenera"
 
-#: app/actions/vectors-actions.c:107
-#, fuzzy
+#: ../app/actions/vectors-actions.c:107
 msgid "Lower path to bottom"
 msgstr "Jaitsi bidea leku baxuenera"
 
-#: app/actions/vectors-actions.c:112
-#, fuzzy
+#: ../app/actions/vectors-actions.c:112
 msgid "Stro_ke Path..."
-msgstr "/Trazatu bide_a..."
+msgstr "Trazatu bide_a..."
 
-#: app/actions/vectors-actions.c:113
-#, fuzzy
+#: ../app/actions/vectors-actions.c:113
 msgid "Stroke path..."
-msgstr "/Trazatu bide_a..."
+msgstr "Trazatu bidea..."
 
-#: app/actions/vectors-actions.c:118
-#, fuzzy
+#: ../app/actions/vectors-actions.c:118
 msgid "Stro_ke Path"
-msgstr "Trazatu bidea"
+msgstr "T_razatu bidea"
 
-#: app/actions/vectors-actions.c:119
+#: ../app/actions/vectors-actions.c:119
 msgid "Stroke path with last values"
-msgstr ""
+msgstr "Trazatu bidea azken balioekin"
 
-#: app/actions/vectors-actions.c:124
-#, fuzzy
+#: ../app/actions/vectors-actions.c:124
 msgid "Co_py Path"
-msgstr "/Kopia_tu bidea"
+msgstr "Kopia_tu bidea"
 
-#: app/actions/vectors-actions.c:129
-#, fuzzy
+#: ../app/actions/vectors-actions.c:129
 msgid "Paste Pat_h"
-msgstr "/It_satsi bide-izena"
+msgstr "It_satsi bidea"
 
-#: app/actions/vectors-actions.c:134
-#, fuzzy
+#: ../app/actions/vectors-actions.c:134
 msgid "I_mport Path..."
-msgstr "/I_nportatu bidea..."
+msgstr "I_nportatu bidea..."
 
-#: app/actions/vectors-actions.c:139
-#, fuzzy
+#: ../app/actions/vectors-actions.c:139
 msgid "E_xport Path..."
-msgstr "/Esp_ortatu bidea..."
+msgstr "Esp_ortatu bidea..."
 
-#: app/actions/vectors-actions.c:162
-#, fuzzy
+#: ../app/actions/vectors-actions.c:162
 msgid "Path to Sele_ction"
-msgstr "/Bidea hauta_penera"
+msgstr "Bidea hau_tapenera"
 
-#: app/actions/vectors-actions.c:163 app/tools/gimpvectortool.c:1893
-#, fuzzy
+#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1903
 msgid "Path to selection"
 msgstr "Bidea hautapenera"
 
-#: app/actions/vectors-actions.c:168
-#, fuzzy
+#: ../app/actions/vectors-actions.c:168
 msgid "Fr_om Path"
-msgstr "/Hautatu/Bi_detik"
+msgstr "Bi_detik"
 
-#: app/actions/vectors-actions.c:194
-#, fuzzy
+#: ../app/actions/vectors-actions.c:194
 msgid "Selecti_on to Path"
-msgstr "/_Hautapena bidera"
+msgstr "_Hautapena bidera"
 
-#: app/actions/vectors-actions.c:195
-#, fuzzy
+#: ../app/actions/vectors-actions.c:195
 msgid "Selection to path"
-msgstr "/_Hautapena bidera"
+msgstr "Hautapena bidera"
 
-#: app/actions/vectors-actions.c:200
-#, fuzzy
+#: ../app/actions/vectors-actions.c:200
 msgid "To _Path"
-msgstr "Aldatu lekuz bidea"
+msgstr "_Bidera"
 
-#: app/actions/vectors-actions.c:205
-#, fuzzy
+#: ../app/actions/vectors-actions.c:205
 msgid "Selection to Path (_Advanced)"
-msgstr ""
-"Hautapena bidera\n"
-"%s  Aukera aurreratuak"
+msgstr "Hautapena bidera (_aurreratua)"
 
-#: app/actions/vectors-actions.c:206
-#, fuzzy
+#: ../app/actions/vectors-actions.c:206
 msgid "Advanced options"
-msgstr "Aukerak gordeta"
+msgstr "Aukera aurreratuak"
 
-#: app/actions/vectors-commands.c:140
+#: ../app/actions/vectors-commands.c:140
 msgid "Path Attributes"
 msgstr "Bidearen atributuak"
 
-#: app/actions/vectors-commands.c:143
+#: ../app/actions/vectors-commands.c:143
 msgid "Edit Path Attributes"
 msgstr "Editatu bidearen atributuak"
 
-#: app/actions/vectors-commands.c:167 app/actions/vectors-commands.c:168
-#: app/actions/vectors-commands.c:190
+#: ../app/actions/vectors-commands.c:167 ../app/actions/vectors-commands.c:168
+#: ../app/actions/vectors-commands.c:190
 msgid "New Path"
 msgstr "Bide berria"
 
-#: app/actions/vectors-commands.c:171
+#: ../app/actions/vectors-commands.c:171
 msgid "New Path Options"
 msgstr "Bide berriaren aukerak"
 
-#: app/actions/vectors-commands.c:299 app/pdb/paths_cmds.c:1210
+#: ../app/actions/vectors-commands.c:299 ../app/pdb/paths_cmds.c:1210
 msgid "Path to Selection"
 msgstr "Bidea hautapenera"
 
-#: app/actions/vectors-commands.c:370 app/tools/gimpvectortool.c:1923
-#: app/vectors/gimpvectors.c:237
+#: ../app/actions/vectors-commands.c:370 ../app/tools/gimpvectortool.c:1933
+#: ../app/vectors/gimpvectors.c:237
 msgid "Stroke Path"
 msgstr "Trazatu bidea"
 
-#: app/actions/view-actions.c:63
-#, fuzzy
+#: ../app/actions/view-actions.c:63
 msgid "_View"
-msgstr "/I_kusi"
+msgstr "I_kusi"
 
-#: app/actions/view-actions.c:64
-#, fuzzy
+#: ../app/actions/view-actions.c:64
 msgid "_Zoom"
-msgstr "Zooma:"
+msgstr "_Zooma"
 
-#: app/actions/view-actions.c:65
-#, fuzzy
+#: ../app/actions/view-actions.c:65
 msgid "_Padding Color"
-msgstr "Betegarriaren kolore pertsonalizatua:"
+msgstr "_Kolore betegarria"
 
-#: app/actions/view-actions.c:73
-#, fuzzy
+#: ../app/actions/view-actions.c:73
 msgid "_Close"
-msgstr "Klonatu"
+msgstr "It_xi"
 
-#: app/actions/view-actions.c:78
-#, fuzzy
+#: ../app/actions/view-actions.c:78
 msgid "_Fit Image in Window"
-msgstr "Irudi-leihoak"
+msgstr "_Doitu irudia leihoan"
 
-#: app/actions/view-actions.c:79
-#, fuzzy
+#: ../app/actions/view-actions.c:79
 msgid "Fit image in window"
-msgstr "Irudi-leihoak"
+msgstr "Doitu irudia leihoan"
 
-#: app/actions/view-actions.c:84
-#, fuzzy
+#: ../app/actions/view-actions.c:84
 msgid "Fit Image to Window"
-msgstr "Doitu leihora"
+msgstr "Doitu irudia leihora"
 
-#: app/actions/view-actions.c:85
-#, fuzzy
+#: ../app/actions/view-actions.c:85
 msgid "Fit image to window"
-msgstr "Doitu leihora"
+msgstr "Doitu irudia leihoan"
 
-#: app/actions/view-actions.c:90
-#, fuzzy
+#: ../app/actions/view-actions.c:90
 msgid "_Info Window"
-msgstr "Informazio-leihoa"
+msgstr "_Informazio-leihoa"
 
-#: app/actions/view-actions.c:95
-#, fuzzy
+#: ../app/actions/view-actions.c:95
 msgid "Na_vigation Window"
-msgstr "/Ikusi/Na_bigazio-leihoa"
+msgstr "Na_bigazio-leihoa"
 
-#: app/actions/view-actions.c:100
-#, fuzzy
+#: ../app/actions/view-actions.c:100
 msgid "Display _Filters..."
-msgstr "/Ikusi/Bistaratu i_ragazkiak..."
+msgstr "Bistaratu i_ragazkiak..."
 
-#: app/actions/view-actions.c:105
-#, fuzzy
+#: ../app/actions/view-actions.c:105
 msgid "Shrink _Wrap"
-msgstr "Uzkurtu doitzea"
+msgstr "_Uzkurtu"
 
-#: app/actions/view-actions.c:106
-#, fuzzy
+#: ../app/actions/view-actions.c:106
 msgid "Shrink wrap"
-msgstr "Uzkurtu doitzea"
+msgstr "Uzkurtu"
 
-#: app/actions/view-actions.c:111
+#: ../app/actions/view-actions.c:111
 msgid "Move to Screen..."
-msgstr ""
+msgstr "Eraman pantailara..."
 
-#: app/actions/view-actions.c:119
-#, fuzzy
+#: ../app/actions/view-actions.c:119
 msgid "_Dot for Dot"
-msgstr "/Ikusi/_Puntuz puntu"
+msgstr "_Puntuz puntu"
 
-#: app/actions/view-actions.c:125
-#, fuzzy
+#: ../app/actions/view-actions.c:125
 msgid "Show _Selection"
 msgstr "Erakutsi _hautapena"
 
-#: app/actions/view-actions.c:131
+#: ../app/actions/view-actions.c:131
 msgid "Show _Layer Boundary"
 msgstr "Erakutsi _geruzaren muga"
 
-#: app/actions/view-actions.c:137
+#: ../app/actions/view-actions.c:137
 msgid "Show _Guides"
 msgstr "Erakutsi _gidak"
 
-#: app/actions/view-actions.c:143
-#, fuzzy
+#: ../app/actions/view-actions.c:143
 msgid "Sn_ap to Guides"
-msgstr "/Ikusi/Egokitu gi_detara"
+msgstr "Atxikitu gi_detara"
 
-#: app/actions/view-actions.c:149
-#, fuzzy
+#: ../app/actions/view-actions.c:149
 msgid "S_how Grid"
 msgstr "Erakutsi _sareta"
 
-#: app/actions/view-actions.c:155
-#, fuzzy
+#: ../app/actions/view-actions.c:155
 msgid "Sna_p to Grid"
-msgstr "/Ikusi/Egokitu _saretara"
+msgstr "Atxikitu _saretara"
 
-#: app/actions/view-actions.c:161
+#: ../app/actions/view-actions.c:161
 msgid "Show _Menubar"
 msgstr "Erakutsi _menu-barra"
 
-#: app/actions/view-actions.c:167
-#, fuzzy
+#: ../app/actions/view-actions.c:167
 msgid "Show R_ulers"
 msgstr "Erakutsi _erregelak"
 
-#: app/actions/view-actions.c:173
+#: ../app/actions/view-actions.c:173
 msgid "Show Scroll_bars"
 msgstr "Erakutsi _korritze-barrak"
 
-#: app/actions/view-actions.c:179
+#: ../app/actions/view-actions.c:179
 msgid "Show S_tatusbar"
 msgstr "Erakutsi egoera-_barra"
 
-#: app/actions/view-actions.c:185
-#, fuzzy
+#: ../app/actions/view-actions.c:185
 msgid "Fullscr_een"
-msgstr "/Ikusi/Pa_ntaila osoa"
+msgstr "Pa_ntaila osoa"
 
-#: app/actions/view-actions.c:234
-#, fuzzy
+#: ../app/actions/view-actions.c:234
 msgid "16:1  (1600%)"
-msgstr "/Ikusi/Zooma/16:1  (%1600)"
+msgstr "16:1  (%1600)"
 
-#: app/actions/view-actions.c:239
-#, fuzzy
+#: ../app/actions/view-actions.c:239
 msgid "8:1  (800%)"
-msgstr "/Ikusi/Zooma/8:1  (%800)"
+msgstr "8:1  (%800)"
 
-#: app/actions/view-actions.c:244
-#, fuzzy
+#: ../app/actions/view-actions.c:244
 msgid "4:1  (400%)"
-msgstr "/Ikusi/Zooma/4:1  (%400)"
+msgstr "4:1  (%400)"
 
-#: app/actions/view-actions.c:249
-#, fuzzy
+#: ../app/actions/view-actions.c:249
 msgid "2:1  (200%)"
-msgstr "/Ikusi/Zooma/2:1  (%200)"
+msgstr "2:1  (%200)"
 
-#: app/actions/view-actions.c:254
-#, fuzzy
+#: ../app/actions/view-actions.c:254
 msgid "1:1  (100%)"
-msgstr "/Ikusi/Zooma/1:1  (%100)"
+msgstr "1:1  (%100)"
 
-#: app/actions/view-actions.c:255
+#: ../app/actions/view-actions.c:255
 msgid "Zoom 1:1"
 msgstr "Zooma 1:1"
 
-#: app/actions/view-actions.c:260
-#, fuzzy
+#: ../app/actions/view-actions.c:260
 msgid "1:2  (50%)"
-msgstr "/Ikusi/Zooma/1:2  (%50)"
+msgstr "1:2  (%50)"
 
-#: app/actions/view-actions.c:265
-#, fuzzy
+#: ../app/actions/view-actions.c:265
 msgid "1:4  (25%)"
-msgstr "/Ikusi/Zooma/1:4  (%25)"
+msgstr "1:4  (%25)"
 
-#: app/actions/view-actions.c:270
-#, fuzzy
+#: ../app/actions/view-actions.c:270
 msgid "1:8  (12.5%)"
-msgstr "/Ikusi/Zooma/1:8 (%%12,5)"
+msgstr "1:8 (%12,5)"
 
-#: app/actions/view-actions.c:275
-#, fuzzy
+#: ../app/actions/view-actions.c:275
 msgid "1:16  (6.25%)"
-msgstr "/Ikusi/Zooma/1:16  (%6,25)"
+msgstr "1:16  (%6,25)"
 
-#: app/actions/view-actions.c:280
-#, fuzzy
+#: ../app/actions/view-actions.c:280
 msgid "O_ther..."
-msgstr "/Hautatu/Lau_sotu..."
+msgstr "_Bestelakoa..."
 
-#: app/actions/view-actions.c:288
-#, fuzzy
+#: ../app/actions/view-actions.c:288
 msgid "From _Theme"
-msgstr "/_Gaitik"
+msgstr "_Gaitik"
 
-#: app/actions/view-actions.c:293
-#, fuzzy
+#: ../app/actions/view-actions.c:293
 msgid "_Light Check Color"
-msgstr "/Koadrikularen kolore _argia"
+msgstr "Koadrikularen kolore _argia"
 
-#: app/actions/view-actions.c:298
-#, fuzzy
+#: ../app/actions/view-actions.c:298
 msgid "_Dark Check Color"
-msgstr "/Koadrikularen kolore _iluna"
+msgstr "Koadrikularen kolore _iluna"
 
-#: app/actions/view-actions.c:303
-#, fuzzy
+#: ../app/actions/view-actions.c:303
 msgid "Select _Custom Color..."
-msgstr "/Hautatu kolore p_ertsonalizatua..."
+msgstr "Hautatu kolore p_ertsonalizatua..."
 
-#: app/actions/view-actions.c:308
-#, fuzzy
+#: ../app/actions/view-actions.c:308
 msgid "As in _Preferences"
-msgstr "/Hobespenetan _bezala"
+msgstr "Hobespenetan _bezala"
 
-#: app/actions/view-actions.c:592
+#: ../app/actions/view-actions.c:592
 #, c-format
 msgid "Other (%s) ..."
 msgstr "Bestelakoa (%s) ..."
 
-#: app/actions/view-actions.c:601
+#: ../app/actions/view-actions.c:601
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_Zooma (%s)"
 
-#: app/actions/view-commands.c:572
+#: ../app/actions/view-commands.c:572
 msgid "Set Canvas Padding Color"
 msgstr "Ezarri oihalaren kolore betegarria"
 
-#: app/actions/view-commands.c:574
-#, fuzzy
+#: ../app/actions/view-commands.c:574
 msgid "Set Custom Canvas Padding Color"
-msgstr "Ezarri oihalaren kolore betegarria"
+msgstr "Ezarri oihalaren kolore pertsonalizatu betegarria"
 
-#: app/base/base-enums.c:23
+#: ../app/base/base-enums.c:23
 msgid "Smooth"
 msgstr "Leuna"
 
-#: app/base/base-enums.c:24
+#: ../app/base/base-enums.c:24
 msgid "Freehand"
 msgstr "Pultsuan"
 
-#: app/base/base-enums.c:55 app/widgets/gimpwidgets-constructors.c:76
-#: app/widgets/gimpwidgets-constructors.c:109
+#: ../app/base/base-enums.c:55 ../app/widgets/gimpwidgets-constructors.c:76
+#: ../app/widgets/gimpwidgets-constructors.c:109
 msgid "Value"
 msgstr "Balioa"
 
-#: app/base/base-enums.c:56 app/core/core-enums.c:157
-#: app/tools/gimpcolorbalancetool.c:301
+#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:157
+#: ../app/tools/gimpcolorbalancetool.c:301
 msgid "Red"
 msgstr "Gorria"
 
-#: app/base/base-enums.c:57 app/core/core-enums.c:158
-#: app/tools/gimpcolorbalancetool.c:308
+#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:158
+#: ../app/tools/gimpcolorbalancetool.c:308
 msgid "Green"
 msgstr "Berdea"
 
-#: app/base/base-enums.c:58 app/core/core-enums.c:159
-#: app/tools/gimpcolorbalancetool.c:315
+#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:159
+#: ../app/tools/gimpcolorbalancetool.c:315
 msgid "Blue"
 msgstr "Urdina"
 
-#: app/base/base-enums.c:59 app/core/core-enums.c:162
+#: ../app/base/base-enums.c:59 ../app/core/core-enums.c:162
 msgid "Alpha"
 msgstr "Alfa"
 
-#: app/base/base-enums.c:60 app/display/gimpdisplayshell-title.c:234
-#: app/widgets/widgets-enums.c:114
+#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:234
+#: ../app/widgets/widgets-enums.c:114
 msgid "RGB"
-msgstr "RGB"
+msgstr "GBU"
 
-#: app/base/base-enums.c:88
+#: ../app/base/base-enums.c:88
 msgid "None (Fastest)"
 msgstr "Bat ere ez (azkarrena)"
 
-#: app/base/base-enums.c:89 app/core/core-enums.c:370
-#: app/widgets/widgets-enums.c:227
+#: ../app/base/base-enums.c:89 ../app/core/core-enums.c:370
+#: ../app/widgets/widgets-enums.c:227
 msgid "Linear"
 msgstr "Lineala"
 
-#: app/base/base-enums.c:90
+#: ../app/base/base-enums.c:90
 msgid "Cubic (Best)"
 msgstr "Kubikoa (onena)"
 
-#: app/base/base-enums.c:188
+#: ../app/base/base-enums.c:188
 msgid "Shadows"
 msgstr "Itzalak"
 
-#: app/base/base-enums.c:189
+#: ../app/base/base-enums.c:189
 msgid "Midtones"
 msgstr "Tarteko tonuak"
 
-#: app/base/base-enums.c:190
+#: ../app/base/base-enums.c:190
 msgid "Highlights"
 msgstr "Argi-ukituak"
 
-#: app/base/tile-swap.c:456
+#: ../app/base/tile-swap.c:456
 msgid ""
 "Unable to open swap file. The 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 the Gimp and check the location of the "
 "swap directory in your Preferences."
 msgstr ""
+"Ezin da trukatze-fitxategia ireki. Gimp-ek memoria gabe gelditu da eta ezin "
+"du trukatze-fitxategia erabili. Irudiaren zati batzuk hondatu daitezke. "
+"Saiatu lan hau beste izen batekin gordetzen, berrabiaratu Gimp eta egiaztatu "
+"trukatze-direktorioaren helbidea hobespenetan."
 
-#: app/config/gimpconfig-deserialize.c:100
+#: ../app/config/gimpconfig-deserialize.c:100
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "%s tokenarentzako balioa ez da baliozko UTF-8 katea"
 
-#: app/config/gimpconfig-deserialize.c:217 app/config/gimpconfig.c:424
-#: app/config/gimpconfig.c:437 app/config/gimpscanner.c:417
-#: app/config/gimpscanner.c:489 app/core/gimp-modules.c:132
-#: app/core/gimp-units.c:169 app/gui/session.c:158
-#: app/plug-in/plug-in-rc.c:183
+#: ../app/config/gimpconfig-deserialize.c:217 ../app/config/gimpconfig.c:424
+#: ../app/config/gimpconfig.c:437 ../app/config/gimpscanner.c:417
+#: ../app/config/gimpscanner.c:489 ../app/core/gimp-modules.c:132
+#: ../app/core/gimp-units.c:169 ../app/gui/session.c:158
+#: ../app/plug-in/plug-in-rc.c:183
 msgid "fatal parse error"
 msgstr "analisi-errore larria"
 
 #. please don't translate 'yes' and 'no'
-#: app/config/gimpconfig-deserialize.c:467
+#: ../app/config/gimpconfig-deserialize.c:467
 #, c-format
 msgid "expected 'yes' or 'no' for boolean token %s, got '%s'"
-msgstr ""
-"'yes' edo 'no' espero zen %s token boolearrarentzat, baina '%s' jaso da"
+msgstr "'yes' edo 'no' espero zen %s token boolearrarentzat, baina '%s' jaso da"
 
-#: app/config/gimpconfig-deserialize.c:541
+#: ../app/config/gimpconfig-deserialize.c:541
 #, c-format
 msgid "invalid value '%s' for token %s"
 msgstr "baliogabeko '%s' balioa %s tokenarentzat"
 
-#: app/config/gimpconfig-deserialize.c:556
+#: ../app/config/gimpconfig-deserialize.c:556
 #, c-format
 msgid "invalid value '%ld' for token %s"
 msgstr "Baliogabeko '%ld' balioa %s tokenarentzat"
 
-#: app/config/gimpconfig-deserialize.c:625
+#: ../app/config/gimpconfig-deserialize.c:625
 #, c-format
 msgid "while parsing token '%s': %s"
 msgstr "'%s' tokena analizatzen zen bitartean: %s"
 
-#: app/config/gimpconfig-path.c:177
+#: ../app/config/gimpconfig-path.c:177
 #, c-format
 msgid "Cannot expand ${%s}"
 msgstr "Ezin da ${%s} zabaldu"
 
-#: app/config/gimpconfig-utils.c:561 app/config/gimpconfigwriter.c:143
-#: app/core/gimpbrushgenerated.c:255 app/core/gimpgradient-save.c:51
-#: app/core/gimpgradient-save.c:142 app/core/gimppalette.c:567
-#: app/gui/themes.c:238 app/tools/gimpimagemaptool.c:607
-#: app/vectors/gimpvectors-export.c:83 app/xcf/xcf.c:348
+#: ../app/config/gimpconfig-utils.c:561 ../app/config/gimpconfigwriter.c:143
+#: ../app/core/gimpbrushgenerated.c:255 ../app/core/gimpgradient-save.c:51
+#: ../app/core/gimpgradient-save.c:142 ../app/core/gimppalette.c:567
+#: ../app/gui/themes.c:238 ../app/tools/gimpimagemaptool.c:607
+#: ../app/vectors/gimpvectors-export.c:83 ../app/xcf/xcf.c:348
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Ezin izan da '%s' ireki idazteko: %s"
 
-#: app/config/gimpconfig-utils.c:572 app/config/gimpconfig-utils.c:595
-#: app/vectors/gimpvectors-export.c:96
+#: ../app/config/gimpconfig-utils.c:572 ../app/config/gimpconfig-utils.c:595
+#: ../app/vectors/gimpvectors-export.c:96
 #, c-format
 msgid "Error while writing '%s': %s"
 msgstr "Errorea '%s' fitxategian idaztean: %s"
 
-#: app/config/gimpconfig-utils.c:583
+#: ../app/config/gimpconfig-utils.c:583
 #, c-format
 msgid "Error while reading '%s': %s"
 msgstr "Errorea '%s' irakurtzean: %s"
 
-#: app/config/gimpconfig-utils.c:625
+#: ../app/config/gimpconfig-utils.c:625
 #, 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 ""
+"Errorea gertatu da '%s' fitxategia analizatzean. Lehenetsitako balioak "
+"erabiliko dira. Konfigurazioaren babeskopia '%s'-(e)n sortu da."
 
-#: app/config/gimpconfigwriter.c:130
+#: ../app/config/gimpconfigwriter.c:130
 #, c-format
 msgid "Could not create temporary file for '%s': %s"
 msgstr "Ezin izan da '%s'(r)entzat aldi baterako fitxategia sortu: %s "
 
-#: app/config/gimpconfigwriter.c:617
+#: ../app/config/gimpconfigwriter.c:617
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -3824,7 +3352,7 @@ msgstr ""
 "Errorea '%s'(r)en aldi baterako fitxategian idaztean: %s\n"
 "Jatorrizko fitxategia ez da ukitu."
 
-#: app/config/gimpconfigwriter.c:625
+#: ../app/config/gimpconfigwriter.c:625
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -3833,22 +3361,22 @@ msgstr ""
 "Errorea '%s'(r)en aldi baterako fitxategian idaztean: %s\n"
 "Ez da fitxategirik sortu."
 
-#: app/config/gimpconfigwriter.c:636
+#: ../app/config/gimpconfigwriter.c:636
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr "Errorea '%s' fitxategian idaztean: %s"
 
-#: app/config/gimpconfigwriter.c:654
+#: ../app/config/gimpconfigwriter.c:654
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Ezin izan da %s' sortu: %s"
 
-#: app/config/gimprc.c:335 app/config/gimprc.c:348
+#: ../app/config/gimprc.c:335 ../app/config/gimprc.c:348
 #, c-format
 msgid "Parsing '%s'\n"
 msgstr "'%s' analizatzen\n"
 
-#: app/config/gimprc.c:595
+#: ../app/config/gimprc.c:595
 #, c-format
 msgid "Saving '%s'\n"
 msgstr "'%s' gordetzen\n"
@@ -3857,18 +3385,21 @@ msgstr "'%s' gordetzen\n"
 #. *  (the preferences dialog mainly) and only those that are should
 #. *  be marked for translation.
 #.
-#: app/config/gimprc-blurbs.h:13
+#: ../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 ""
+"Gaitutakoan, irudia irudi aktiboa bilakatuko da irudiaren leihoak fokua "
+"jasotzean. Erabilgarria da \"egin klik fokua jartzeko\" erabiltzen duten "
+"leiho-kudeatzaileetan."
 
-#: app/config/gimprc-blurbs.h:23
+#: ../app/config/gimprc-blurbs.h:23
 msgid "Specifies how the area around the image should be drawn."
 msgstr "Irudiaren inguruko area nola marraztu behar den zehazten du."
 
-#: app/config/gimprc-blurbs.h:26
+#: ../app/config/gimprc-blurbs.h:26
 msgid ""
 "Sets the canvas padding color used if the padding mode is set to custom "
 "color."
@@ -3876,20 +3407,19 @@ msgstr ""
 "Oihalaren kolore betegarria ezartzen du, kolore pertsonalizatua erabiliko "
 "bada."
 
-#: app/config/gimprc-blurbs.h:30
+#: ../app/config/gimprc-blurbs.h:30
 msgid "Ask for confirmation before closing an image without saving."
 msgstr "Eskatu berrespena irudiak gorde gabe itxi aurretik."
 
-#: app/config/gimprc-blurbs.h:33
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:33
 msgid "Sets the pixel format of cursors the GIMP will use."
-msgstr "GIMPek erabiliko duen kurtsorearen modua ezartzen du."
+msgstr "GIMPek erabiliko duen kurtsorearen formatua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:36
+#: ../app/config/gimprc-blurbs.h:36
 msgid "Sets the mode of cursor the GIMP will use."
 msgstr "GIMPek erabiliko duen kurtsorearen modua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:39
+#: ../app/config/gimprc-blurbs.h:39
 msgid ""
 "Context-dependent cursors are cool.  They are enabled by default. However, "
 "they require overhead that you may want to do without."
@@ -3897,7 +3427,7 @@ msgstr ""
 "Testuinguruaren araberako kurtsoreak atseginak dira. Lehenespenez gaitzen "
 "dira. Hala ere, prozesatzea moteldu egiten dute."
 
-#: app/config/gimprc-blurbs.h:47
+#: ../app/config/gimprc-blurbs.h:47
 msgid ""
 "When enabled, this will ensure that each pixel of an image gets mapped to a "
 "pixel on the screen."
@@ -3905,12 +3435,13 @@ msgstr ""
 "Gaituta dagoenean, irudiko pixel bakoitza pantailako pixel bati esleituko "
 "zaio."
 
-#: app/config/gimprc-blurbs.h:73
+#: ../app/config/gimprc-blurbs.h:73
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr ""
+"Hau distantzia da (pixeletan) saretaren eta gidaren atxikitzea aktibatzen "
+"denean"
 
-#: app/config/gimprc-blurbs.h:77
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:77
 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 "
@@ -3918,49 +3449,51 @@ msgid ""
 "the original is greater than a specified threshold. This value represents "
 "the default threshold."
 msgstr ""
-"Hurbilketazko hautaketak eta gelaxka-betetzeak hazi-betetzearen algoritmoan "
-"oinarritutako eskualdeak bilatzen dituzte. Hazi-betetzea hasieran "
-"hautatutako pixelean hasten da eta norabide guztietan joaten da, hasierako "
-"pixel-intentsitatearen aldea adierazitako muga baino handiagoa den arte. "
-"Balio horrek muga lehenetsia adierazten du."
+"'Hurbilketazko hautapena' eta 'gelaxka-betetzea' bezalako tresnek hazi-"
+"betetzearen algoritmoan oinarritutako eskualdeak bilatzen dituzte. Hazi-"
+"betetzea hasieran hautatutako pixelean hasten da eta norabide guztietan "
+"joaten da, hasierako pixel-intentsitatearen aldea adierazitako muga baino "
+"handiagoa den arte. Balio horrek muga lehenetsia adierazten du."
 
-#: app/config/gimprc-blurbs.h:90
+#: ../app/config/gimprc-blurbs.h:90
 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 ""
+"Leiho motaren aholkuak atrakatutako leihoetara ezarrita dagoela dio. Honek "
+"leiho-kudeatzailearen gain eragin dezake, leihoak marraztean eta kudeatzean."
 
-#: app/config/gimprc-blurbs.h:121
+#: ../app/config/gimprc-blurbs.h:121
 msgid "When enabled, the selected brush will be used for all tools."
-msgstr ""
+msgstr "Gaitutakoan, hautatutako brotxa tresna guztietan erabiliko da."
 
-#: app/config/gimprc-blurbs.h:127
+#: ../app/config/gimprc-blurbs.h:127
 msgid "When enabled, the selected gradient will be used for all tools."
-msgstr ""
+msgstr "Gaitutakoan, hautatutako gradientea tesna guztietan erabiliko da."
 
-#: app/config/gimprc-blurbs.h:130
+#: ../app/config/gimprc-blurbs.h:130
 msgid "When enabled, the selected pattern will be used for all tools."
-msgstr ""
+msgstr "Gaitutakoan, hautatutako eredua tresna guztietan erabiliko da."
 
-#: app/config/gimprc-blurbs.h:146
+#: ../app/config/gimprc-blurbs.h:146
 msgid "Sets the browser used by the help system."
 msgstr "Laguntza-sistemak erabiltzen duen arakatzailea ezartzen du."
 
-#: app/config/gimprc-blurbs.h:154
+#: ../app/config/gimprc-blurbs.h:154
 msgid "Sets the text to appear in image window status bars."
 msgstr "Irudiaren leihoko egoera-barran agertu beharreko testua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:157
 msgid "Sets the text to appear in image window titles."
 msgstr "Irudi-leihoaren tituluetan agertuko den testua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:160
+#: ../app/config/gimprc-blurbs.h:160
 msgid "When enabled, the GIMP will use a different info window per image view."
 msgstr ""
 "Gaituta dagoenean, GIMPek bestelako informazio-leihoa erabiliko du irudi-"
 "ikuspegi bakoitzerako."
 
-#: app/config/gimprc-blurbs.h:163
+#: ../app/config/gimprc-blurbs.h:163
 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."
@@ -3968,28 +3501,25 @@ msgstr ""
 "Gaituta dagoenean, irudi osoa ikusgai egongo da fitxategia irekitakoan, "
 "bestela 1:1 eskalan bistaratuko da."
 
-#: app/config/gimprc-blurbs.h:167
-#, fuzzy
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
+#: ../app/config/gimprc-blurbs.h:167
+msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
 msgstr ""
-"Instalatu kolore-mapa pribatu bat; erabilgarria izan daiteke sasikoloreko "
-"pantailetan."
+"Instalatu kolore-mapa pribatu bat; erabilgarria izan daiteke 8 bit-eko (256 "
+"kolore) pantailetan."
 
-#: app/config/gimprc-blurbs.h:170
-msgid ""
-"Sets the level of interpolation used for scaling and other transformations."
+#: ../app/config/gimprc-blurbs.h:170
+msgid "Sets the level of interpolation used for scaling and other transformations."
 msgstr ""
 "Ezarri eskalatzeko eta bestelako eraldatzeetarako erabiliko den interpolazio-"
 "maila."
 
-#: app/config/gimprc-blurbs.h:174
+#: ../app/config/gimprc-blurbs.h:174
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr ""
 "Irudi-fitxategi ireki berrien zenbat izen gorde behar diren Fitxategia "
 "menuan."
 
-#: app/config/gimprc-blurbs.h:177
+#: ../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)."
@@ -3997,7 +3527,7 @@ msgstr ""
 "Inurrien abiadura hautaketa-eskeman. Balioa milisegundotan dago (zenbat eta "
 "denbora gutxiago, abiadura handiagoa)."
 
-#: app/config/gimprc-blurbs.h:181
+#: ../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."
@@ -4005,14 +3535,11 @@ msgstr ""
 "GIMPek erabiltzaileari abisatuko dio hemen zehaztutako tamaina baino memoria "
 "gehiago hartuko lukeen irudi bat sortzen saiatzen bada."
 
-#: app/config/gimprc-blurbs.h:185
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:185
 msgid "When enabled, GIMP will show mnemonics in menus."
-msgstr ""
-"Gaituta dagoenean, GIMPek bestelako informazio-leihoa erabiliko du irudi-"
-"ikuspegi bakoitzerako."
+msgstr "Gaituta dagoenean, GIMPek mnemoteknikoak erakutsiko ditu menuetan."
 
-#: app/config/gimprc-blurbs.h:188
+#: ../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 the GIMP."
@@ -4020,28 +3547,37 @@ msgstr ""
 "Orokorrean 8 biteko pantailentzat bakarrik da garrantzitsua; GIMPerako "
 "esleitutako sistema-koloreen gutxieneko kopurua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:199
+#: ../app/config/gimprc-blurbs.h:199
 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 ""
+"Monitorearen bereizmen horizontala ezartzen du, puntu hazbeteko (dpi). 0 "
+"balioarekin ezartzen bada, X zerbitzariari bereizmen bai horizontalaren bai "
+"bertikalaren informazioa eskatzeko derrigortuko zaio."
 
-#: app/config/gimprc-blurbs.h:204
+#: ../app/config/gimprc-blurbs.h:204
 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 ""
+"Monitorearen bereizmen bertikala ezartzen du, puntu hazbeteko (dpi). 0 "
+"balioarekin ezartzen bada, X zerbitzariari bereizmen bai horizontalaren bai "
+"bertikalaren informazioa eskatzeko derrigortuko zaio."
 
-#: app/config/gimprc-blurbs.h:209
+#: ../app/config/gimprc-blurbs.h:209
 msgid ""
 "If enabled, the move tool changes the active layer or path when a layer or "
 "path is being picked. This used to be the default behaviour in older "
 "versions."
 msgstr ""
+"Gaituta badago, lekuz aldatzeko' tresnak geruza edo bide aktiboa aldatzen du "
+"geruza edo bidea hautatzean. Bertsio zaharragoetan lehenespeneko portaera "
+"izateko erabiltzen da."
 
-#: app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:214
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
@@ -4049,7 +3585,7 @@ msgstr ""
 "Irudi-leihoaren beheko eskuineko izkinan erabilgarri dagoen nabigatzeko "
 "aurrebistaren tamaina ezartzen du."
 
-#: app/config/gimprc-blurbs.h:218
+#: ../app/config/gimprc-blurbs.h:218
 msgid ""
 "On multiprocessor machines, if GIMP has been compiled with --enable-mp this "
 "sets how many processors GIMP should use simultaneously."
@@ -4057,7 +3593,7 @@ msgstr ""
 "Hainbat prozesadoreko makinetan, GIMP --enable-mp erabiliz konpilatu bada, "
 "GIMPek aldi berean zenbat prozesadore erabili behar dituen ezartzen du."
 
-#: app/config/gimprc-blurbs.h:232
+#: ../app/config/gimprc-blurbs.h:232
 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 "
@@ -4068,10 +3604,10 @@ msgstr ""
 "Gaituta dagoenean, X zerbitzariari mugimendu-gertaera bakoitzean saguaren "
 "unekokokalekua zein den kontsultatzen zaio, kokalekuaren iradokizunaz fidatu "
 "ordez. Horrek esannahi du brotxa handiekin margotzea zehatzagoa izango dela, "
-"baina motelagoa izan daiteke.Aitzitik, X zerbitzari batzuetan aukera hori "
+"baina motelagoa izan daiteke. Aitzitik, X zerbitzari batzuetan aukera hori "
 "gaitzean azkarrago margotzen da."
 
-#: app/config/gimprc-blurbs.h:245
+#: ../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 "
@@ -4081,14 +3617,15 @@ msgstr ""
 "du. Atsegina da aurrebistak edukitzea geruzen eta kanalen elkarrizketa-"
 "koadroan, baina irudi handiekin lan egitean lana moteldu egin dezake."
 
-#: app/config/gimprc-blurbs.h:250
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:250
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
-msgstr "Geruzen eta kanalen aurrebistaren tamaina lehenetsia ezartzen du."
+msgstr ""
+"Geruzen eta kanalen aurrebistaren tamaina lehenetsia ezartzen du, sortu "
+"berri diren elkarrizketa-koadroetan."
 
-#: app/config/gimprc-blurbs.h:254
+#: ../app/config/gimprc-blurbs.h:254
 msgid ""
 "When enabled, the image window will automatically resize itself, whenever "
 "the physical image size changes."
@@ -4096,7 +3633,7 @@ msgstr ""
 "Gaituta dagoenean, irudiaren leihoa automatikoki aldatuko da tamainaz, "
 "irudiaren tamaina fisikoa aldatzen den bakoitzean."
 
-#: app/config/gimprc-blurbs.h:258
+#: ../app/config/gimprc-blurbs.h:258
 msgid ""
 "When enabled, the image window will automatically resize itself, when "
 "zooming into and out of images."
@@ -4104,23 +3641,19 @@ msgstr ""
 "Gaituta dagoenean, irudiaren leihoa automatikoki aldatuko da tamainaz, "
 "irudiak handitzean eta txikitzean."
 
-#: app/config/gimprc-blurbs.h:262
+#: ../app/config/gimprc-blurbs.h:262
 msgid "Let GIMP try to restore your last saved session on each startup."
-msgstr ""
-"Utzi GIMPi abio bakoitzean gordetako azken saioa leheneratzen saiatzen."
+msgstr "Utzi GIMPi abio bakoitzean gordetako azken saioa leheneratzen saiatzen."
 
-#: app/config/gimprc-blurbs.h:265
-msgid ""
-"Remember the current tool, pattern, color, and brush across GIMP sessions."
-msgstr ""
-"Gogoratu uneko tresna, eredua, kolorea eta brotxa hurrengo GIMP saioetan."
+#: ../app/config/gimprc-blurbs.h:265
+msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
+msgstr "Gogoratu uneko tresna, eredua, kolorea eta brotxa hurrengo GIMP saioetan."
 
-#: app/config/gimprc-blurbs.h:269
+#: ../app/config/gimprc-blurbs.h:269
 msgid "Save the positions and sizes of the main dialogs when the GIMP exits."
-msgstr ""
-"Gorde elkarrizketa-koadro nagusien kokalekuak eta tamainak GIMP ixtean."
+msgstr "Gorde elkarrizketa-koadro nagusien kokalekuak eta tamainak GIMP ixtean."
 
-#: app/config/gimprc-blurbs.h:275
+#: ../app/config/gimprc-blurbs.h:275
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
@@ -4128,23 +3661,25 @@ msgstr ""
 "Gaituta dagoenean, margotzeko tresna guztiek uneko brotxen eskemaren "
 "aurrebista erakutsiko dute."
 
-#: app/config/gimprc-blurbs.h:279
+#: ../app/config/gimprc-blurbs.h:279
 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 ""
+"Gaitutakoan, elkarrizketa-koadroek laguntzako botoia erakutsiko dute, "
+"dagokien laguntzako orrialdera joateko. Botoi hau gabe ere, laguntzako "
+"orrialdeak F1 tekla sakatuz eskura daitezke."
 
-#: app/config/gimprc-blurbs.h:284
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:284
 msgid ""
 "When enabled, the cursor will be shown over the image while using a paint "
 "tool."
 msgstr ""
-"Gaituta dagoenean, GIMPek ez du gordeko irudia ireki denetik aldatu gabe "
-"badago."
+"Gaituta dagoenean, kurtsorea irudiaren gainean erakutsiko da, margotze-"
+"tresna erabiltzean."
 
-#: app/config/gimprc-blurbs.h:288
+#: ../app/config/gimprc-blurbs.h:288
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
@@ -4153,7 +3688,7 @@ msgstr ""
 "\"Ikuspegia->Erakutsi menu-barra\" komandoaren bidez ere aktibatu eta "
 "desaktibatu daiteke."
 
-#: app/config/gimprc-blurbs.h:292
+#: ../app/config/gimprc-blurbs.h:292
 msgid ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
@@ -4161,7 +3696,7 @@ msgstr ""
 "Gaituta dagoenean, erregelak ikusgai daude lehenespenez. Hori \"Ikuspegia-"
 ">Erakutsi erregelak\" komandoaren bidez ere aktiba daiteke."
 
-#: app/config/gimprc-blurbs.h:296
+#: ../app/config/gimprc-blurbs.h:296
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
@@ -4170,7 +3705,7 @@ msgstr ""
 "\"Ikuspegia->Erakutsi korritze-barrak bai/ez\" komandoaren bidez ere aktiba "
 "daiteke."
 
-#: app/config/gimprc-blurbs.h:300
+#: ../app/config/gimprc-blurbs.h:300
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
@@ -4178,25 +3713,25 @@ msgstr ""
 "Gaituta dagoenean, egoera-barra ikusgai dago lehenespenez. Hori \"Ikuspegia-"
 ">Erakutsi egoera-barra\" komandoaren bidez ere aktiba daiteke."
 
-#: app/config/gimprc-blurbs.h:304
+#: ../app/config/gimprc-blurbs.h:304
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
 msgstr ""
 "Gaituta dagoenean, hautapena ikusgai egongo da lehenespenez. Hori "
-"\"Ikuspegia->Erakutsi hautapena\" komandoaren bidez ere aktibatu eta "
-"desaktibatu daiteke."
+"\"Ikuspegia->Erakutsi hautapena\" komandoaren bidez ere aktiba eta desaktiba "
+"daiteke."
 
-#: app/config/gimprc-blurbs.h:308
+#: ../app/config/gimprc-blurbs.h:308
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
 msgstr ""
 "Gaituta dagoenean, geruzaren muga ikusgai egongo da lehenespenez. Hori "
-"\"Ikuspegia->Erakutsi geruzaren mugaa\" komandoaren bidez ere aktibatu eta "
-"desaktibatu daiteke."
+"\"Ikuspegia->Erakutsi geruzaren muga\" komandoaren bidez ere aktiba eta "
+"desaktiba daiteke."
 
-#: app/config/gimprc-blurbs.h:312
+#: ../app/config/gimprc-blurbs.h:312
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
@@ -4204,23 +3739,23 @@ msgstr ""
 "Gaituta dagoenean, gidak ikusgai daude lehenespenez. Hori \"Ikuspegia-"
 ">Erakutsi gidak\" komandoaren bidez ere aktiba daiteke."
 
-#: app/config/gimprc-blurbs.h:316
+#: ../app/config/gimprc-blurbs.h:316
 msgid ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
 msgstr ""
 "Gaituta dagoenean, sareta ikusgai egongo da lehenespenez. Hori \"Ikuspegia-"
-">Erakutsi sareta\" komandoaren bidez ere aktibatu eta desaktibatu daiteke."
+">Erakutsi sareta\" komandoaren bidez ere aktiba eta desaktiba daiteke."
 
-#: app/config/gimprc-blurbs.h:320
+#: ../app/config/gimprc-blurbs.h:320
 msgid "Enable to display a handy GIMP tip on startup."
 msgstr "Gaitu GIMP iradokizun erabilgarri bat bistaratzea abioan."
 
-#: app/config/gimprc-blurbs.h:323
+#: ../app/config/gimprc-blurbs.h:323
 msgid "Enable to display tooltips."
 msgstr "Gaitu argibideak bistaratzea."
 
-#: app/config/gimprc-blurbs.h:326
+#: ../app/config/gimprc-blurbs.h:326
 msgid ""
 "There is always a tradeoff between memory usage and speed.  In most cases, "
 "the GIMP opts for speed over memory.  However, if memory is a big issue, try "
@@ -4230,7 +3765,7 @@ msgstr ""
 "gehienetan GIMPek abiadura aukeratzen du memoriaren aurretik. Bestalde, "
 "memoria arazo handia bada, saiatu ezarpen hau gaitzen."
 
-#: app/config/gimprc-blurbs.h:331
+#: ../app/config/gimprc-blurbs.h:331
 msgid ""
 "Sets the swap file location. The gimp uses a tile based memory allocation "
 "scheme. The swap file is used to quickly and easily swap tiles out to disk "
@@ -4239,35 +3774,35 @@ msgid ""
 "swap file is created on a directory that is mounted over NFS.  For these "
 "reasons, it may be desirable to put your swap file in \"/tmp\"."
 msgstr ""
-"swap fitxategiaren kokalekua ezartzen du. Gimp-ek fitxetan oinarritutako "
-"memoria-esleipeneko eskema erabiltzen du. swap fitxategia fitxategiak "
-"diskotik eta diskora azkar eta erraztasunez trukatzeko erabiltzen da. "
-"Kontuan izan swap fitxategia azkar handitu daitekeela GIMP irudi handiekin "
-"erabiltzen bada. Horrez gain, lana asko moteldu daiteke swap fitxategia "
+"Trukatze-fitxategiaren kokalekua ezartzen du. Gimp-ek fitxetan oinarritutako "
+"memoria-esleipeneko eskema erabiltzen du. Trukatze-fitxategia fitxategiak "
+"diskotik eta diskora azkar eta erraztasunez trukatze-erabiltzen da. "
+"Kontuan izan trukatze-fitxategia azkar handitu daitekeela GIMP irudi handiekin "
+"erabiltzen bada. Horrez gain, lana asko moteldu daiteke trukatze-fitxategia "
 "NFSren gainean muntatutako direktorioan sortzen bada. Hori dela eta, komeni "
-"da zure swap fitxategia \"/tmp\" karpetan gordetzea."
+"da zure trukatze-fitxategia \"/tmp\" karpetan gordetzea."
 
-#: app/config/gimprc-blurbs.h:340
+#: ../app/config/gimprc-blurbs.h:340
 msgid "When enabled, menus can be torn off."
 msgstr "Gaituta dagoenean, menuak bereizi egin daitezke."
 
-#: app/config/gimprc-blurbs.h:343
+#: ../app/config/gimprc-blurbs.h:343
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
 msgstr ""
 "Gaituta dagoenean, menu-elementuen laster-teklak alda ditzakezu menu-"
-"elementua nabrmendua dagoenean tekla konbinazio bat sakatuz."
+"elementua nabarmendua dagoenean tekla konbinazio bat sakatuz."
 
-#: app/config/gimprc-blurbs.h:347
+#: ../app/config/gimprc-blurbs.h:347
 msgid "Save changed keyboard shortcuts when the GIMP exits."
 msgstr "Gorde aldatutako laster-teklak GIMP ixtean."
 
-#: app/config/gimprc-blurbs.h:350
+#: ../app/config/gimprc-blurbs.h:350
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "Leheneratu gordetako laster-teklak GIMP abiarazten duzun bakoitzean."
 
-#: app/config/gimprc-blurbs.h:353
+#: ../app/config/gimprc-blurbs.h:353
 msgid ""
 "Sets the temporary storage directory. Files will appear here during the "
 "course of running the GIMP.  Most files will disappear when the GIMP exits, "
@@ -4279,23 +3814,24 @@ msgstr ""
 "dira GIMP ixtean, baina baliteke fitxategi batzuk geratzea; beraz, hobe da "
 "direktorio hau beste erabiltzaileekin ez partekatzea."
 
-#: app/config/gimprc-blurbs.h:365
-#, fuzzy
+#: ../app/config/gimprc-blurbs.h:365
 msgid ""
 "Sets the size of the thumbnail shown in the Open dialog. Note that GIMP can "
 "not create thumbnails if layer previews are disabled."
 msgstr ""
-"Irudi bakoitzarekin gordetzen den koadro txikiaren tamaina ezartzen du. "
-"Kontuan izan GIMPek ezin dituela koadro txikiak gorde geruzen aurrebistak "
-"desgaituta badaude."
+"Koadro txikiaren tamaina ezartzen du 'Ireki' elkarrizketa-koadroan. Kontuan "
+"izan GIMPek ezin dituela koadro txikiak sortu geruzen aurrebistak desgaituta "
+"badaude."
 
-#: app/config/gimprc-blurbs.h:369
+#: ../app/config/gimprc-blurbs.h:369
 msgid ""
 "The thumbnail in the Open dialog will be automatically updated if the file "
 "being previewed is smaller than the size set here."
 msgstr ""
+"'Ireki' elkarrizketa-koadroko koadro txikia automatikoki eguneratuko da "
+"aurrebistan dagoen fitxategia ezarritako tamaina baino txikiagoa bada."
 
-#: app/config/gimprc-blurbs.h:373
+#: ../app/config/gimprc-blurbs.h:373
 msgid ""
 "The tile cache is used to make sure the GIMP doesn't thrash tiles between "
 "memory and disk. Setting this value higher will cause the GIMP to use less "
@@ -4303,27 +3839,28 @@ msgid ""
 "smaller cache size causes the GIMP to use more swap space and less memory."
 msgstr ""
 "Irudien cachea erabiltzen da GIMPek memoria eta diskoaren artean fitxarik "
-"xahutzen ez duela ziurtatzeko. Balio handiagoa ezartzen bada, GIMPek swap "
-"leku gutxiago erabiliko du, baina GIMPek memoria gehiago erabiliko du. "
-"Bestalde, cachearen neurria txikiagoa bada, swap leku gehiago eta memoria "
-"gutxiago erabiliko du GIMPek."
+"xahutzen ez duela ziurtatzeko. Balio handiagoa ezartzen bada, GIMPek "
+"trukatzeko leku gutxiago erabiliko du, baina GIMPek memoria gehiago "
+"erabiliko du. Bestalde, cachearen neurria txikiagoa bada, trukatzeko leku "
+"gehiago eta memoria gutxiago erabiliko du GIMPek."
 
-#: app/config/gimprc-blurbs.h:384
+#: ../app/config/gimprc-blurbs.h:384
 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 ""
+"Leiho motaren aholkuak tresna-kutxan ezarrita dagoela dio. Honek leiho-"
+"kudeatzaileak tresna-kutxa marraztean eta kudeatzean eragin dezake."
 
-#: app/config/gimprc-blurbs.h:388
+#: ../app/config/gimprc-blurbs.h:388
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "Gardentasuna irudietan bistaratzeko modua ezartzen du."
 
-#: app/config/gimprc-blurbs.h:391
+#: ../app/config/gimprc-blurbs.h:391
 msgid "Sets the size of the checkerboard used to display transparency."
-msgstr ""
-"Gardentasuna bistaratzeko erabiltzen den koadrikularen tamaina ezartzen du."
+msgstr "Gardentasuna bistaratzeko erabiltzen den koadrikularen tamaina ezartzen du."
 
-#: app/config/gimprc-blurbs.h:394
+#: ../app/config/gimprc-blurbs.h:394
 msgid ""
 "When enabled, the GIMP will not save if the image is unchanged since opening "
 "it."
@@ -4331,7 +3868,7 @@ msgstr ""
 "Gaituta dagoenean, GIMPek ez du gordeko irudia ireki denetik aldatu gabe "
 "badago."
 
-#: app/config/gimprc-blurbs.h:398
+#: ../app/config/gimprc-blurbs.h:398
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -4339,7 +3876,7 @@ msgstr ""
 "Desegin daitezkeen eragiketen gutxieneko kopurua ezartzen du. Desegiteko "
 "maila gehiago eskaintzen dira desegiteko mailen mugara heldu arte."
 
-#: app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:402
 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 "
@@ -4349,15 +3886,15 @@ msgstr ""
 "memoriaren gehienezko muga ezartzen du. Ezarpen honetaz aparte, "
 "konfigurazioaren arabera hainbat aldiz desegin daiteke."
 
-#: app/config/gimprc-blurbs.h:407
+#: ../app/config/gimprc-blurbs.h:407
 msgid "Sets the size of the previews in the Undo History."
 msgstr "'Desegin historia'-ko aurrebistaren tamaina ezartzen du."
 
-#: app/config/gimprc-blurbs.h:410
+#: ../app/config/gimprc-blurbs.h:410
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "Gaituta dagoenean, laguntza-arakatzailea irekiko da F1 sakatzen bada."
 
-#: app/config/gimprc-blurbs.h:413
+#: ../app/config/gimprc-blurbs.h:413
 #, c-format
 msgid ""
 "Sets the external web browser to be used.  This can be an absolute path or "
@@ -4365,833 +3902,745 @@ msgid ""
 "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 ""
+"Erabili beharreko kanpoko web araktzailea ezartzen du. Bide-izen absolutua "
+"edo exekutagarriaren izena (erabiltzailearen PATH aldagaian bilatzeko) izan "
+"daiteke. Komandoak '%s' edukiz gero, URLarengatik ordeztu daiteke, bestela "
+"URLa komandoari gehituko zaio zuriunea erabiliz bereizle bezala."
 
-#: app/config/gimpscanner.c:220
+#: ../app/config/gimpscanner.c:220
 msgid "invalid UTF-8 string"
 msgstr "UTF-8 kate baliogabea"
 
-#: app/config/gimpscanner.c:516
+#: ../app/config/gimpscanner.c:516
 #, c-format
 msgid "Error while parsing '%s' in line %d: %s"
 msgstr "Errorea %2$d lerroan '%1$s' analizatzean : %3$s"
 
-#: app/core/core-enums.c:27
-#, fuzzy
+#: ../app/core/core-enums.c:27
 msgid "_White (full opacity)"
 msgstr "_Zuria (opakutasun osoa)"
 
-#: app/core/core-enums.c:28
-#, fuzzy
+#: ../app/core/core-enums.c:28
 msgid "_Black (full transparency)"
 msgstr "_Beltza (gardentasun osoa)"
 
-#: app/core/core-enums.c:29
-#, fuzzy
+#: ../app/core/core-enums.c:29
 msgid "Layer's _alpha channel"
 msgstr "Geruzaren _alfa kanala"
 
-#: app/core/core-enums.c:30
-#, fuzzy
+#: ../app/core/core-enums.c:30
 msgid "_Transfer layer's alpha channel"
 msgstr "_Transeritu geruzaren alfa kanala"
 
-#: app/core/core-enums.c:31
+#: ../app/core/core-enums.c:31
 msgid "_Selection"
 msgstr "_Hautapena"
 
-#: app/core/core-enums.c:32
-#, fuzzy
+#: ../app/core/core-enums.c:32
 msgid "_Grayscale copy of layer"
 msgstr "_Geruzaren gris-eskalako kopia"
 
-#: app/core/core-enums.c:61 app/core/gimp-gradients.c:70
+#: ../app/core/core-enums.c:61 ../app/core/gimp-gradients.c:70
 msgid "FG to BG (RGB)"
-msgstr "Aurreko planoa atzeko planora (RGB)"
+msgstr "AurPlanoa AtzPlanora (GBU)"
 
-#: app/core/core-enums.c:62
+#: ../app/core/core-enums.c:62
 msgid "FG to BG (HSV)"
-msgstr "Aurreko planoa atzeko planora (HSV)"
+msgstr "Aurreko planoa atzeko planora (ÑSB)"
 
-#: app/core/core-enums.c:63
-#, fuzzy
+#: ../app/core/core-enums.c:63
 msgid "FG to transparent"
-msgstr "Aurreko planoa gardenera"
+msgstr "AurPl-a gardenera"
 
-#: app/core/core-enums.c:64
-#, fuzzy
+#: ../app/core/core-enums.c:64
 msgid "Custom gradient"
 msgstr "Gradiente pertsonalizatua"
 
-#: app/core/core-enums.c:92
-#, fuzzy
+#: ../app/core/core-enums.c:92
 msgid "FG color fill"
-msgstr "Aurreko planoaren koloreko betegarria "
+msgstr "AurPl.aren kolore betegarria"
 
-#: app/core/core-enums.c:93
-#, fuzzy
+#: ../app/core/core-enums.c:93
 msgid "BG color fill"
-msgstr "Atzeko planoaren koloreko betegarria "
+msgstr "AtzPl.aren kolore betegarria"
 
-#: app/core/core-enums.c:94
-#, fuzzy
+#: ../app/core/core-enums.c:94
 msgid "Pattern fill"
-msgstr "Ereduaren betegarria"
+msgstr "Eredu betegarria"
 
-#: app/core/core-enums.c:123
+#: ../app/core/core-enums.c:123
 msgid "Add to the current selection"
 msgstr "Gehitu uneko hautapenari"
 
-#: app/core/core-enums.c:124
+#: ../app/core/core-enums.c:124
 msgid "Subtract from the current selection"
 msgstr "Kendu uneko hautapenetik"
 
-#: app/core/core-enums.c:125
+#: ../app/core/core-enums.c:125
 msgid "Replace the current selection"
 msgstr "Ordeztu uneko hautapena"
 
-#: app/core/core-enums.c:126
+#: ../app/core/core-enums.c:126
 msgid "Intersect with the current selection"
 msgstr "Gurutzatu uneko hautapenarekin"
 
-#: app/core/core-enums.c:160
+#: ../app/core/core-enums.c:160
 msgid "Gray"
 msgstr "Grisa"
 
-#: app/core/core-enums.c:161
+#: ../app/core/core-enums.c:161
 msgid "Indexed"
 msgstr "Indexatua"
 
-#: app/core/core-enums.c:219 app/core/core-enums.c:334
-#: app/core/core-enums.c:766 app/tools/gimptransformoptions.c:457
+#: ../app/core/core-enums.c:219 ../app/core/core-enums.c:334
+#: ../app/core/core-enums.c:766 ../app/tools/gimptransformoptions.c:457
 msgid "None"
 msgstr "Bat ere ez"
 
-#: app/core/core-enums.c:220
-#, fuzzy
+#: ../app/core/core-enums.c:220
 msgid "Floyd-Steinberg (normal)"
-msgstr "Floyd-Steinberg-en kolore-bilbea (normala)"
+msgstr "Floyd-Steinberg (normala)"
 
-#: app/core/core-enums.c:221
-#, fuzzy
+#: ../app/core/core-enums.c:221
 msgid "Floyd-Steinberg (reduced color bleeding)"
-msgstr "Floyd-Steinberg-en kolore-bilbea (kolore murriztuko koskatua)"
+msgstr "Floyd-Steinberg (kolore-murriztu koskatua)"
 
-#: app/core/core-enums.c:222
-#, fuzzy
+#: ../app/core/core-enums.c:222
 msgid "Positioned"
-msgstr "Kokalekua: %0.6f"
+msgstr "Kokatua"
 
-#: app/core/core-enums.c:251
-#, fuzzy
+#: ../app/core/core-enums.c:251
 msgid "Generate optimum palette"
-msgstr "Sortu paleta optimoa:"
+msgstr "Sortu paleta optimoa"
 
-#: app/core/core-enums.c:252
-#, fuzzy
+#: ../app/core/core-enums.c:252
 msgid "Use web-optimized palette"
-msgstr "Erabili WWWrako optimizatutako paleta "
+msgstr "Erabili web-erako paleta optimizatua"
 
-#: app/core/core-enums.c:253
-#, fuzzy
+#: ../app/core/core-enums.c:253
 msgid "Use black and white (1-bit) palette"
 msgstr "Erabili paleta zuri/beltza (bit 1)"
 
-#: app/core/core-enums.c:254
-#, fuzzy
+#: ../app/core/core-enums.c:254
 msgid "Use custom palette"
-msgstr "Erabili paleta pertsonalizatua:"
+msgstr "Erabili paleta pertsonalizatua"
 
-#: app/core/core-enums.c:329
-#, fuzzy
+#: ../app/core/core-enums.c:329
 msgid "Foreground color"
-msgstr "_Aurreko planoaren kolorea:"
+msgstr "Aurreko planoaren kolorea"
 
-#: app/core/core-enums.c:330
-#, fuzzy
+#: ../app/core/core-enums.c:330
 msgid "Background color"
-msgstr "Atzeko pla_noaren kolorea:"
+msgstr "Atzeko planoaren kolorea"
 
-#: app/core/core-enums.c:331
+#: ../app/core/core-enums.c:331
 msgid "White"
 msgstr "Zuria"
 
 #. Transparency
-#: app/core/core-enums.c:332 app/dialogs/preferences-dialog.c:1918
+#: ../app/core/core-enums.c:332 ../app/dialogs/preferences-dialog.c:1918
 msgid "Transparency"
 msgstr "Gardentasuna"
 
-#: app/core/core-enums.c:333 app/core/core-enums.c:470
-#: app/pdb/internal_procs.c:179
+#: ../app/core/core-enums.c:333 ../app/core/core-enums.c:470
+#: ../app/pdb/internal_procs.c:179
 msgid "Pattern"
 msgstr "Eredua"
 
-#: app/core/core-enums.c:371
-#, fuzzy
+#: ../app/core/core-enums.c:371
 msgid "Bi-linear"
 msgstr "Bilineala"
 
-#: app/core/core-enums.c:372
+#: ../app/core/core-enums.c:372
 msgid "Radial"
 msgstr "Erradiala"
 
-#: app/core/core-enums.c:373 app/core/core-enums.c:530
-#: app/core/core-enums.c:635
+#: ../app/core/core-enums.c:373 ../app/core/core-enums.c:530
+#: ../app/core/core-enums.c:635
 msgid "Square"
 msgstr "Karratua"
 
-#: app/core/core-enums.c:374
-#, fuzzy
+#: ../app/core/core-enums.c:374
 msgid "Conical (sym)"
 msgstr "Konikoa (simetrikoa)"
 
-#: app/core/core-enums.c:375
-#, fuzzy
+#: ../app/core/core-enums.c:375
 msgid "Conical (asym)"
 msgstr "Konikoa (asimetrikoa)"
 
-#: app/core/core-enums.c:376
-#, fuzzy
+#: ../app/core/core-enums.c:376
 msgid "Shaped (angular)"
-msgstr "Formaren araberakoa (angularra)"
+msgstr "Ingerada (angularra)"
 
-#: app/core/core-enums.c:377
-#, fuzzy
+#: ../app/core/core-enums.c:377
 msgid "Shaped (spherical)"
-msgstr "Formaren araberakoa (esferikoa)"
+msgstr "Ingerada (esferikoa)"
 
-#: app/core/core-enums.c:378
-#, fuzzy
+#: ../app/core/core-enums.c:378
 msgid "Shaped (dimpled)"
-msgstr "Formaren araberakoa (zulotxoduna)"
+msgstr "Ingerada (zulotxoduna)"
 
-#: app/core/core-enums.c:379
-#, fuzzy
+#: ../app/core/core-enums.c:379
 msgid "Spiral (cw)"
-msgstr "Espirala (erlojuaren noranzkoan)"
+msgstr "Espirala (e.n.)"
 
-#: app/core/core-enums.c:380
-#, fuzzy
+#: ../app/core/core-enums.c:380
 msgid "Spiral (ccw)"
-msgstr "Espirala (erlojuaren noranzkoan)"
+msgstr "Espirala (e.a.n.)"
 
-#: app/core/core-enums.c:410
+#: ../app/core/core-enums.c:410
 msgid "Intersections (dots)"
 msgstr "Elkarguneak (puntuak)"
 
-#: app/core/core-enums.c:411
+#: ../app/core/core-enums.c:411
 msgid "Intersections (crosshairs)"
 msgstr "Elkarguneak (gurutzaguneak)"
 
-#: app/core/core-enums.c:412
+#: ../app/core/core-enums.c:412
 msgid "Dashed"
 msgstr "Marratxoduna"
 
-#: app/core/core-enums.c:413
-#, fuzzy
+#: ../app/core/core-enums.c:413
 msgid "Double dashed"
 msgstr "Marratxo bikoizduna"
 
-#: app/core/core-enums.c:414 app/core/core-enums.c:469
+#: ../app/core/core-enums.c:414 ../app/core/core-enums.c:469
 msgid "Solid"
 msgstr "Lisoa"
 
-#: app/core/core-enums.c:441
-#, fuzzy
+#: ../app/core/core-enums.c:441
 msgid "Stroke line"
-msgstr "Trazatu kanala"
+msgstr "Trazatu lerroa"
 
-#: app/core/core-enums.c:442
+#: ../app/core/core-enums.c:442
 msgid "Stroke with a paint tool"
-msgstr ""
+msgstr "Trazatu margotze-tresnarekin"
 
-#: app/core/core-enums.c:498
+#: ../app/core/core-enums.c:498
 msgid "Miter"
 msgstr "Angelua"
 
-#: app/core/core-enums.c:499 app/core/core-enums.c:529
+#: ../app/core/core-enums.c:499 ../app/core/core-enums.c:529
 msgid "Round"
-msgstr ""
+msgstr "Biribildu"
 
-#: app/core/core-enums.c:500
+#: ../app/core/core-enums.c:500
 msgid "Bevel"
 msgstr "Alaka"
 
-#: app/core/core-enums.c:528
+#: ../app/core/core-enums.c:528
 msgid "Butt"
-msgstr ""
+msgstr "Muturra"
 
-#: app/core/core-enums.c:566 app/dialogs/preferences-dialog.c:1804
+#: ../app/core/core-enums.c:566 ../app/dialogs/preferences-dialog.c:1804
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
-#: app/core/core-enums.c:567
+#: ../app/core/core-enums.c:567
 msgid "Line"
-msgstr "Marra"
+msgstr "Lerroa"
 
-#: app/core/core-enums.c:568
-#, fuzzy
+#: ../app/core/core-enums.c:568
 msgid "Long dashes"
 msgstr "Marratxo luzeak"
 
-#: app/core/core-enums.c:569
-#, fuzzy
+#: ../app/core/core-enums.c:569
 msgid "Medium dashes"
 msgstr "Tarteko marratxoak"
 
-#: app/core/core-enums.c:570
-#, fuzzy
+#: ../app/core/core-enums.c:570
 msgid "Short dashes"
 msgstr "Marratxo motzak"
 
-#: app/core/core-enums.c:571
+#: ../app/core/core-enums.c:571
 msgid "Sparse dots"
-msgstr ""
+msgstr "Puntu sakabanatuak"
 
-#: app/core/core-enums.c:572
-#, fuzzy
+#: ../app/core/core-enums.c:572
 msgid "Normal dots"
 msgstr "Puntu normalak"
 
-#: app/core/core-enums.c:573
+#: ../app/core/core-enums.c:573
 msgid "Dense dots"
-msgstr ""
+msgstr "Puntu dentsoak"
 
-#: app/core/core-enums.c:574
+#: ../app/core/core-enums.c:574
 msgid "Stipples"
-msgstr ""
+msgstr "Puntudunak"
 
-#: app/core/core-enums.c:575
+#: ../app/core/core-enums.c:575
 msgid "Dash dot..."
-msgstr ""
+msgstr "Marra puntua..."
 
-#: app/core/core-enums.c:576
+#: ../app/core/core-enums.c:576
 msgid "Dash dot dot..."
-msgstr ""
+msgstr "Marra puntua puntua..."
 
-#: app/core/core-enums.c:604
+#: ../app/core/core-enums.c:604
 msgid "Stock ID"
-msgstr ""
+msgstr "Stock-ID-a"
 
-#: app/core/core-enums.c:605
+#: ../app/core/core-enums.c:605
 msgid "Inline pixbuf"
-msgstr ""
+msgstr "Pixbuf linean"
 
-#: app/core/core-enums.c:606
-#, fuzzy
+#: ../app/core/core-enums.c:606
 msgid "Image file"
-msgstr "Irudiaren tamaina"
+msgstr "Irudi-fitxategia"
 
-#: app/core/core-enums.c:634
+#: ../app/core/core-enums.c:634
 msgid "Circle"
-msgstr ""
+msgstr "Zirkulua"
 
-#: app/core/core-enums.c:636
+#: ../app/core/core-enums.c:636
 msgid "Diamond"
-msgstr ""
+msgstr "Erronboa"
 
-#: app/core/core-enums.c:664 app/dialogs/preferences-dialog.c:1950
+#: ../app/core/core-enums.c:664 ../app/dialogs/preferences-dialog.c:1950
 msgid "Horizontal"
 msgstr "Horizontala"
 
-#: app/core/core-enums.c:665 app/dialogs/preferences-dialog.c:1952
+#: ../app/core/core-enums.c:665 ../app/dialogs/preferences-dialog.c:1952
 msgid "Vertical"
 msgstr "Bertikala"
 
-#: app/core/core-enums.c:666
+#: ../app/core/core-enums.c:666
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: app/core/core-enums.c:730
+#: ../app/core/core-enums.c:730
 msgid "Tiny"
-msgstr "Txikia"
+msgstr "Txikitxoa"
 
-#: app/core/core-enums.c:731
-#, fuzzy
+#: ../app/core/core-enums.c:731
 msgid "Very small"
 msgstr "Oso txikia"
 
-#: app/core/core-enums.c:732
+#: ../app/core/core-enums.c:732
 msgid "Small"
 msgstr "Txikia"
 
-#: app/core/core-enums.c:733
+#: ../app/core/core-enums.c:733
 msgid "Medium"
 msgstr "Tartekoa"
 
-#: app/core/core-enums.c:734
+#: ../app/core/core-enums.c:734
 msgid "Large"
 msgstr "Handia"
 
-#: app/core/core-enums.c:735
-#, fuzzy
+#: ../app/core/core-enums.c:735
 msgid "Very large"
 msgstr "Oso handia"
 
-#: app/core/core-enums.c:736
+#: ../app/core/core-enums.c:736
 msgid "Huge"
 msgstr "Itzela"
 
-#: app/core/core-enums.c:737
+#: ../app/core/core-enums.c:737
 msgid "Enormous"
 msgstr "Ikaragarria"
 
-#: app/core/core-enums.c:738
+#: ../app/core/core-enums.c:738
 msgid "Gigantic"
 msgstr "Erraldoia"
 
-#: app/core/core-enums.c:767
-#, fuzzy
+#: ../app/core/core-enums.c:767
 msgid "Sawtooth wave"
 msgstr "Uhin horzduna"
 
-#: app/core/core-enums.c:768
-#, fuzzy
+#: ../app/core/core-enums.c:768
 msgid "Triangular wave"
 msgstr "Uhin triangeluarra"
 
-#: app/core/core-enums.c:830
-#, fuzzy
+#: ../app/core/core-enums.c:830
 msgid "No thumbnails"
 msgstr "Ez dago koadro txikirik"
 
-#: app/core/core-enums.c:831
+#: ../app/core/core-enums.c:831
 msgid "Normal (128x128)"
 msgstr "Normala (128x128)"
 
-#: app/core/core-enums.c:832
+#: ../app/core/core-enums.c:832
 msgid "Large (256x256)"
 msgstr "Handia (256x256)"
 
-#: app/core/core-enums.c:859
-#, fuzzy
+#: ../app/core/core-enums.c:859
 msgid "Forward (traditional)"
 msgstr "Aurrerantz (tradizionala)"
 
-#: app/core/core-enums.c:860
-#, fuzzy
+#: ../app/core/core-enums.c:860
 msgid "Backward (corrective)"
 msgstr "Atzerantz (zentzagarria)"
 
-#: app/core/core-enums.c:1029
+#: ../app/core/core-enums.c:1030
 msgid "<>"
 msgstr "<>"
 
-#: app/core/core-enums.c:1030
-#, fuzzy
+#: ../app/core/core-enums.c:1031
 msgid "Scale image"
 msgstr "Eskalatu irudia"
 
-#: app/core/core-enums.c:1031
-#, fuzzy
+#: ../app/core/core-enums.c:1032
 msgid "Resize image"
 msgstr "Aldatu irudia tamainaz"
 
-#: app/core/core-enums.c:1032
-#, fuzzy
+#: ../app/core/core-enums.c:1033
 msgid "Flip image"
 msgstr "Irauli irudia"
 
-#: app/core/core-enums.c:1033
-#, fuzzy
+#: ../app/core/core-enums.c:1034
 msgid "Rotate image"
 msgstr "Biratu irudia"
 
-#: app/core/core-enums.c:1034
-#, fuzzy
+#: ../app/core/core-enums.c:1035
 msgid "Crop image"
 msgstr "Ebaki irudia"
 
-#: app/core/core-enums.c:1035
-#, fuzzy
+#: ../app/core/core-enums.c:1036
 msgid "Convert image"
 msgstr "Bihurtu irudia"
 
-#: app/core/core-enums.c:1036
-#, fuzzy
+#: ../app/core/core-enums.c:1037
+msgid "Remove item"
+msgstr "Ezabatu elementua"
+
+#: ../app/core/core-enums.c:1038
 msgid "Merge layers"
 msgstr "Batu geruzak"
 
-#: app/core/core-enums.c:1037
-#, fuzzy
+#: ../app/core/core-enums.c:1039
 msgid "Merge vectors"
 msgstr "Batu bektoreak"
 
-#: app/core/core-enums.c:1038 app/core/gimpchannel.c:383
-#, fuzzy
-msgid "Quick Mask"
-msgstr "Maskara bizkorra"
-
-#: app/core/core-enums.c:1039 app/core/core-enums.c:1068
-#: app/core/gimpimage-grid.c:59 app/dialogs/grid-dialog.c:144
-#: app/tools/tools-enums.c:175
+#: ../app/core/core-enums.c:1041 ../app/core/core-enums.c:1070
+#: ../app/core/gimpimage-grid.c:59 ../app/dialogs/grid-dialog.c:144
+#: ../app/tools/tools-enums.c:175
 msgid "Grid"
 msgstr "Sareta"
 
-#: app/core/core-enums.c:1040 app/core/core-enums.c:1069
+#: ../app/core/core-enums.c:1042 ../app/core/core-enums.c:1071
 msgid "Guide"
 msgstr "Gida"
 
-#: app/core/core-enums.c:1042 app/core/core-enums.c:1072
-#, fuzzy
+#: ../app/core/core-enums.c:1044 ../app/core/core-enums.c:1074
 msgid "Drawable mod"
-msgstr "Marrazgaien prozedurak"
+msgstr "Marrazgai-modua"
 
-#: app/core/core-enums.c:1043 app/core/core-enums.c:1073
-#, fuzzy
+#: ../app/core/core-enums.c:1045 ../app/core/core-enums.c:1075
 msgid "Selection mask"
 msgstr "Hautapen-maskara"
 
-#: app/core/core-enums.c:1044 app/core/core-enums.c:1076
-#, fuzzy
+#: ../app/core/core-enums.c:1046 ../app/core/core-enums.c:1078
 msgid "Item visibility"
 msgstr "Elementuaren ikusgaitasuna"
 
-#: app/core/core-enums.c:1045
-#, fuzzy
+#: ../app/core/core-enums.c:1047
 msgid "Linked item"
 msgstr "Estekatutako elementua"
 
-#: app/core/core-enums.c:1046
-#, fuzzy
+#: ../app/core/core-enums.c:1048
 msgid "Item properties"
 msgstr "Elementuaren propietateak"
 
-#: app/core/core-enums.c:1047 app/core/core-enums.c:1075
-#, fuzzy
+#: ../app/core/core-enums.c:1049 ../app/core/core-enums.c:1077
 msgid "Move item"
 msgstr "Aldatu lekuz elementua"
 
-#: app/core/core-enums.c:1048
-#, fuzzy
+#: ../app/core/core-enums.c:1050
 msgid "Scale item"
 msgstr "Eskalatu irudia"
 
-#: app/core/core-enums.c:1049
-#, fuzzy
+#: ../app/core/core-enums.c:1051
 msgid "Resize item"
 msgstr "Aldatu irudia tamainaz"
 
-#: app/core/core-enums.c:1050 app/core/core-enums.c:1080
-#, fuzzy
+#: ../app/core/core-enums.c:1052 ../app/core/core-enums.c:1082
 msgid "Add layer mask"
 msgstr "Gehitu geruza-maskara"
 
-#: app/core/core-enums.c:1051
-#, fuzzy
+#: ../app/core/core-enums.c:1053
 msgid "Apply layer mask"
 msgstr "Aplikatu geruza-maskara"
 
-#: app/core/core-enums.c:1052
-#, fuzzy
+#: ../app/core/core-enums.c:1054
 msgid "Floating selection to layer"
 msgstr "Hautapen mugikorra geruzara"
 
-#: app/core/core-enums.c:1053
-#, fuzzy
+#: ../app/core/core-enums.c:1055
 msgid "Float selection"
 msgstr "Hautapen mugikorra"
 
-#: app/core/core-enums.c:1054
-#, fuzzy
+#: ../app/core/core-enums.c:1056
 msgid "Anchor floating selection"
 msgstr "Ainguratu hautapen mugikorra"
 
-#: app/core/core-enums.c:1055
-#, fuzzy
+#: ../app/core/core-enums.c:1057
 msgid "Remove floating selection"
 msgstr "Kendu hautapen mugikorra"
 
-#: app/core/core-enums.c:1056 app/core/gimp-edit.c:267
+#: ../app/core/core-enums.c:1058 ../app/core/gimp-edit.c:270
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: app/core/core-enums.c:1057 app/core/gimp-edit.c:418
+#: ../app/core/core-enums.c:1059 ../app/core/gimp-edit.c:421
 msgid "Cut"
 msgstr "Ebaki"
 
-#: app/core/core-enums.c:1058 app/core/core-enums.c:1086
-#: app/tools/gimptexttool.c:142 app/widgets/widgets-enums.c:263
+#: ../app/core/core-enums.c:1060 ../app/core/core-enums.c:1088
+#: ../app/tools/gimptexttool.c:144 ../app/widgets/widgets-enums.c:263
 msgid "Text"
 msgstr "Testua"
 
-#: app/core/core-enums.c:1059 app/core/core-enums.c:1099
-#: app/core/gimpdrawable-transform.c:867
+#: ../app/core/core-enums.c:1061 ../app/core/core-enums.c:1101
+#: ../app/core/gimpdrawable-transform.c:867
 msgid "Transform"
 msgstr "Eraldatu"
 
-#: app/core/core-enums.c:1060 app/core/core-enums.c:1100
-#: app/paint/gimppaintcore.c:345
+#: ../app/core/core-enums.c:1062 ../app/core/core-enums.c:1102
+#: ../app/paint/gimppaintcore.c:345
 msgid "Paint"
 msgstr "Margotu"
 
-#: app/core/core-enums.c:1061 app/core/core-enums.c:1102
-#, fuzzy
+#: ../app/core/core-enums.c:1063 ../app/core/core-enums.c:1104
 msgid "Attach parasite"
 msgstr "Erantsi parasitoa"
 
-#: app/core/core-enums.c:1062 app/core/core-enums.c:1103
-#, fuzzy
+#: ../app/core/core-enums.c:1064 ../app/core/core-enums.c:1105
 msgid "Remove parasite"
 msgstr "Kendu parasitoa"
 
-#: app/core/core-enums.c:1063
-#, fuzzy
+#: ../app/core/core-enums.c:1065
 msgid "Import paths"
 msgstr "Inportatu bideak"
 
-#: app/core/core-enums.c:1064 app/pdb/drawable_cmds.c:1693
+#: ../app/core/core-enums.c:1066 ../app/pdb/drawable_cmds.c:1693
 msgid "Plug-In"
 msgstr "Plugin-a"
 
-#: app/core/core-enums.c:1065
-#, fuzzy
+#: ../app/core/core-enums.c:1067
 msgid "Image type"
 msgstr "Irudi-mota"
 
-#: app/core/core-enums.c:1066
-#, fuzzy
+#: ../app/core/core-enums.c:1068
 msgid "Image size"
 msgstr "Irudiaren tamaina"
 
-#: app/core/core-enums.c:1067
-#, fuzzy
+#: ../app/core/core-enums.c:1069
 msgid "Resolution change"
 msgstr "Bereizmen-aldaketa"
 
-#: app/core/core-enums.c:1070
-#, fuzzy
+#: ../app/core/core-enums.c:1072
 msgid "Change indexed palette"
 msgstr "Aldatu paleta indexatua"
 
-#: app/core/core-enums.c:1074
-#, fuzzy
+#: ../app/core/core-enums.c:1076
 msgid "Rename item"
 msgstr "Aldatu izena elementuari"
 
-#: app/core/core-enums.c:1077
-#, fuzzy
+#: ../app/core/core-enums.c:1079
 msgid "Set item linked"
-msgstr "Ezarri elementua estekatu gisa "
+msgstr "Ezarri elementua estekatuta"
 
-#: app/core/core-enums.c:1078
-#, fuzzy
+#: ../app/core/core-enums.c:1080
 msgid "New layer"
 msgstr "Geruza berria"
 
-#: app/core/core-enums.c:1081
-#, fuzzy
+#: ../app/core/core-enums.c:1083
 msgid "Delete layer mask"
 msgstr "Ezabatu geruza-maskara"
 
-#: app/core/core-enums.c:1082
-#, fuzzy
+#: ../app/core/core-enums.c:1084
 msgid "Reposition layer"
 msgstr "Kokatu berriro geruza"
 
-#: app/core/core-enums.c:1083
-#, fuzzy
+#: ../app/core/core-enums.c:1085
 msgid "Set layer mode"
 msgstr "Ezarri geruza-modua"
 
-#: app/core/core-enums.c:1084
-#, fuzzy
+#: ../app/core/core-enums.c:1086
 msgid "Set layer opacity"
 msgstr "Ezarri geruzaren opakutasuna"
 
-#: app/core/core-enums.c:1085
-#, fuzzy
+#: ../app/core/core-enums.c:1087
 msgid "Set preserve trans"
-msgstr "Ezarri gardentasuna gordetzea"
+msgstr "Ezarri gardentasun-babesa"
 
-#: app/core/core-enums.c:1087
-#, fuzzy
+#: ../app/core/core-enums.c:1089
 msgid "Text modified"
-msgstr "Testua aldatuta"
+msgstr "Testua aldatzean"
 
-#: app/core/core-enums.c:1088
-#, fuzzy
+#: ../app/core/core-enums.c:1090
 msgid "New channel"
 msgstr "Kanal berria"
 
-#: app/core/core-enums.c:1090
-#, fuzzy
+#: ../app/core/core-enums.c:1092
 msgid "Reposition channel"
 msgstr "Kokatu berriro kanala"
 
-#: app/core/core-enums.c:1091
-#, fuzzy
+#: ../app/core/core-enums.c:1093
 msgid "Channel color"
 msgstr "Kanal-kolorea"
 
-#: app/core/core-enums.c:1092
-#, fuzzy
+#: ../app/core/core-enums.c:1094
 msgid "New vectors"
 msgstr "Bektore berriak"
 
-#: app/core/core-enums.c:1093
-#, fuzzy
+#: ../app/core/core-enums.c:1095
 msgid "Delete vectors"
 msgstr "Ezabatu bektoreak"
 
-#: app/core/core-enums.c:1094
-#, fuzzy
+#: ../app/core/core-enums.c:1096
 msgid "Vectors mod"
-msgstr "Bektore-aldaketa"
+msgstr "Bektore-modua"
 
-#: app/core/core-enums.c:1095
-#, fuzzy
+#: ../app/core/core-enums.c:1097
 msgid "Reposition vectors"
 msgstr "Kokatu berriro bektoreak"
 
-#: app/core/core-enums.c:1096
-#, fuzzy
+#: ../app/core/core-enums.c:1098
 msgid "FS to layer"
 msgstr "Hautapen mugikorra geruzara"
 
-#: app/core/core-enums.c:1097
-#, fuzzy
+#: ../app/core/core-enums.c:1099
 msgid "FS rigor"
 msgstr "Hautapen mugikor zorrotza"
 
-#: app/core/core-enums.c:1098
-#, fuzzy
+#: ../app/core/core-enums.c:1100
 msgid "FS relax"
 msgstr "Hautapen mugikor lasaia"
 
-#: app/core/core-enums.c:1101 app/paint/gimpink.c:102
-#: app/tools/gimpinktool.c:62
+#: ../app/core/core-enums.c:1103 ../app/paint/gimpink.c:103
+#: ../app/tools/gimpinktool.c:62
 msgid "Ink"
 msgstr "Tinta"
 
-#: app/core/core-enums.c:1104
+#: ../app/core/core-enums.c:1106
 msgid "EEK: can't undo"
 msgstr "Ezin da desegin"
 
-#: app/core/gimp-edit.c:109 app/core/gimpselection.c:668
+#: ../app/core/gimp-edit.c:109 ../app/core/gimpselection.c:668
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "Ezin da ez ebaki, ez moztu hautatutako eskualdea hutsik dagoelako."
 
-#: app/core/gimp-edit.c:195 app/core/gimp-edit.c:319
+#: ../app/core/gimp-edit.c:198 ../app/core/gimp-edit.c:322
 msgid "Pasted Layer"
 msgstr "Itsatsitako geruza"
 
-#: app/core/gimp-edit.c:369
+#: ../app/core/gimp-edit.c:372
 msgid "Fill with FG Color"
-msgstr "Bete aurreko planoaren koloreaz"
+msgstr "Bete AurPlanoaren koloreaz"
 
-#: app/core/gimp-edit.c:373 app/core/gimp-edit.c:394
+#: ../app/core/gimp-edit.c:376 ../app/core/gimp-edit.c:397
 msgid "Fill with BG Color"
-msgstr "Bete atzeko planoaren koloreaz"
+msgstr "Bete AtzPlanoaren koloreaz"
 
-#: app/core/gimp-edit.c:377
+#: ../app/core/gimp-edit.c:380
 msgid "Fill with White"
 msgstr "Bete zuriz"
 
-#: app/core/gimp-edit.c:381
+#: ../app/core/gimp-edit.c:384
 msgid "Fill with Transparency"
 msgstr "Bete gardentasunez"
 
-#: app/core/gimp-edit.c:385
+#: ../app/core/gimp-edit.c:388
 msgid "Fill with Pattern"
 msgstr "Bete ereduarekin"
 
-#: app/core/gimp-gradients.c:75
+#: ../app/core/gimp-gradients.c:75
 msgid "FG to BG (HSV counter-clockwise)"
-msgstr "Aurreko planoa atzeko planora (HSV erlojuaren kontrako noranzkoan)"
+msgstr "AurPlanoa AtzPlanora (ÑSB EKN)"
 
-#: app/core/gimp-gradients.c:80
+#: ../app/core/gimp-gradients.c:80
 msgid "FG to BG (HSV clockwise hue)"
-msgstr "FG BGra (HSV erlojuaren noranzko ñabardura)"
+msgstr "AurPlanoa AtzPlanora (ÑSB ENko ñabardura)"
 
-#: app/core/gimp-gradients.c:85
+#: ../app/core/gimp-gradients.c:85
 msgid "FG to Transparent"
-msgstr "Aurreko planoa gardenera"
+msgstr "AurPlanoa gardenera"
 
-#: app/core/gimp-gui.c:153
+#: ../app/core/gimp-gui.c:153
 msgid "GIMP"
 msgstr "GIMP"
 
 #. register all internal procedures
-#: app/core/gimp.c:638
+#: ../app/core/gimp.c:638
 msgid "Procedural Database"
 msgstr "Prozeduren datu-basea"
 
-#: app/core/gimp.c:641
+#: ../app/core/gimp.c:641
 msgid "Plug-In Environment"
 msgstr "Plugin-en ingurunea"
 
 #. initialize  the global parasite table
-#: app/core/gimp.c:852
+#: ../app/core/gimp.c:852
 msgid "Looking for data files"
 msgstr "Datu-fitxategiak bilatzen"
 
-#: app/core/gimp.c:852
+#: ../app/core/gimp.c:852
 msgid "Parasites"
 msgstr "Parasitoak"
 
 #. initialize the document history
-#: app/core/gimp.c:876
+#: ../app/core/gimp.c:876
 msgid "Documents"
 msgstr "Dokumentuak"
 
 #. initialize the module list
-#: app/core/gimp.c:884 app/dialogs/preferences-dialog.c:2325
+#: ../app/core/gimp.c:884 ../app/dialogs/preferences-dialog.c:2325
 msgid "Modules"
 msgstr "Moduluak"
 
-#: app/core/gimpbrush.c:534
+#: ../app/core/gimpbrush.c:534
 #, c-format
 msgid "Could not read %d bytes from '%s': %s"
 msgstr "Ezin dira %d byte irakurri '%s'(e)tik: %s"
 
-#: app/core/gimpbrush.c:554
-#, fuzzy, c-format
+#: ../app/core/gimpbrush.c:554
+#, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
-msgstr "Analisi-errore larria '%s' brotxa-fitxategian: %d sakonera ezezaguna."
+msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Zabalera=0."
 
-#: app/core/gimpbrush.c:563
-#, fuzzy, c-format
+#: ../app/core/gimpbrush.c:563
+#, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
-msgstr ""
-"Analisi-errore larria '%s' brotxa-fitxategian: fitxategia hondatuta dago."
+msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Altuera=0."
 
-#: app/core/gimpbrush.c:572
-#, fuzzy, c-format
+#: ../app/core/gimpbrush.c:572
+#, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
-msgstr ""
-"Analisi-errore larria '%s' brotxa-fitxategian: fitxategia hondatuta dago."
+msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Byteak=0."
 
-#: app/core/gimpbrush.c:596
+#: ../app/core/gimpbrush.c:596
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
 msgstr "Analisi-errore larria '%s' brotxa-fitxategian: %d sakonera ezezaguna."
 
-#: app/core/gimpbrush.c:609
+#: ../app/core/gimpbrush.c:609
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
-msgstr ""
-"Analisi-errore larria: '%s' brotxa-fitxategian:: %d brotxa-bertsio ezezaguna."
+msgstr "Analisi-errore larria: '%s' brotxa-fitxategian:: %d brotxa-bertsio ezezaguna."
 
-#: app/core/gimpbrush.c:625 app/core/gimpbrush.c:745
+#: ../app/core/gimpbrush.c:625 ../app/core/gimpbrush.c:745
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr ""
 "Analisi-errore larria '%s' brotxa-fitxategian: fitxategia trunkatuta ageri "
 "da."
 
-#: app/core/gimpbrush.c:633 app/core/gimpbrushgenerated.c:648
-#: app/core/gimpbrushpipe.c:354
+#: ../app/core/gimpbrush.c:633 ../app/core/gimpbrushgenerated.c:648
+#: ../app/core/gimpbrushpipe.c:354
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "UTF-8 kate baliogabea '%s' brotxa-fitxategian."
 
-#: app/core/gimpbrush.c:640 app/core/gimpcontext.c:1299
-#: app/core/gimpitem.c:475 app/core/gimppattern.c:400
-#: app/dialogs/template-options-dialog.c:80 app/tools/gimpvectortool.c:339
+#: ../app/core/gimpbrush.c:640 ../app/core/gimpcontext.c:1299
+#: ../app/core/gimpitem.c:475 ../app/core/gimppattern.c:400
+#: ../app/dialogs/template-options-dialog.c:80
+#: ../app/tools/gimpvectortool.c:339
 msgid "Unnamed"
 msgstr "Izengabea"
 
-#: app/core/gimpbrush.c:734
+#: ../app/core/gimpbrush.c:734
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
@@ -5199,651 +4648,647 @@ msgid ""
 msgstr ""
 "Analisi-errore larria '%s' brotxa-fitxategian: %d brotxa-sakonera ez da "
 "onartzen\n"
-"GIMPen brotxek grisak edo RGBA izan behar dute."
+"GIMPen brotxak grisak edo GBUA izan behar dute."
 
-#: app/core/gimpbrushgenerated.c:614
+#: ../app/core/gimpbrushgenerated.c:614
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr ""
 "Analisi-errore larria '%s' brotxa-fitxategian: ez da GIMPen brotxa-"
 "fitxategia."
 
-#: app/core/gimpbrushgenerated.c:630
+#: ../app/core/gimpbrushgenerated.c:630
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version."
 msgstr ""
 "Analisi-errore larria '%s' brotxa-fitxategian: GIMPen brotxa-bertsio "
 "ezezaguna da."
 
-#: app/core/gimpbrushgenerated.c:669
-#, fuzzy, c-format
+#: ../app/core/gimpbrushgenerated.c:669
+#, c-format
 msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape."
 msgstr ""
-"Analisi-errore larria '%s' brotxa-fitxategian: GIMPen brotxa-bertsio "
-"ezezaguna da."
+"Analisi-errore larria '%s' brotxa-fitxategian: GIMPen brotxa-forma ezezaguna "
+"da."
 
-#: app/core/gimpbrushgenerated.c:750
-#, fuzzy, c-format
+#: ../app/core/gimpbrushgenerated.c:750
+#, c-format
 msgid "Error while reading brush file '%s': %s"
-msgstr "Errorea '%s' irakurtzean: %s"
+msgstr "Errorea '%s' brotxa-fitxategia irakurtzean: %s"
 
-#: app/core/gimpbrushgenerated.c:752
+#: ../app/core/gimpbrushgenerated.c:752
 msgid "File is truncated"
-msgstr ""
+msgstr "Fitxategia trunkatuta dago"
 
-#: app/core/gimpbrushpipe.c:369 app/core/gimpbrushpipe.c:389
-#: app/core/gimpbrushpipe.c:479
+#: ../app/core/gimpbrushpipe.c:369 ../app/core/gimpbrushpipe.c:389
+#: ../app/core/gimpbrushpipe.c:479
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
-msgstr ""
-"Analisi-errore larria '%s' brotxa-fitxategian: fitxategia hondatuta dago."
+msgstr "Analisi-errore larria '%s' brotxa-fitxategian: fitxategia hondatuta dago."
 
-#: app/core/gimpchannel.c:280 app/pdb/internal_procs.c:95
+#: ../app/core/gimpchannel.c:280 ../app/pdb/internal_procs.c:95
 msgid "Channel"
 msgstr "Kanala"
 
-#: app/core/gimpchannel.c:281
+#: ../app/core/gimpchannel.c:281
 msgid "Rename Channel"
 msgstr "Aldatu kanalaren izena"
 
-#: app/core/gimpchannel.c:282
+#: ../app/core/gimpchannel.c:282
 msgid "Move Channel"
 msgstr "Aldatu lekuz kanala "
 
-#: app/core/gimpchannel.c:283
+#: ../app/core/gimpchannel.c:283
 msgid "Scale Channel"
 msgstr "Eskalatu kanala"
 
-#: app/core/gimpchannel.c:284
+#: ../app/core/gimpchannel.c:284
 msgid "Resize Channel"
 msgstr "Aldatu kanalaren tamaina"
 
-#: app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:285
 msgid "Flip Channel"
 msgstr "Irauli kanala"
 
-#: app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:286
 msgid "Rotate Channel"
 msgstr "Biratu kanala"
 
-#: app/core/gimpchannel.c:287 app/core/gimpdrawable-transform.c:1121
+#: ../app/core/gimpchannel.c:287 ../app/core/gimpdrawable-transform.c:1121
 msgid "Transform Channel"
 msgstr "Eraldatu kanala"
 
-#: app/core/gimpchannel.c:288
+#: ../app/core/gimpchannel.c:288
 msgid "Stroke Channel"
 msgstr "Trazatu kanala"
 
-#: app/core/gimpchannel.c:310
+#: ../app/core/gimpchannel.c:310
 msgid "Feather Channel"
 msgstr "Difuminatu kanala"
 
-#: app/core/gimpchannel.c:311
+#: ../app/core/gimpchannel.c:311
 msgid "Sharpen Channel"
 msgstr "Enfokatu kanala"
 
-#: app/core/gimpchannel.c:312
+#: ../app/core/gimpchannel.c:312
 msgid "Clear Channel"
 msgstr "Garbitu kanala"
 
-#: app/core/gimpchannel.c:313
+#: ../app/core/gimpchannel.c:313
 msgid "Fill Channel"
 msgstr "Bete kanala"
 
-#: app/core/gimpchannel.c:314
+#: ../app/core/gimpchannel.c:314
 msgid "Invert Channel"
 msgstr "Alderantzikatu kanala"
 
-#: app/core/gimpchannel.c:315
+#: ../app/core/gimpchannel.c:315
 msgid "Border Channel"
 msgstr "Kanalaren ertza"
 
-#: app/core/gimpchannel.c:316
+#: ../app/core/gimpchannel.c:316
 msgid "Grow Channel"
 msgstr "Handitu kanala"
 
-#: app/core/gimpchannel.c:317
+#: ../app/core/gimpchannel.c:317
 msgid "Shrink Channel"
 msgstr "Txikitu kanala"
 
-#: app/core/gimpchannel.c:631
+#: ../app/core/gimpchannel.c:631
 msgid "Cannot stroke empty channel."
 msgstr "Ezin da kanal hutsa trazatu."
 
-#: app/core/gimpchannel.c:1527
+#: ../app/core/gimpchannel.c:1530
 msgid "Set Channel Color"
 msgstr "Ezarri kanal-kolorea"
 
-#: app/core/gimpchannel.c:1575
+#: ../app/core/gimpchannel.c:1578
 msgid "Set Channel Opacity"
 msgstr "Ezarri kanal-opakutasuna"
 
-#: app/core/gimpchannel.c:1644 app/core/gimpselection.c:563
+#: ../app/core/gimpchannel.c:1647 ../app/core/gimpselection.c:563
 msgid "Selection Mask"
 msgstr "Hautapen-maskara"
 
-#: app/core/gimpchannel-select.c:56 app/tools/gimprectselecttool.c:96
+#: ../app/core/gimpchannel-select.c:56 ../app/tools/gimprectselecttool.c:96
 msgid "Rect Select"
 msgstr "Hautapen laukizuzena"
 
-#: app/core/gimpchannel-select.c:107 app/tools/gimpellipseselecttool.c:71
+#: ../app/core/gimpchannel-select.c:107
+#: ../app/tools/gimpellipseselecttool.c:71
 msgid "Ellipse Select"
 msgstr "Hautapen eliptikoa"
 
-#: app/core/gimpchannel-select.c:373
+#: ../app/core/gimpchannel-select.c:373
 msgid "Alpha to Selection"
 msgstr "Alfa hautapenera"
 
-#: app/core/gimpchannel-select.c:414
+#: ../app/core/gimpchannel-select.c:414
 #, c-format
 msgid "%s Channel to Selection"
 msgstr "%s kanala hautapenera"
 
-#: app/core/gimpchannel-select.c:460 app/tools/gimpfuzzyselecttool.c:97
+#: ../app/core/gimpchannel-select.c:460 ../app/tools/gimpfuzzyselecttool.c:97
 msgid "Fuzzy Select"
 msgstr "Hurbilketazko hautapena"
 
-#: app/core/gimpchannel-select.c:505
+#: ../app/core/gimpchannel-select.c:505
 msgid "Select by Color"
 msgstr "Hautatu kolorearen arabera"
 
-#: app/core/gimpdata.c:314
+#: ../app/core/gimpdata.c:320
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Ezin izan da `%s' ezabatu: %s"
 
-#: app/core/gimpdatafactory.c:291 app/core/gimpdatafactory.c:511
-#, fuzzy, c-format
+#: ../app/core/gimpdatafactory.c:291 ../app/core/gimpdatafactory.c:511
+#, c-format
 msgid ""
 "Warning: Failed to save data:\n"
 "\n"
 "%s"
 msgstr ""
-"Kontuz: ezin izan dira datuak gorde:\n"
+"Abisua: huts egin du datuak gordetzean:\n"
+"\n"
 "%s"
 
-#: app/core/gimpdatafactory.c:411 app/core/gimpdatafactory.c:414
-#: app/core/gimpitem.c:272 app/core/gimpitem.c:275
+#: ../app/core/gimpdatafactory.c:411 ../app/core/gimpdatafactory.c:414
+#: ../app/core/gimpitem.c:272 ../app/core/gimpitem.c:275
 msgid "copy"
 msgstr "kopiatu"
 
-#: app/core/gimpdatafactory.c:423 app/core/gimpitem.c:284
+#: ../app/core/gimpdatafactory.c:423 ../app/core/gimpitem.c:284
 #, c-format
 msgid "%s copy"
 msgstr "%s(r)en kopia"
 
-#: app/core/gimpdatafactory.c:614
-#, fuzzy, c-format
+#: ../app/core/gimpdatafactory.c:614
+#, c-format
 msgid ""
 "Warning: Failed to load data:\n"
 "\n"
 "%s"
 msgstr ""
-"Kontuz: ezin izan dira datuak kargatu:\n"
+"Abisua: huts egin du datuak kargatzean:\n"
+"\n"
 "%s"
 
-#: app/core/gimpdrawable-blend.c:238 app/tools/gimpblendtool.c:101
+#: ../app/core/gimpdrawable-blend.c:238 ../app/tools/gimpblendtool.c:101
 msgid "Blend"
 msgstr "Nahastuta"
 
-#: app/core/gimpdrawable-bucket-fill.c:85 app/paint/gimpclone.c:183
+#: ../app/core/gimpdrawable-bucket-fill.c:85 ../app/paint/gimpclone.c:183
 msgid "No patterns available for this operation."
 msgstr "Ez dago eredu erabilgarririk eragiketa honetarako."
 
-#: app/core/gimpdrawable-bucket-fill.c:272 app/tools/gimpbucketfilltool.c:91
+#: ../app/core/gimpdrawable-bucket-fill.c:272
+#: ../app/tools/gimpbucketfilltool.c:91
 msgid "Bucket Fill"
 msgstr "Bete"
 
-#: app/core/gimpdrawable-desaturate.c:98
+#: ../app/core/gimpdrawable-desaturate.c:98
 msgid "Desaturate"
 msgstr "Desasetu"
 
-#: app/core/gimpdrawable-equalize.c:80
+#: ../app/core/gimpdrawable-equalize.c:80
 msgid "Equalize"
 msgstr "Ekualizatu"
 
-#: app/core/gimpdrawable-invert.c:61
+#: ../app/core/gimpdrawable-invert.c:61
 msgid "Invert"
 msgstr "Alderantzikatu"
 
-#: app/core/gimpdrawable-levels.c:112 app/core/gimpdrawable-levels.c:162
-#: app/tools/gimplevelstool.c:160
+#: ../app/core/gimpdrawable-levels.c:112 ../app/core/gimpdrawable-levels.c:162
+#: ../app/tools/gimplevelstool.c:160
 msgid "Levels"
 msgstr "Mailak"
 
-#: app/core/gimpdrawable-offset.c:316
+#: ../app/core/gimpdrawable-offset.c:316
 msgid "Offset Drawable"
 msgstr "Desplazatu marrazgaia"
 
-#: app/core/gimpdrawable-stroke.c:319
+#: ../app/core/gimpdrawable-stroke.c:319
 msgid "Render Stroke"
-msgstr ""
+msgstr "Errendatu trazua"
 
 #. Start a transform undo group
-#: app/core/gimpdrawable-transform.c:928 app/tools/gimpfliptool.c:82
+#: ../app/core/gimpdrawable-transform.c:928 ../app/tools/gimpfliptool.c:82
 msgid "Flip"
 msgstr "Irauli"
 
 #. Start a transform undo group
-#: app/core/gimpdrawable-transform.c:1009 app/tools/gimprotatetool.c:97
+#: ../app/core/gimpdrawable-transform.c:1009 ../app/tools/gimprotatetool.c:97
 msgid "Rotate"
 msgstr "Biratu"
 
-#: app/core/gimpdrawable-transform.c:1119 app/core/gimplayer.c:257
+#: ../app/core/gimpdrawable-transform.c:1119 ../app/core/gimplayer.c:257
 msgid "Transform Layer"
 msgstr "Eraldatu geruza"
 
-#: app/core/gimpdrawable-transform.c:1134
+#: ../app/core/gimpdrawable-transform.c:1134
 msgid "Transformation"
 msgstr "Eraldatzea"
 
-#: app/core/gimpenvirontable.c:285
+#: ../app/core/gimpenvirontable.c:285
 #, c-format
 msgid "Empty variable name in environment file %s"
 msgstr "Aldagaiaren izen hutsa %s ingurune-fitxategian"
 
-#: app/core/gimpenvirontable.c:303
+#: ../app/core/gimpenvirontable.c:303
 #, c-format
 msgid "Illegal variable name in environment file %s: %s"
 msgstr "Aldagaiaren izen ilegala %s ingurune-fitxategian: %s"
 
-#: app/core/gimpgradient-load.c:72
+#: ../app/core/gimpgradient-load.c:72
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 msgstr ""
 "Analisi-errore larria '%s' gradiente-fitxategian: ez da GIMPen gradiente-"
 "fitxategia."
 
-#: app/core/gimpgradient-load.c:87
+#: ../app/core/gimpgradient-load.c:87
 #, c-format
 msgid "Invalid UTF-8 string in gradient file '%s'."
 msgstr "UTF-8 kate baliogabea '%s' gradiente-fitxategian."
 
-#: app/core/gimpgradient-load.c:115
+#: ../app/core/gimpgradient-load.c:115
 #, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt."
-msgstr ""
-"Analisi-errore larria '%s' gradiente-fitxategian: fitxategia hondatuta dago."
+msgstr "Analisi-errore larria '%s' gradiente-fitxategian: fitxategia hondatuta dago."
 
-#: app/core/gimpgradient-load.c:172
+#: ../app/core/gimpgradient-load.c:172
 #, c-format
 msgid "Corrupt segment %d in gradient file '%s'."
 msgstr "%d segmentu okerra '%s' gradiente-fitxategian."
 
-#: app/core/gimpgradient-load.c:183 app/core/gimpgradient-load.c:197
+#: ../app/core/gimpgradient-load.c:183 ../app/core/gimpgradient-load.c:197
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr ""
+"'%s' gradiente-fitxategia hondatuta dago. Segmentuak ez dira 0-1 barrutian "
+"hedatzen."
 
-#: app/core/gimpgradient-load.c:281
-#, fuzzy, c-format
+#: ../app/core/gimpgradient-load.c:281
+#, c-format
 msgid "No linear gradients found in '%s'"
-msgstr "Ez da biderik topatu '%s'(e)n"
+msgstr "Ez da gradiente linearrik aurkitu '%s'(e)n"
 
-#: app/core/gimpgradient-load.c:291
-#, fuzzy, c-format
+#: ../app/core/gimpgradient-load.c:291
+#, c-format
 msgid "Failed to import gradients from '%s': %s"
-msgstr "Ezin izan da '%s'(e)tik bidea inportatu: %s"
+msgstr "Huts egin du '%s'(e)tik gradienteak inportatzean: %s"
 
-#: app/core/gimpgrid.c:128
+#: ../app/core/gimpgrid.c:128
 msgid "Line style used for the grid."
-msgstr ""
+msgstr "Lerro-estiloa saretan erabiltzeko."
 
-#: app/core/gimpgrid.c:134
+#: ../app/core/gimpgrid.c:134
 msgid "The foreground color of the grid."
 msgstr "Saretaren aurreko planoaren kolorea."
 
-#: app/core/gimpgrid.c:139
-msgid ""
-"The background color of the grid; only used in double dashed line style."
+#: ../app/core/gimpgrid.c:139
+msgid "The background color of the grid; only used in double dashed line style."
 msgstr ""
+"Saretaren atzeko planoko kolorea, marratxo bikoitzeko lerro estiloan "
+"bakarrik erabilgarri."
 
-#: app/core/gimpgrid.c:145
+#: ../app/core/gimpgrid.c:145
 msgid "Horizontal spacing of grid lines."
-msgstr ""
+msgstr "Saretako lerroen arteko tarte horizontala."
 
-#: app/core/gimpgrid.c:150
+#: ../app/core/gimpgrid.c:150
 msgid "Vertical spacing of grid lines."
-msgstr ""
+msgstr "Saretako lerroen arteko tarte bertikala."
 
-#: app/core/gimpgrid.c:159
-msgid ""
-"Horizontal offset of the first grid line; this may be a negative number."
+#: ../app/core/gimpgrid.c:159
+msgid "Horizontal offset of the first grid line; this may be a negative number."
 msgstr ""
+"Saretako lehen lerroaren desplazamendu horizontala, zenbaki negatiboa izan "
+"behar du."
 
-#: app/core/gimpgrid.c:166
+#: ../app/core/gimpgrid.c:166
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr ""
+"Saretako lehen lerroaren desplazamendu bertikala, zenbaki negatiboa izan "
+"behar du."
 
-#: app/core/gimpimage-colormap.c:63
-#, fuzzy
+#: ../app/core/gimpimage-colormap.c:63
 msgid "Set Colormap"
-msgstr "Kolore-mapa"
+msgstr "Ezarri kolore-mapa"
 
-#: app/core/gimpimage-colormap.c:115
-#, fuzzy
+#: ../app/core/gimpimage-colormap.c:115
 msgid "Change Colormap entry"
-msgstr "Aldatu irudiaren unitatea"
+msgstr "Aldatu kolore-maparen sarrera"
 
-#: app/core/gimpimage-colormap.c:135
-#, fuzzy
+#: ../app/core/gimpimage-colormap.c:135
 msgid "Add Color to Colormap"
-msgstr "/_Gehitu kolorea AurPl-tik"
+msgstr "Gehitu kolorea kolore-mapari"
 
-#: app/core/gimpimage-convert.c:788
+#: ../app/core/gimpimage-convert.c:789
 msgid "Convert Image to RGB"
-msgstr "Bihurtu irudia RGBra"
+msgstr "Bihurtu irudia GBUra"
 
-#: app/core/gimpimage-convert.c:792
+#: ../app/core/gimpimage-convert.c:793
 msgid "Convert Image to Grayscale"
 msgstr "Bihurtu irudia gris-eskalara"
 
-#: app/core/gimpimage-convert.c:796
+#: ../app/core/gimpimage-convert.c:797
 msgid "Convert Image to Indexed"
 msgstr "Bihurtu irudia kolore indexatuetara"
 
-#: app/core/gimpimage-convert.c:875
-#, fuzzy
+#: ../app/core/gimpimage-convert.c:879
 msgid "Converting to indexed (stage 2)..."
-msgstr "Bihurtu irudia kolore indexatuetara"
+msgstr "Indexatuetara bihurtzen (2. urratsa)..."
 
-#: app/core/gimpimage-convert.c:919
-#, fuzzy
+#: ../app/core/gimpimage-convert.c:923
 msgid "Converting to indexed (stage 3)..."
-msgstr "Bihurtu irudia kolore indexatuetara"
+msgstr "Indexatuetara bihurtzen (3. urratsa)..."
 
-#: app/core/gimpimage-crop.c:123
+#: ../app/core/gimpimage-crop.c:124
 msgid "Crop Image"
 msgstr "Ebaki irudia"
 
-#: app/core/gimpimage-crop.c:126 app/core/gimpimage-resize.c:67
+#: ../app/core/gimpimage-crop.c:127 ../app/core/gimpimage-resize.c:67
 msgid "Resize Image"
 msgstr "Aldatu irudia tamainaz"
 
-#: app/core/gimpimage-guides.c:53
+#: ../app/core/gimpimage-guides.c:53
 msgid "Add Horizontal Guide"
 msgstr "Gehitu gida horizontala"
 
-#: app/core/gimpimage-guides.c:80
+#: ../app/core/gimpimage-guides.c:80
 msgid "Add Vertical Guide"
 msgstr "Gehitu gida bertikala"
 
-#: app/core/gimpimage-guides.c:143 app/tools/gimpmovetool.c:570
+#: ../app/core/gimpimage-guides.c:143 ../app/tools/gimpmovetool.c:570
 msgid "Remove Guide"
 msgstr "Kendu gida"
 
-#: app/core/gimpimage-guides.c:167
+#: ../app/core/gimpimage-guides.c:167
 msgid "Move Guide"
 msgstr "Aldatu lekuz gida"
 
-#: app/core/gimpimage-merge.c:91
+#: ../app/core/gimpimage-merge.c:91
 msgid "Merge Visible Layers"
 msgstr "Batu ikusgai dauden geruzak"
 
-#: app/core/gimpimage-merge.c:107
+#: ../app/core/gimpimage-merge.c:107
 msgid "Not enough visible layers for a merge. There must be at least two."
 msgstr "Ez daude batzeko behar adina geruza ikusgai. Gutxienez bi behar dira."
 
-#: app/core/gimpimage-merge.c:142
+#: ../app/core/gimpimage-merge.c:142
 msgid "Flatten Image"
 msgstr "Berdindu irudia"
 
-#: app/core/gimpimage-merge.c:193
+#: ../app/core/gimpimage-merge.c:193
 msgid "Merge Down"
 msgstr "Batu beherantz"
 
-#: app/core/gimpimage-merge.c:202
+#: ../app/core/gimpimage-merge.c:202
 msgid "There are not enough visible layers for a merge down."
 msgstr "Ez daude behar adina geruza ikusgai beherantz batzeko."
 
-#: app/core/gimpimage-merge.c:543
+#: ../app/core/gimpimage-merge.c:543
 msgid "Merge Visible Paths"
 msgstr "Batu ikusgai dauden bideak"
 
-#: app/core/gimpimage-merge.c:580
+#: ../app/core/gimpimage-merge.c:580
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "Ez daude batzeko behar adina bide ikusgai. Gutxienez bi behar dira."
 
-#: app/core/gimpimage-qmask.c:67
-#, fuzzy
+#: ../app/core/gimpimage-qmask.c:67
 msgid "Enable Quick Mask"
-msgstr "Gaitu maskara bizkorra"
+msgstr "Gaitu maskara azkarra"
 
-#: app/core/gimpimage-qmask.c:117
-#, fuzzy
+#: ../app/core/gimpimage-qmask.c:117
 msgid "Disable Quick Mask"
-msgstr "Desgaitu maskara bizkorra"
+msgstr "Desgaitu maskara azkarra"
 
-#: app/core/gimpimage-undo-push.c:3055
+#: ../app/core/gimpimage-undo-push.c:3055
 #, c-format
 msgid "Can't undo %s"
 msgstr "Ezin da %s desegin"
 
-#: app/core/gimpimage.c:1357
+#: ../app/core/gimpimage.c:1359
 msgid "Change Image Resolution"
 msgstr "Aldatu irudiaren bereizmena"
 
-#: app/core/gimpimage.c:1397
+#: ../app/core/gimpimage.c:1399
 msgid "Change Image Unit"
 msgstr "Aldatu irudiaren unitatea"
 
-#: app/core/gimpimage.c:2177
+#: ../app/core/gimpimage.c:2179
 msgid "Attach Parasite to Image"
 msgstr "Erantsi parasitoa irudiari"
 
-#: app/core/gimpimage.c:2210
+#: ../app/core/gimpimage.c:2212
 msgid "Remove Parasite from Image"
 msgstr "Kendu parasitoa iruditik"
 
-#: app/core/gimpimage.c:2678
+#: ../app/core/gimpimage.c:2680
 msgid "Add Layer"
 msgstr "Gehitu geruza"
 
-#: app/core/gimpimage.c:2745
+#: ../app/core/gimpimage.c:2744 ../app/core/gimpimage.c:2757
 msgid "Remove Layer"
 msgstr "Kendu geruza"
 
-#: app/core/gimpimage.c:2816
+#: ../app/core/gimpimage.c:2831
 msgid "Layer cannot be raised higher."
 msgstr "Ezin da geruza gorago igo."
 
-#: app/core/gimpimage.c:2822 app/core/gimpimage.c:2872
+#: ../app/core/gimpimage.c:2837 ../app/core/gimpimage.c:2887
 msgid "Cannot raise a layer without alpha."
 msgstr "Ezin da geruza alfarik gabe igo."
 
-#: app/core/gimpimage.c:2827
+#: ../app/core/gimpimage.c:2842
 msgid "Raise Layer"
 msgstr "Igo geruza"
 
-#: app/core/gimpimage.c:2844
+#: ../app/core/gimpimage.c:2859
 msgid "Layer cannot be lowered more."
 msgstr "Ezin da geruza gehiago jaitsi."
 
-#: app/core/gimpimage.c:2849
+#: ../app/core/gimpimage.c:2864
 msgid "Lower Layer"
 msgstr "Jaitsi geruza"
 
-#: app/core/gimpimage.c:2866
+#: ../app/core/gimpimage.c:2881
 msgid "Layer is already on top."
 msgstr "Geruza leku garaienean dago."
 
-#: app/core/gimpimage.c:2877
+#: ../app/core/gimpimage.c:2892
 msgid "Raise Layer to Top"
 msgstr "Igo geruza goienera"
 
-#: app/core/gimpimage.c:2897
+#: ../app/core/gimpimage.c:2912
 msgid "Layer is already on the bottom."
 msgstr "Geruza leku baxuenean dago."
 
-#: app/core/gimpimage.c:2902
+#: ../app/core/gimpimage.c:2917
 msgid "Lower Layer to Bottom"
 msgstr "Jaitsi geruza leku baxuenera"
 
-#: app/core/gimpimage.c:2941
+#: ../app/core/gimpimage.c:2956
 #, c-format
 msgid "Layer '%s' has no alpha. Layer was placed above it."
 msgstr "\"%s\" geruzak ez du alfarik. Geruza haren gainean jarri da."
 
-#: app/core/gimpimage.c:2993
+#: ../app/core/gimpimage.c:3008
 msgid "Add Channel"
 msgstr "Gehitu kanala"
 
-#: app/core/gimpimage.c:3038
+#: ../app/core/gimpimage.c:3052 ../app/core/gimpimage.c:3063
 msgid "Remove Channel"
-msgstr "Kendu kanala "
+msgstr "Kendu kanala"
 
-#: app/core/gimpimage.c:3082
+#: ../app/core/gimpimage.c:3110
 msgid "Channel cannot be raised higher."
 msgstr "Kanala ezin izan da gorago igo."
 
-#: app/core/gimpimage.c:3087
+#: ../app/core/gimpimage.c:3115
 msgid "Raise Channel"
 msgstr "Igo kanala"
 
-#: app/core/gimpimage.c:3104
-#, fuzzy
+#: ../app/core/gimpimage.c:3132
 msgid "Channel is already on top."
-msgstr "Geruza leku garaienean dago."
+msgstr "Kanala leku goienean dago."
 
-#: app/core/gimpimage.c:3109
+#: ../app/core/gimpimage.c:3137
 msgid "Raise Channel to Top"
 msgstr "Igo kanala goienera"
 
-#: app/core/gimpimage.c:3126
+#: ../app/core/gimpimage.c:3154
 msgid "Channel cannot be lowered more."
 msgstr "Ezin izan da kanala gehiago jaitsi."
 
-#: app/core/gimpimage.c:3131
+#: ../app/core/gimpimage.c:3159
 msgid "Lower Channel"
 msgstr "Jaitsi kanala"
 
-#: app/core/gimpimage.c:3151
-#, fuzzy
+#: ../app/core/gimpimage.c:3179
 msgid "Channel is already on the bottom."
 msgstr "Geruza leku baxuenean dago."
 
-#: app/core/gimpimage.c:3156
+#: ../app/core/gimpimage.c:3184
 msgid "Lower Channel to Bottom"
 msgstr "Jaitsi kanala leku baxuenera"
 
-#: app/core/gimpimage.c:3231
+#: ../app/core/gimpimage.c:3259
 msgid "Add Path"
 msgstr "Gehitu bidea"
 
-#: app/core/gimpimage.c:3276
+#: ../app/core/gimpimage.c:3304
 msgid "Remove Path"
 msgstr "Kendu bidea"
 
-#: app/core/gimpimage.c:3320
+#: ../app/core/gimpimage.c:3348
 msgid "Path cannot be raised higher."
 msgstr "Bidea ezin da gorago igo."
 
-#: app/core/gimpimage.c:3325
+#: ../app/core/gimpimage.c:3353
 msgid "Raise Path"
 msgstr "Igo bidea"
 
-#: app/core/gimpimage.c:3342
-#, fuzzy
+#: ../app/core/gimpimage.c:3370
 msgid "Path is already on top."
-msgstr "Geruza leku garaienean dago."
+msgstr "Bidea leku goienean dago."
 
-#: app/core/gimpimage.c:3347
+#: ../app/core/gimpimage.c:3375
 msgid "Raise Path to Top"
 msgstr "Igo bidea goienera"
 
-#: app/core/gimpimage.c:3364
+#: ../app/core/gimpimage.c:3392
 msgid "Path cannot be lowered more."
 msgstr "Ezin da bidea gehiago jaitsi."
 
-#: app/core/gimpimage.c:3369
+#: ../app/core/gimpimage.c:3397
 msgid "Lower Path"
 msgstr "Jaitsi bidea"
 
-#: app/core/gimpimage.c:3389
-#, fuzzy
+#: ../app/core/gimpimage.c:3417
 msgid "Path is already on the bottom."
-msgstr "Geruza leku baxuenean dago."
+msgstr "Bidea leku baxuenean dago."
 
-#: app/core/gimpimage.c:3394
+#: ../app/core/gimpimage.c:3422
 msgid "Lower Path to Bottom"
 msgstr "Jaitsi bidea leku baxuenera"
 
-#: app/core/gimpimagefile.c:568
+#: ../app/core/gimpimagefile.c:568
 msgid "Remote image"
 msgstr "Urruneko irudia"
 
-#: app/core/gimpimagefile.c:573 app/dialogs/preferences-dialog.c:1472
+#: ../app/core/gimpimagefile.c:573 ../app/dialogs/preferences-dialog.c:1472
 msgid "Folder"
 msgstr "Karpeta"
 
-#: app/core/gimpimagefile.c:578
+#: ../app/core/gimpimagefile.c:578
 msgid "Special File"
-msgstr ""
+msgstr "Fitxategi berezia"
 
-#: app/core/gimpimagefile.c:605
-#, fuzzy
+#: ../app/core/gimpimagefile.c:605
 msgid "Click to create preview"
-msgstr "Ezin da aurrebistarik sortu"
+msgstr "Egin klik aurrebista sortzeko"
 
-#: app/core/gimpimagefile.c:609
+#: ../app/core/gimpimagefile.c:609
 msgid "Loading preview ..."
 msgstr "Aurrebista kargatzen..."
 
-#: app/core/gimpimagefile.c:613
+#: ../app/core/gimpimagefile.c:613
 msgid "Preview is out of date"
 msgstr "Aurrebista iraungita dago"
 
-#: app/core/gimpimagefile.c:617
+#: ../app/core/gimpimagefile.c:617
 msgid "Cannot create preview"
 msgstr "Ezin da aurrebistarik sortu"
 
 #. pixel size
-#: app/core/gimpimagefile.c:624 app/dialogs/info-window.c:552
-#: app/widgets/gimpsizebox.c:432 app/widgets/gimptemplateeditor.c:637
-#: app/widgets/gimptemplateeditor.c:675
+#: ../app/core/gimpimagefile.c:624 ../app/dialogs/info-window.c:552
+#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:637
+#: ../app/widgets/gimptemplateeditor.c:675
 #, c-format
 msgid "%d x %d pixels"
 msgstr "%d x %d pixel"
 
-#: app/core/gimpimagefile.c:639
+#: ../app/core/gimpimagefile.c:639
 msgid "1 Layer"
 msgstr "Geruza bat"
 
-#: app/core/gimpimagefile.c:641
+#: ../app/core/gimpimagefile.c:641
 #, c-format
 msgid "%d Layers"
 msgstr "%d geruza"
 
-#: app/core/gimpimagefile.c:682
+#: ../app/core/gimpimagefile.c:685
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "Ezin izan da koadro txikien '%s' fitxategia ireki: %s "
 
-#: app/core/gimpitem.c:1091
+#: ../app/core/gimpitem.c:1091
 msgid "Attach Parasite"
 msgstr "Erantsi parasitoa"
 
-#: app/core/gimpitem.c:1101
+#: ../app/core/gimpitem.c:1101
 msgid "Attach Parasite to Item"
 msgstr "Erantsi parasitoa elementuari"
 
-#: app/core/gimpitem.c:1140 app/core/gimpitem.c:1147
+#: ../app/core/gimpitem.c:1140 ../app/core/gimpitem.c:1147
 msgid "Remove Parasite from Item"
 msgstr "Kendu parasitoa elementutik"
 
-#: app/core/gimplayer-floating-sel.c:98
+#: ../app/core/gimplayer-floating-sel.c:98
 msgid "Remove Floating Selection"
 msgstr "Kendu hautapen mugikorra"
 
-#: app/core/gimplayer-floating-sel.c:129
+#: ../app/core/gimplayer-floating-sel.c:129
 msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "Ezin da geruza hau ainguratu, hautapen mugikorra ez delako."
 
-#: app/core/gimplayer-floating-sel.c:136
+#: ../app/core/gimplayer-floating-sel.c:136
 msgid "Anchor Floating Selection"
 msgstr "Ainguratu hautapen mugikorra"
 
-#: app/core/gimplayer-floating-sel.c:209
+#: ../app/core/gimplayer-floating-sel.c:209
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -5851,95 +5296,100 @@ msgstr ""
 "Ezin da geruza berria sortu hautapen mugikorretik, hau geruza-maskara edo "
 "kanal batena delako."
 
-#: app/core/gimplayer-floating-sel.c:215
+#: ../app/core/gimplayer-floating-sel.c:215
 msgid "Floating Selection to Layer"
 msgstr "Hautapen mugikorra geruzara"
 
-#: app/core/gimplayer.c:250 app/pdb/internal_procs.c:152
+#: ../app/core/gimplayer.c:250 ../app/pdb/internal_procs.c:152
 msgid "Layer"
 msgstr "Geruza"
 
-#: app/core/gimplayer.c:251
+#: ../app/core/gimplayer.c:251
 msgid "Rename Layer"
 msgstr "Aldatu geruzaren izena"
 
-#: app/core/gimplayer.c:252 app/pdb/layer_cmds.c:669 app/pdb/layer_cmds.c:742
+#: ../app/core/gimplayer.c:252 ../app/pdb/layer_cmds.c:669
+#: ../app/pdb/layer_cmds.c:742
 msgid "Move Layer"
 msgstr "Aldatu geruza lekuz"
 
-#: app/core/gimplayer.c:254
+#: ../app/core/gimplayer.c:254
 msgid "Resize Layer"
 msgstr "Aldatu geruza tamainaz"
 
-#: app/core/gimplayer.c:255
+#: ../app/core/gimplayer.c:255
 msgid "Flip Layer"
 msgstr "Irauli geruza"
 
-#: app/core/gimplayer.c:256
+#: ../app/core/gimplayer.c:256
 msgid "Rotate Layer"
 msgstr "Biratu geruza"
 
-#: app/core/gimplayer.c:339 app/core/gimplayer.c:1109
-#: app/core/gimplayermask.c:236
+#: ../app/core/gimplayer.c:339 ../app/core/gimplayer.c:1109
+#: ../app/core/gimplayermask.c:236
 #, c-format
 msgid "%s mask"
 msgstr "%s maskara"
 
-#: app/core/gimplayer.c:385
-#, fuzzy, c-format
+#: ../app/core/gimplayer.c:385
+#, c-format
 msgid ""
 "Floating Selection\n"
 "(%s)"
-msgstr "Hautapen mugikorra"
+msgstr ""
+"Hautapen mugikorra\n"
+"(%s)"
 
-#: app/core/gimplayer.c:1035
+#: ../app/core/gimplayer.c:1035
 msgid "Cannot add layer mask to layer which is not part of an image."
 msgstr "Ezin da geruza-maskara gehitu irudi baten zati ez den geruzari."
 
-#: app/core/gimplayer.c:1042
+#: ../app/core/gimplayer.c:1042
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Ezin da geruza-maskara gehitu, geruzak dagoeneko baduelako bat."
 
-#: app/core/gimplayer.c:1049
+#: ../app/core/gimplayer.c:1049
 msgid "Cannot add layer mask to a layer with no alpha channel."
 msgstr "Ezin zaio geruza-maskara gehitu alfa kanalik ez duen geruzari."
 
-#: app/core/gimplayer.c:1059
+#: ../app/core/gimplayer.c:1059
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "Ezin da aipatutako geruzaren neurriak ez dituen geruza-maskara gehitu."
 
-#: app/core/gimplayer.c:1163
+#: ../app/core/gimplayer.c:1163
 msgid "Transfer Alpha to Mask"
-msgstr ""
+msgstr "Transferitu alfa maskarara"
 
-#: app/core/gimplayer.c:1323
+#: ../app/core/gimplayer.c:1323
 msgid "Apply Layer Mask"
 msgstr "Aplikatu geruza-maskara"
 
-#: app/core/gimplayer.c:1324
+#: ../app/core/gimplayer.c:1324
 msgid "Delete Layer Mask"
 msgstr "Ezabatu geruza-maskara"
 
-#: app/core/gimplayer.c:1425
+#: ../app/core/gimplayer.c:1425
 msgid "Add Alpha Channel"
 msgstr "Gehitu alfa kanala"
 
-#: app/core/gimplayer.c:1447
+#: ../app/core/gimplayer.c:1447
 msgid "Layer to Image Size"
 msgstr "Geruza irudi-tamainara"
 
-#: app/core/gimplayermask.c:132
+#: ../app/core/gimplayermask.c:132
 msgid "Move Layer Mask"
 msgstr "Aldatu geruza-maskara lekuz"
 
-#: app/core/gimppalette-import.c:490
+#: ../app/core/gimppalette-import.c:493
 #, c-format
 msgid ""
 "Unknown type of palette file:\n"
 "%s"
 msgstr ""
+"Paleta-fitxategi mota ezezaguna:\n"
+"%s"
 
-#: app/core/gimppalette.c:375
+#: ../app/core/gimppalette.c:375
 #, c-format
 msgid ""
 "Fatal parse error in palette file '%s': Missing magic header.\n"
@@ -5948,25 +5398,23 @@ msgstr ""
 "Analisi-errore larria '%s' paleta-fitxategian: goiburu magikoa falta da\n"
 "Fitxategi hau DOSetik bihurtu behar da?"
 
-#: app/core/gimppalette.c:381
+#: ../app/core/gimppalette.c:381
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
-msgstr ""
-"Analisi-errore larria '%s' paleta-fitxategian: goiburu magikoa falta da."
+msgstr "Analisi-errore larria '%s' paleta-fitxategian: goiburu magikoa falta da."
 
-#: app/core/gimppalette.c:395 app/core/gimppalette.c:420
-#: app/core/gimppalette.c:450 app/core/gimppalette.c:536
+#: ../app/core/gimppalette.c:395 ../app/core/gimppalette.c:420
+#: ../app/core/gimppalette.c:450 ../app/core/gimppalette.c:536
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
-msgstr ""
-"Analisi-errore larria '%s' paleta-fitxategian: irakurketa-errorea %d lerroan."
+msgstr "Analisi-errore larria '%s' paleta-fitxategian: irakurketa-errorea %d lerroan."
 
-#: app/core/gimppalette.c:410
+#: ../app/core/gimppalette.c:410
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "UTF-8 kate baliogabea '%s' paleta-fitxategian"
 
-#: app/core/gimppalette.c:438
+#: ../app/core/gimppalette.c:438
 #, c-format
 msgid ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
@@ -5976,43 +5424,42 @@ msgstr ""
 "erabiltzen."
 
 #. maybe we should just abort?
-#: app/core/gimppalette.c:484
+#: ../app/core/gimppalette.c:484
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "'%s' paleta kargatzen: osagai GORRIA falta da %d lerroan."
 
-#: app/core/gimppalette.c:492
+#: ../app/core/gimppalette.c:492
 #, c-format
 msgid "Reading palette '%s': Missing GREEN component in line %d."
 msgstr "'%s' paleta kargatzen: osagai BERDEA falta da %d lerroan."
 
-#: app/core/gimppalette.c:500
+#: ../app/core/gimppalette.c:500
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "'%s' paleta kargatzen: osagai URDINA falta da %d lerroan."
 
-#: app/core/gimppalette.c:510
+#: ../app/core/gimppalette.c:510
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
-msgstr "'%s' paleta kargatzen: RGB balioa barrutitik kanpo dago %d lerroan."
+msgstr "'%s' paleta kargatzen: GBU balioa barrutitik kanpo dago %d lerroan."
 
-#: app/core/gimppattern.c:337 app/core/gimppattern.c:384
-#: app/core/gimppattern.c:415
+#: ../app/core/gimppattern.c:337 ../app/core/gimppattern.c:384
+#: ../app/core/gimppattern.c:415
 #, c-format
 msgid "Fatal parse error in pattern file '%s': Could not read %d bytes: %s"
 msgstr ""
 "Analisi-errore larria '%s' eredu-fitxategian: ezin izan da %d byte irakurri: "
 "%s"
 
-#: app/core/gimppattern.c:357
+#: ../app/core/gimppattern.c:357
 #, 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 ""
 "Analisi-errore larria '%s' eredu-fitxategian: eredu formatuaren %d bertsio "
 "ezezaguna."
 
-#: app/core/gimppattern.c:367
+#: ../app/core/gimppattern.c:367
 #, c-format
 msgid ""
 "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n"
@@ -6020,1606 +5467,1516 @@ msgid ""
 msgstr ""
 "Analisi-errore larria '%s' eredu-fitxategian:%d eredu-sakonera ez da "
 "onartzen.\n"
-"GIMPen ereduek GRISAK edo RGB izan behar dute."
+"GIMPen ereduek GRISAK edo GBU izan behar dute."
 
-#: app/core/gimppattern.c:393
+#: ../app/core/gimppattern.c:393
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "UTF-8 kate baliogabea '%s' eredu-fitxategian."
 
-#: app/core/gimppdbprogress.c:260 app/widgets/gimppdbdialog.c:320
-#, fuzzy, c-format
+#: ../app/core/gimppdbprogress.c:260 ../app/widgets/gimppdbdialog.c:320
+#, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr ""
-"Ezin da brotxaren atzeradeia exekutatu. Beharbada dagokion plugin-ak huts "
-"egingo zuen."
+"Ezin da %s atzeradeia exekutatu. Beharbada dagokion plugin-a kraskatuta "
+"egongo da."
 
-#: app/core/gimpprogress.c:107 app/core/gimpprogress.c:154
+#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
 msgid "Please wait..."
 msgstr "Itxaron..."
 
-#: app/core/gimpselection.c:183 app/tools/gimpeditselectiontool.c:258
+#: ../app/core/gimpselection.c:183 ../app/tools/gimpeditselectiontool.c:258
 msgid "Move Selection"
 msgstr "Aldatu hautapena lekuz"
 
-#: app/core/gimpselection.c:202
+#: ../app/core/gimpselection.c:202
 msgid "Sharpen Selection"
 msgstr "Enfokatu hautapena"
 
-#: app/core/gimpselection.c:203
+#: ../app/core/gimpselection.c:203
 msgid "Select None"
 msgstr "Bat ere ez hautatu"
 
-#: app/core/gimpselection.c:204
+#: ../app/core/gimpselection.c:204
 msgid "Select All"
 msgstr "Hautatu dena"
 
-#: app/core/gimpselection.c:205
+#: ../app/core/gimpselection.c:205
 msgid "Invert Selection"
 msgstr "Alderantzikatu hautapena"
 
-#: app/core/gimpselection.c:307
+#: ../app/core/gimpselection.c:307
 msgid "No selection to stroke."
 msgstr "Ez dago trazatzeko hautapenik."
 
-#: app/core/gimpselection.c:815
+#: ../app/core/gimpselection.c:815
 msgid "Cannot float selection because the selected region is empty."
 msgstr "Ezin da hautapena mugitu, hautatutako eskualdea hutsik dagoelako."
 
-#: app/core/gimpselection.c:822
+#: ../app/core/gimpselection.c:822
 msgid "Float Selection"
 msgstr "Hautapen mugikorra"
 
-#: app/core/gimpselection.c:839
-#, fuzzy
+#: ../app/core/gimpselection.c:839
 msgid "Floated Layer"
-msgstr "Biratu geruza"
+msgstr "Geruza mugikorra"
 
-#: app/core/gimptemplate.c:158
+#: ../app/core/gimptemplate.c:158
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
-msgstr ""
+msgstr "Pantailaren koordenatuen unitatea, puntua puntua moduan ez dagoenean."
 
-#: app/core/gimptemplate.c:165
-#, fuzzy
+#: ../app/core/gimptemplate.c:165
 msgid "The horizontal image resolution."
 msgstr "Irudiaren bereizmen horizontala."
 
-#: app/core/gimptemplate.c:170
+#: ../app/core/gimptemplate.c:170
 msgid "The vertical image resolution."
 msgstr "Irudiaren bereizmen bertikala."
 
-#: app/core/gimptemplate.c:450 app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:450 ../app/widgets/widgets-enums.c:24
 msgid "Background"
 msgstr "Atzeko planoa"
 
 #. pseudo unit
-#: app/core/gimpunit.c:55
+#: ../app/core/gimpunit.c:55
 msgid "pixel"
 msgstr "pixel"
 
-#: app/core/gimpunit.c:55 app/tools/gimpmeasuretool.c:787
-#: app/tools/gimpmeasuretool.c:875 app/tools/gimppainttool.c:681
+#: ../app/core/gimpunit.c:55 ../app/tools/gimpmeasuretool.c:787
+#: ../app/tools/gimpmeasuretool.c:875 ../app/tools/gimppainttool.c:681
 msgid "pixels"
 msgstr "pixel"
 
 #. standard units
-#: app/core/gimpunit.c:58
+#: ../app/core/gimpunit.c:58
 msgid "inch"
 msgstr "hazbete"
 
-#: app/core/gimpunit.c:58
+#: ../app/core/gimpunit.c:58
 msgid "inches"
 msgstr "hazbete"
 
-#: app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:59
 msgid "millimeter"
 msgstr "milimetro"
 
-#: app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:59
 msgid "millimeters"
 msgstr "milimetro"
 
 #. professional units
-#: app/core/gimpunit.c:62
+#: ../app/core/gimpunit.c:62
 msgid "point"
 msgstr "puntu"
 
-#: app/core/gimpunit.c:62
+#: ../app/core/gimpunit.c:62
 msgid "points"
 msgstr "puntu"
 
-#: app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:63
 msgid "pica"
 msgstr "pika"
 
-#: app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:63
 msgid "picas"
 msgstr "pika"
 
-#: app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:70
 msgid "percent"
 msgstr "ehunekoa"
 
-#: app/dialogs/about-dialog.c:45
+#: ../app/dialogs/about-dialog.c:45
 #, c-format
 msgid "Version %s brought to you by"
 msgstr "%s bertsio honen egilea: "
 
-#: app/dialogs/about-dialog.c:51
+#: ../app/dialogs/about-dialog.c:51
 msgid "Translation by"
-msgstr "Eraldatzea"
+msgstr "Itzultzaileak:"
 
 #. Translators: insert your names here, separated by newline
 #. we'd prefer just the names, please no email addresses.
-#: app/dialogs/about-dialog.c:54
+#: ../app/dialogs/about-dialog.c:54
 msgid "translator-credits"
 msgstr ""
+"Hizkuntza Politikarako Sailburuordetza \n"
+"Iñaki Larrañaga Murgoitio "
 
-#: app/dialogs/about-dialog.c:59
+#: ../app/dialogs/about-dialog.c:59
 msgid "Contributions by"
-msgstr ""
+msgstr "Laguntzaileak:"
 
-#: app/dialogs/about-dialog.c:153
+#: ../app/dialogs/about-dialog.c:153
 msgid "About The GIMP"
 msgstr "GIMPi buruz"
 
-#: app/dialogs/channel-options-dialog.c:138
+#: ../app/dialogs/channel-options-dialog.c:138
 msgid "Channel Name:"
 msgstr "Kanalaren izena:"
 
-#: app/dialogs/convert-dialog.c:121
+#: ../app/dialogs/convert-dialog.c:121
 msgid "Indexed Color Conversion"
 msgstr "Kolore indexatuaren bihurketa"
 
-#: app/dialogs/convert-dialog.c:124
+#: ../app/dialogs/convert-dialog.c:124
 msgid "Convert Image to Indexed Colors"
 msgstr "Bihurtu irudia kolore indexatuetara"
 
-#: app/dialogs/convert-dialog.c:165 app/dialogs/dialogs.c:171
+#: ../app/dialogs/convert-dialog.c:165 ../app/dialogs/dialogs.c:171
 msgid "Colormap"
 msgstr "Kolore-mapa"
 
-#: app/dialogs/convert-dialog.c:179
-#, fuzzy
+#: ../app/dialogs/convert-dialog.c:179
 msgid "_Maximum number of colors:"
-msgstr "Gehienezko kolore-kopurua:"
+msgstr "_Gehienezko kolore-kopurua:"
 
-#: app/dialogs/convert-dialog.c:206
-#, fuzzy
+#: ../app/dialogs/convert-dialog.c:206
 msgid "_Remove unused colors from final palette"
-msgstr "Kendu erabili gabeko koloreak azken paletatik "
+msgstr "_Kendu erabili gabeko koloreak azken paletatik"
 
 #. dithering
-#: app/dialogs/convert-dialog.c:221 app/tools/gimpblendoptions.c:269
+#: ../app/dialogs/convert-dialog.c:221 ../app/tools/gimpblendoptions.c:269
 msgid "Dithering"
 msgstr "Bilbatzea"
 
-#: app/dialogs/convert-dialog.c:233
-#, fuzzy
+#: ../app/dialogs/convert-dialog.c:233
 msgid "Color _dithering:"
-msgstr "Ez dago kolore-bilberik"
+msgstr "Kolorea _bilbatzea:"
 
-#: app/dialogs/convert-dialog.c:248
-#, fuzzy
+#: ../app/dialogs/convert-dialog.c:248
 msgid "Enable dithering of _transparency"
-msgstr "Gaitu gardentasunaren bilbea"
+msgstr "Gaitu g_ardentasunaren bilbea"
 
-#: app/dialogs/convert-dialog.c:274
-#, fuzzy
+#: ../app/dialogs/convert-dialog.c:274
 msgid "Converting to indexed..."
-msgstr "Bihurtu irudia kolore indexatuetara"
+msgstr "Indexatura bihurtzen..."
 
-#: app/dialogs/convert-dialog.c:382
+#: ../app/dialogs/convert-dialog.c:384
 msgid "Cannot convert to a palette with more than 256 colors."
-msgstr ""
+msgstr "Ezin da 256 kolore baino gehiagodun paletara bihurtu."
 
-#: app/dialogs/dialogs-constructors.c:164 app/gui/gui.c:161
+#: ../app/dialogs/dialogs-constructors.c:164 ../app/gui/gui.c:161
 msgid "GIMP Message"
 msgstr "GIMPeko mezua"
 
-#: app/dialogs/dialogs.c:127
+#: ../app/dialogs/dialogs.c:127
 msgid "Devices"
 msgstr "Gailuak"
 
-#: app/dialogs/dialogs.c:127
+#: ../app/dialogs/dialogs.c:127
 msgid "Device Status"
 msgstr "Gailuaren egoera"
 
-#: app/dialogs/dialogs.c:131
+#: ../app/dialogs/dialogs.c:131
 msgid "Errors"
 msgstr "Erroreak"
 
-#: app/dialogs/dialogs.c:152
+#: ../app/dialogs/dialogs.c:152
 msgid "History"
 msgstr "Historia"
 
-#: app/dialogs/dialogs.c:154
+#: ../app/dialogs/dialogs.c:154
 msgid "Image Templates"
 msgstr "Irudien txantiloiak"
 
-#: app/dialogs/dialogs.c:175
+#: ../app/dialogs/dialogs.c:175
 msgid "Histogram"
 msgstr "Histograma"
 
-#: app/dialogs/dialogs.c:179
+#: ../app/dialogs/dialogs.c:179
 msgid "Selection"
 msgstr "Hautapena"
 
-#: app/dialogs/dialogs.c:179
+#: ../app/dialogs/dialogs.c:179
 msgid "Selection Editor"
 msgstr "Hautapenaren editorea"
 
-#: app/dialogs/dialogs.c:183
+#: ../app/dialogs/dialogs.c:183
 msgid "Undo History"
 msgstr "Desegin historia"
 
-#: app/dialogs/dialogs.c:189
+#: ../app/dialogs/dialogs.c:189
 msgid "Navigation"
 msgstr "Nabigazioa"
 
-#: app/dialogs/dialogs.c:189
+#: ../app/dialogs/dialogs.c:189
 msgid "Display Navigation"
 msgstr "Bistaratu nabigazioa"
 
-#: app/dialogs/dialogs.c:195
+#: ../app/dialogs/dialogs.c:195
 msgid "FG/BG"
 msgstr "AurPl/AtzPl"
 
-#: app/dialogs/dialogs.c:195
+#: ../app/dialogs/dialogs.c:195
 msgid "FG/BG Color"
 msgstr "AurPl-ren/AtzPl-ren kolorea"
 
-#: app/dialogs/dialogs.c:201
+#: ../app/dialogs/dialogs.c:201
 msgid "Brush Editor"
 msgstr "Brotxa-editorea"
 
-#: app/dialogs/file-open-location-dialog.c:71
-#, fuzzy
+#: ../app/dialogs/file-open-location-dialog.c:71
 msgid "Open Location"
-msgstr "Kokalekua:"
+msgstr "Ireki kokalekua"
 
-#: app/dialogs/file-open-location-dialog.c:104
-#, fuzzy
+#: ../app/dialogs/file-open-location-dialog.c:104
 msgid "Enter location (URI):"
-msgstr "Interpolazioa:"
+msgstr "Sartu helbidea (URIa):"
 
-#: app/dialogs/file-save-dialog.c:184
-#, fuzzy
+#: ../app/dialogs/file-save-dialog.c:185
 msgid "File exists"
-msgstr "Fitxategia badago!"
+msgstr "Fitxategia badago"
 
-#: app/dialogs/file-save-dialog.c:189
-#, fuzzy
+#: ../app/dialogs/file-save-dialog.c:190
 msgid "_Replace"
-msgstr "Egin erreplika"
+msgstr "_Ordeztu"
 
-#: app/dialogs/file-save-dialog.c:199
+#: ../app/dialogs/file-save-dialog.c:200
 #, c-format
 msgid "A file named '%s' already exists."
-msgstr ""
+msgstr "'%s' izeneko fitxategia jadanik existitzen da."
 
-#: app/dialogs/file-save-dialog.c:204
+#: ../app/dialogs/file-save-dialog.c:205
 msgid "Do you want to replace it with the image you are saving?"
-msgstr ""
+msgstr "Gordetzen ari zaren irudiarekin ordeztea nahi duzu?"
 
-#: app/dialogs/grid-dialog.c:81
+#: ../app/dialogs/grid-dialog.c:81
 msgid "Configure Grid"
 msgstr "Konfiguratu sareta"
 
-#: app/dialogs/grid-dialog.c:82
+#: ../app/dialogs/grid-dialog.c:82
 msgid "Configure Image Grid"
 msgstr "Konfiguratu irudiaren sareta"
 
-#: app/dialogs/image-merge-layers-dialog.c:60
+#: ../app/dialogs/image-merge-layers-dialog.c:60
 msgid "Merge Layers"
 msgstr "Batu geruzak"
 
-#: app/dialogs/image-merge-layers-dialog.c:62
+#: ../app/dialogs/image-merge-layers-dialog.c:62
 msgid "Layers Merge Options"
 msgstr "Geruzak batzeko aukerak"
 
-#: app/dialogs/image-merge-layers-dialog.c:77
+#: ../app/dialogs/image-merge-layers-dialog.c:77
 msgid "Final, Merged Layer should be:"
 msgstr "Batutako azken geruzak hau izan behar du:"
 
-#: app/dialogs/image-merge-layers-dialog.c:81
+#: ../app/dialogs/image-merge-layers-dialog.c:81
 msgid "Expanded as necessary"
 msgstr "Behar adina zabalduta"
 
-#: app/dialogs/image-merge-layers-dialog.c:84
+#: ../app/dialogs/image-merge-layers-dialog.c:84
 msgid "Clipped to image"
 msgstr "Irudiaren arabera moztuta"
 
-#: app/dialogs/image-merge-layers-dialog.c:87
+#: ../app/dialogs/image-merge-layers-dialog.c:87
 msgid "Clipped to bottom layer"
 msgstr "Beheko geruzaren arabera moztuta"
 
-#: app/dialogs/image-new-dialog.c:95
+#: ../app/dialogs/image-new-dialog.c:95
 msgid "Create a New Image"
 msgstr "Sortu irudi berria"
 
-#: app/dialogs/image-new-dialog.c:130 app/dialogs/preferences-dialog.c:1313
-#, fuzzy
+#: ../app/dialogs/image-new-dialog.c:130
+#: ../app/dialogs/preferences-dialog.c:1313
 msgid "_Template:"
-msgstr "Txantiloiak"
+msgstr "_Txantiloia:"
 
-#: app/dialogs/image-new-dialog.c:265
+#: ../app/dialogs/image-new-dialog.c:265
 msgid "Confirm Image Size"
 msgstr "Berretsi irudi-tamaina"
 
-#: app/dialogs/image-new-dialog.c:282 app/dialogs/image-scale-dialog.c:193
+#: ../app/dialogs/image-new-dialog.c:282
+#: ../app/dialogs/image-scale-dialog.c:193
 #, c-format
 msgid "You are trying to create an image with a size of %s."
-msgstr ""
+msgstr "%s tamainako irudia sortzen saiatzen ari zara."
 
-#: app/dialogs/image-new-dialog.c:289
+#: ../app/dialogs/image-new-dialog.c:289
 #, c-format
 msgid ""
 "An image of the choosen size will use more memory than what is configured as "
 "\"Maximum Image Size\" in the Preferences dialog (currently %s)."
 msgstr ""
+"Aukeratutako tamainako irudiak Hobespenak menuko \"Gehienezko irudi-tamaina"
+"\" arloan konfiguratutako memoria kopurua baino gehiago erabiliko du (unekoa "
+"%s)."
 
-#: app/dialogs/image-scale-dialog.c:164
-#, fuzzy
+#: ../app/dialogs/image-scale-dialog.c:164
 msgid "Confirm Scaling"
-msgstr "Kolore-maparen zikloa"
+msgstr "Berretsi eskalatzea"
 
-#: app/dialogs/image-scale-dialog.c:199
+#: ../app/dialogs/image-scale-dialog.c:199
 #, c-format
 msgid ""
 "Scaling the image to the choosen size will make it use more memory than what "
 "is configured as \"Maximum Image Size\" in the Preferences dialog (currently "
 "%s)."
 msgstr ""
+"Irudia aukeratu den tamainara eskalatzean 'Hobespenak' elkarrizketako "
+"\"Gehienezko irudi-tamaina\" eremuan konfiguratutako memoria kopurua baino "
+"gehiago erabiliko du (unekoa %s)"
 
-#: app/dialogs/image-scale-dialog.c:214
-#, fuzzy
+#: ../app/dialogs/image-scale-dialog.c:214
 msgid ""
 "Scaling the image to the choosen size will shrink some layers completely "
 "away."
-msgstr ""
-"Aukeratutako irudi-tamainarekin geruza batzuk desagertu egingo dira. Hori "
-"nahi duzu?"
+msgstr "Irudia aukeratutako tamainara eskalatzean geruza batzuk desagertuko dira."
 
-#: app/dialogs/image-scale-dialog.c:218
+#: ../app/dialogs/image-scale-dialog.c:218
 msgid "Is this what you want to do?"
-msgstr ""
+msgstr "Hau egitea nahi duzu?"
 
 #. General
-#: app/dialogs/info-dialog.c:377 app/dialogs/preferences-dialog.c:1543
-#: app/dialogs/preferences-dialog.c:1697
-#: app/widgets/gimpcontrollereditor.c:197
+#: ../app/dialogs/info-dialog.c:377 ../app/dialogs/preferences-dialog.c:1543
+#: ../app/dialogs/preferences-dialog.c:1697
+#: ../app/widgets/gimpcontrollereditor.c:197
 msgid "General"
 msgstr "Orokorra"
 
-#: app/dialogs/info-window.c:83
+#: ../app/dialogs/info-window.c:83
 msgid "Static Gray"
 msgstr "Gris estatikoa"
 
-#: app/dialogs/info-window.c:84 app/dialogs/info-window.c:610
+#: ../app/dialogs/info-window.c:84 ../app/dialogs/info-window.c:610
 msgid "Grayscale"
 msgstr "Gris-eskala"
 
-#: app/dialogs/info-window.c:85
+#: ../app/dialogs/info-window.c:85
 msgid "Static Color"
 msgstr "Kolore estatikoa"
 
-#: app/dialogs/info-window.c:86
+#: ../app/dialogs/info-window.c:86
 msgid "Pseudo Color"
 msgstr "Sasikolorea"
 
-#: app/dialogs/info-window.c:87
+#: ../app/dialogs/info-window.c:87
 msgid "True Color"
 msgstr "Benetako kolorea"
 
-#: app/dialogs/info-window.c:88
+#: ../app/dialogs/info-window.c:88
 msgid "Direct Color"
 msgstr "Kolore zuzena"
 
-#: app/dialogs/info-window.c:131
-#, fuzzy
+#: ../app/dialogs/info-window.c:131
 msgid "Cursor"
-msgstr "Kurbak"
+msgstr "Kurtsorea"
 
-#: app/dialogs/info-window.c:141 app/dialogs/preferences-dialog.c:1932
-#: app/widgets/gimpgrideditor.c:267 app/widgets/gimpgrideditor.c:299
+#: ../app/dialogs/info-window.c:141 ../app/dialogs/preferences-dialog.c:1932
+#: ../app/widgets/gimpgrideditor.c:267 ../app/widgets/gimpgrideditor.c:299
 msgid "Pixels"
 msgstr "Pixelak"
 
-#: app/dialogs/info-window.c:151 app/dialogs/info-window.c:157
-#: app/dialogs/info-window.c:173 app/dialogs/info-window.c:179
-#: app/dialogs/info-window.c:425 app/dialogs/info-window.c:426
-#: app/dialogs/info-window.c:427 app/dialogs/info-window.c:428
-#: app/widgets/gimpcolorframe.c:338
+#: ../app/dialogs/info-window.c:151 ../app/dialogs/info-window.c:157
+#: ../app/dialogs/info-window.c:173 ../app/dialogs/info-window.c:179
+#: ../app/dialogs/info-window.c:425 ../app/dialogs/info-window.c:426
+#: ../app/dialogs/info-window.c:427 ../app/dialogs/info-window.c:428
+#: ../app/widgets/gimpcolorframe.c:338
 msgid "n/a"
-msgstr ""
+msgstr "e/e"
 
-#: app/dialogs/info-window.c:154 app/dialogs/info-window.c:176
-#, fuzzy
+#: ../app/dialogs/info-window.c:154 ../app/dialogs/info-window.c:176
 msgid "X"
-msgstr "X:"
+msgstr "X"
 
-#: app/dialogs/info-window.c:160 app/dialogs/info-window.c:182
-#, fuzzy
+#: ../app/dialogs/info-window.c:160 ../app/dialogs/info-window.c:182
 msgid "Y"
-msgstr "_H"
+msgstr "Y"
 
-#: app/dialogs/info-window.c:163 app/pdb/internal_procs.c:212
+#: ../app/dialogs/info-window.c:163 ../app/pdb/internal_procs.c:212
 msgid "Units"
 msgstr "Unitateak"
 
-#: app/dialogs/info-window.c:228
-#, fuzzy
+#: ../app/dialogs/info-window.c:228
 msgid "Comment"
-msgstr "Zenbat:"
+msgstr "Iruzkina"
 
-#: app/dialogs/info-window.c:248 app/dialogs/info-window.c:634
-#: app/display/gimpdisplayshell-title.c:337
-#: app/display/gimpdisplayshell-title.c:349 app/widgets/gimpactiongroup.c:806
+#: ../app/dialogs/info-window.c:248 ../app/dialogs/info-window.c:634
+#: ../app/display/gimpdisplayshell-title.c:337
+#: ../app/display/gimpdisplayshell-title.c:349
+#: ../app/widgets/gimpactiongroup.c:806
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: app/dialogs/info-window.c:275
+#: ../app/dialogs/info-window.c:275
 msgid "Info Window"
 msgstr "Informazio-leihoa"
 
-#: app/dialogs/info-window.c:277
+#: ../app/dialogs/info-window.c:277
 msgid "Image Information"
 msgstr "Irudiaren informazioa"
 
 #. add the information fields
-#: app/dialogs/info-window.c:294
-#, fuzzy
+#: ../app/dialogs/info-window.c:294
 msgid "Pixel dimensions:"
-msgstr "Neurriak pixeletan:"
+msgstr "Pixel-dimentsioak:"
 
-#: app/dialogs/info-window.c:296
-#, fuzzy
+#: ../app/dialogs/info-window.c:296
 msgid "Print size:"
 msgstr "Inprimatze-tamaina:"
 
-#: app/dialogs/info-window.c:298
+#: ../app/dialogs/info-window.c:298
 msgid "Resolution:"
 msgstr "Bereizmena:"
 
-#: app/dialogs/info-window.c:300
-#, fuzzy
+#: ../app/dialogs/info-window.c:300
 msgid "Scale ratio:"
-msgstr "Eskalatze-erlazioa:"
+msgstr "Eskala-erlazioa:"
 
-#: app/dialogs/info-window.c:302
-#, fuzzy
+#: ../app/dialogs/info-window.c:302
 msgid "Number of layers:"
 msgstr "Geruza-kopurua:"
 
-#: app/dialogs/info-window.c:304
-#, fuzzy
+#: ../app/dialogs/info-window.c:304
 msgid "Size in memory:"
 msgstr "Memoria-tamaina:"
 
-#: app/dialogs/info-window.c:306
-#, fuzzy
+#: ../app/dialogs/info-window.c:306
 msgid "Display type:"
 msgstr "Bistaratze-mota:"
 
-#: app/dialogs/info-window.c:308
-#, fuzzy
+#: ../app/dialogs/info-window.c:308
 msgid "Visual class:"
-msgstr "Bisual-mota:"
+msgstr "Ikus-klasea:"
 
-#: app/dialogs/info-window.c:310
-#, fuzzy
+#: ../app/dialogs/info-window.c:310
 msgid "Visual depth:"
-msgstr "Bisual-sakonera:"
+msgstr "Ikus-sakonera:"
 
-#: app/dialogs/info-window.c:575
+#: ../app/dialogs/info-window.c:575
 #, c-format
 msgid "pixels/%s"
 msgstr "pixel/%s"
 
-#: app/dialogs/info-window.c:577
+#: ../app/dialogs/info-window.c:577
 #, c-format
 msgid "%g x %g %s"
 msgstr "%g x %g %s"
 
-#: app/dialogs/info-window.c:580 app/dialogs/preferences-dialog.c:1954
+#: ../app/dialogs/info-window.c:580 ../app/dialogs/preferences-dialog.c:1954
 msgid "dpi"
 msgstr "dpi"
 
-#: app/dialogs/info-window.c:607
+#: ../app/dialogs/info-window.c:607
 msgid "RGB Color"
-msgstr "RGB kolorea"
+msgstr "GBU kolorea"
 
-#: app/dialogs/info-window.c:614
+#: ../app/dialogs/info-window.c:614
 msgid "Indexed Color"
 msgstr "Kolore indexatua"
 
-#: app/dialogs/info-window.c:614
+#: ../app/dialogs/info-window.c:614
 msgid "colors"
 msgstr "koloreak"
 
-#: app/dialogs/layer-add-mask-dialog.c:64
+#: ../app/dialogs/layer-add-mask-dialog.c:64
 msgid "Add a Mask to the Layer"
 msgstr "Gehitu maskara geruzari"
 
-#: app/dialogs/layer-add-mask-dialog.c:86
+#: ../app/dialogs/layer-add-mask-dialog.c:86
 msgid "Initialize Layer Mask to:"
 msgstr "Abiarazi geruza-maskara hemen:"
 
-#: app/dialogs/layer-add-mask-dialog.c:96
+#: ../app/dialogs/layer-add-mask-dialog.c:96
 msgid "In_vert Mask"
 msgstr "Al_derantzikatu maskara"
 
-#: app/dialogs/layer-options-dialog.c:116
+#: ../app/dialogs/layer-options-dialog.c:116
 msgid "Layer _Name:"
 msgstr "Geruzaren i_zena:"
 
 #. The size labels
-#: app/dialogs/layer-options-dialog.c:127 app/tools/gimpcroptool.c:1046
-#: app/tools/gimpselectionoptions.c:529
+#: ../app/dialogs/layer-options-dialog.c:127 ../app/tools/gimpcroptool.c:1046
+#: ../app/tools/gimpselectionoptions.c:529
 msgid "Width:"
 msgstr "Zabalera:"
 
-#: app/dialogs/layer-options-dialog.c:133 app/tools/gimpcroptool.c:1050
-#: app/tools/gimpscaletool.c:166 app/tools/gimpselectionoptions.c:537
+#: ../app/dialogs/layer-options-dialog.c:133 ../app/tools/gimpcroptool.c:1050
+#: ../app/tools/gimpscaletool.c:166 ../app/tools/gimpselectionoptions.c:537
 msgid "Height:"
 msgstr "Altuera:"
 
-#: app/dialogs/layer-options-dialog.c:190
+#: ../app/dialogs/layer-options-dialog.c:190
 msgid "Layer Fill Type"
 msgstr "Geruzaren betegarri-mota"
 
-#: app/dialogs/layer-options-dialog.c:205
+#: ../app/dialogs/layer-options-dialog.c:205
 msgid "Set Name from _Text"
 msgstr "Ezarri izena _testutik"
 
-#: app/dialogs/module-dialog.c:122
+#: ../app/dialogs/module-dialog.c:122
 msgid "Module Manager"
 msgstr "Modulu-kudeatzailea"
 
-#: app/dialogs/module-dialog.c:124
+#: ../app/dialogs/module-dialog.c:124
 msgid "Manage Loadable Modules"
 msgstr "Kudeatu modulu kargagarriak"
 
-#: app/dialogs/module-dialog.c:168
+#: ../app/dialogs/module-dialog.c:168
 msgid "Autoload"
 msgstr "Kargatu automatikoki"
 
-#: app/dialogs/module-dialog.c:175
-#, fuzzy
+#: ../app/dialogs/module-dialog.c:175
 msgid "Module path"
 msgstr "Moduluaren bide-izena"
 
-#: app/dialogs/module-dialog.c:418
+#: ../app/dialogs/module-dialog.c:418
 msgid ""
 msgstr ""
 
-#: app/dialogs/module-dialog.c:430 app/dialogs/module-dialog.c:439
+#: ../app/dialogs/module-dialog.c:430 ../app/dialogs/module-dialog.c:439
 msgid "On disk"
 msgstr "Diskoan"
 
-#: app/dialogs/module-dialog.c:430
+#: ../app/dialogs/module-dialog.c:430
 msgid "Only in memory"
 msgstr "Memorian bakarrik"
 
-#: app/dialogs/module-dialog.c:439
+#: ../app/dialogs/module-dialog.c:439
 msgid "No longer available"
 msgstr "Ez dago erabilgarri"
 
-#: app/dialogs/module-dialog.c:475
+#: ../app/dialogs/module-dialog.c:475
 msgid "Load"
 msgstr "Kargatu"
 
-#: app/dialogs/module-dialog.c:477
+#: ../app/dialogs/module-dialog.c:477
 msgid "Query"
 msgstr "Kontsulta"
 
-#: app/dialogs/module-dialog.c:484
+#: ../app/dialogs/module-dialog.c:484
 msgid "Unload"
 msgstr "Deskargatu"
 
-#: app/dialogs/module-dialog.c:499
+#: ../app/dialogs/module-dialog.c:499
 msgid "Purpose:"
 msgstr "Xedea:"
 
-#: app/dialogs/module-dialog.c:500
+#: ../app/dialogs/module-dialog.c:500
 msgid "Author:"
 msgstr "Egilea:"
 
-#: app/dialogs/module-dialog.c:501
+#: ../app/dialogs/module-dialog.c:501
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: app/dialogs/module-dialog.c:502
+#: ../app/dialogs/module-dialog.c:502
 msgid "Copyright:"
 msgstr "Copyright-a:"
 
-#: app/dialogs/module-dialog.c:503
+#: ../app/dialogs/module-dialog.c:503
 msgid "Date:"
 msgstr "Data:"
 
-#: app/dialogs/module-dialog.c:504
+#: ../app/dialogs/module-dialog.c:504
 msgid "Location:"
 msgstr "Kokalekua:"
 
-#: app/dialogs/module-dialog.c:505 app/widgets/gimpcontrollereditor.c:242
+#: ../app/dialogs/module-dialog.c:505
+#: ../app/widgets/gimpcontrollereditor.c:242
 msgid "State:"
 msgstr "Herrialdea:"
 
-#: app/dialogs/module-dialog.c:506
+#: ../app/dialogs/module-dialog.c:506
 msgid "Last Error:"
 msgstr "Azken errorea:"
 
-#: app/dialogs/module-dialog.c:507
+#: ../app/dialogs/module-dialog.c:507
 msgid "Available Types:"
 msgstr "Mota erabilgarriak:"
 
-#: app/dialogs/offset-dialog.c:98
+#: ../app/dialogs/offset-dialog.c:98
 msgid "Offset Layer"
 msgstr "Desplazatu geruza"
 
-#: app/dialogs/offset-dialog.c:100
+#: ../app/dialogs/offset-dialog.c:100
 msgid "Offset Layer Mask"
 msgstr "Desplazatu geruza-maskara"
 
-#: app/dialogs/offset-dialog.c:102
+#: ../app/dialogs/offset-dialog.c:102
 msgid "Offset Channel"
 msgstr "Desplazatu kanala"
 
 #. The offset frame
-#: app/dialogs/offset-dialog.c:108 app/dialogs/offset-dialog.c:136
-#: app/dialogs/resize-dialog.c:185 app/widgets/gimpgrideditor.c:274
+#: ../app/dialogs/offset-dialog.c:108 ../app/dialogs/offset-dialog.c:136
+#: ../app/dialogs/resize-dialog.c:185 ../app/widgets/gimpgrideditor.c:274
 msgid "Offset"
 msgstr "Desplazatu"
 
-#: app/dialogs/offset-dialog.c:168 app/dialogs/resize-dialog.c:214
+#: ../app/dialogs/offset-dialog.c:168 ../app/dialogs/resize-dialog.c:214
 msgid "_X:"
 msgstr "_X:"
 
-#: app/dialogs/offset-dialog.c:170 app/dialogs/resize-dialog.c:215
+#: ../app/dialogs/offset-dialog.c:170 ../app/dialogs/resize-dialog.c:215
 msgid "_Y:"
 msgstr "_Y:"
 
-#: app/dialogs/offset-dialog.c:197
-#, fuzzy
+#: ../app/dialogs/offset-dialog.c:197
 msgid "Offset by  x/_2, y/2"
-msgstr "Desplazatu (x/_2),(y/2)"
+msgstr "Desplazatu x/_2,y/2"
 
 #. The edge behaviour frame
-#: app/dialogs/offset-dialog.c:206
-#, fuzzy
+#: ../app/dialogs/offset-dialog.c:206
 msgid "Edge Behaviour"
-msgstr "Elkarrizketa-koadroaren portaera"
+msgstr "Ertzaren portaera"
 
-#: app/dialogs/offset-dialog.c:210
-#, fuzzy
+#: ../app/dialogs/offset-dialog.c:210
 msgid "_Wrap around"
-msgstr "_Atzeko planoa:"
+msgstr "_Itzulbiratu"
 
-#: app/dialogs/offset-dialog.c:213
-#, fuzzy
+#: ../app/dialogs/offset-dialog.c:213
 msgid "Fill with _background color"
-msgstr "Editatu atzeko planoaren kolorea"
+msgstr "Bete a_tzeko planoaren kolorearekin"
 
-#: app/dialogs/offset-dialog.c:216
-#, fuzzy
+#: ../app/dialogs/offset-dialog.c:216
 msgid "Make _transparent"
-msgstr "_Gardena"
+msgstr "Egin _garden"
 
-#: app/dialogs/palette-import-dialog.c:171
+#: ../app/dialogs/palette-import-dialog.c:171
 msgid "Import Palette"
 msgstr "Inportatu paleta"
 
-#: app/dialogs/palette-import-dialog.c:173
+#: ../app/dialogs/palette-import-dialog.c:173
 msgid "Import a New Palette"
 msgstr "Inportatu paleta berria"
 
-#: app/dialogs/palette-import-dialog.c:179
+#: ../app/dialogs/palette-import-dialog.c:179
 msgid "_Import"
 msgstr "_Inportatu"
 
 #. The "Source" frame
-#: app/dialogs/palette-import-dialog.c:208
+#: ../app/dialogs/palette-import-dialog.c:208
 msgid "Select Source"
 msgstr "Hautatu iturburua"
 
-#: app/dialogs/palette-import-dialog.c:231
+#: ../app/dialogs/palette-import-dialog.c:231
 msgid "I_mage"
 msgstr "I_rudia"
 
-#: app/dialogs/palette-import-dialog.c:246
-#, fuzzy
+#: ../app/dialogs/palette-import-dialog.c:246
 msgid "Palette _file"
-msgstr "Paleta-karpetak"
+msgstr "Paleta-fitxategia"
 
-#: app/dialogs/palette-import-dialog.c:273
-#, fuzzy
+#: ../app/dialogs/palette-import-dialog.c:273
 msgid "Select palette file"
-msgstr "Hautatu paleta-karpetak"
+msgstr "Hautatu paleta-fitxategia"
 
 #. The "Import" frame
-#: app/dialogs/palette-import-dialog.c:304
+#: ../app/dialogs/palette-import-dialog.c:304
 msgid "Import Options"
 msgstr "Inportatu aukerak"
 
-#: app/dialogs/palette-import-dialog.c:317
-#, fuzzy
+#: ../app/dialogs/palette-import-dialog.c:317
 msgid "New import"
 msgstr "Inportazio berria"
 
-#: app/dialogs/palette-import-dialog.c:319
+#: ../app/dialogs/palette-import-dialog.c:319
 msgid "Palette _Name:"
 msgstr "Pale_taren izena:"
 
-#: app/dialogs/palette-import-dialog.c:325
-#, fuzzy
+#: ../app/dialogs/palette-import-dialog.c:325
 msgid "N_umber of colors:"
 msgstr "_Kolore-kopurua:"
 
-#: app/dialogs/palette-import-dialog.c:338
+#: ../app/dialogs/palette-import-dialog.c:338
 msgid "C_olumns:"
 msgstr "_Zutabeak:"
 
-#: app/dialogs/palette-import-dialog.c:350
+#: ../app/dialogs/palette-import-dialog.c:350
 msgid "I_nterval:"
 msgstr "Bita_rtea:"
 
 #. The "Preview" frame
-#: app/dialogs/palette-import-dialog.c:362
+#: ../app/dialogs/palette-import-dialog.c:362
 msgid "Preview"
 msgstr "Aurrebista"
 
-#: app/dialogs/preferences-dialog.c:294
+#: ../app/dialogs/preferences-dialog.c:294
 msgid "You will have to restart GIMP for the following changes to take effect:"
-msgstr "GIMP berrabiarazi beharko duzu aldaketok eragina izan dezaten:"
+msgstr "GIMP berrabiarazi beharko duzu aldaketak eragina izan dezaten:"
 
-#: app/dialogs/preferences-dialog.c:501
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:501
 msgid "Configure Keyboard Shortcuts"
-msgstr "Laster-teklak"
+msgstr "Konfiguratu laster-teklak"
 
-#: app/dialogs/preferences-dialog.c:551
+#: ../app/dialogs/preferences-dialog.c:551
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
 msgstr ""
+"Laster-tekla editatzeko egin klik dagokion errenkadan eta sakatu "
+"azeleratzaile berria, edo sakatu zuriune tekla garbitzeko."
 
-#: app/dialogs/preferences-dialog.c:595
+#: ../app/dialogs/preferences-dialog.c:595
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 msgstr ""
+"Laster-teklak balio lehenetsiekin berrasieratuko dira hurrengo batean GIMP "
+"abiaraztean."
 
-#: app/dialogs/preferences-dialog.c:629
+#: ../app/dialogs/preferences-dialog.c:629
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr ""
+"Leiho-konfigurazioa balio lehenetsiekin berrasieratuko da hurrengo batean "
+"GIMP abiaraztean."
 
-#: app/dialogs/preferences-dialog.c:663
+#: ../app/dialogs/preferences-dialog.c:663
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr ""
+"Sarrerako gailuaren konfigurazioa balio lehenetsiekin berrasieratuko da "
+"hurrengo batean GIMP abiaraztean."
 
-#: app/dialogs/preferences-dialog.c:1082
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1082
 msgid "Show _menubar"
 msgstr "Erakutsi _menu-barra"
 
-#: app/dialogs/preferences-dialog.c:1085
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1085
 msgid "Show _rulers"
 msgstr "Erakutsi _erregelak"
 
-#: app/dialogs/preferences-dialog.c:1088
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1088
 msgid "Show scroll_bars"
 msgstr "Erakutsi _korritze-barrak"
 
-#: app/dialogs/preferences-dialog.c:1091
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1091
 msgid "Show s_tatusbar"
 msgstr "Erakutsi egoera-_barra"
 
-#: app/dialogs/preferences-dialog.c:1099
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1099
 msgid "Show s_election"
 msgstr "Erakutsi _hautapena"
 
-#: app/dialogs/preferences-dialog.c:1102
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1102
 msgid "Show _layer boundary"
 msgstr "Erakutsi _geruzaren muga"
 
-#: app/dialogs/preferences-dialog.c:1105
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1105
 msgid "Show _guides"
 msgstr "Erakutsi _gidak"
 
-#: app/dialogs/preferences-dialog.c:1108
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1108
 msgid "Show gri_d"
 msgstr "Erakutsi _sareta"
 
-#: app/dialogs/preferences-dialog.c:1114
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1114
 msgid "Canvas _padding mode:"
-msgstr "Oihalaren betegarri-modua:"
+msgstr "Oihalaren _betegarri-modua:"
 
-#: app/dialogs/preferences-dialog.c:1119
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1119
 msgid "Custom p_adding color:"
-msgstr "Betegarriaren kolore pertsonalizatua:"
+msgstr "Betegarriaren kolore p_ertsonalizatua:"
 
-#: app/dialogs/preferences-dialog.c:1120
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1120
 msgid "Select custom canvas padding color"
 msgstr "Hautatu oihalaren betegarriaren kolore pertsonalizatua"
 
-#: app/dialogs/preferences-dialog.c:1191
+#: ../app/dialogs/preferences-dialog.c:1191
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: app/dialogs/preferences-dialog.c:1294 app/dialogs/preferences-dialog.c:1297
+#: ../app/dialogs/preferences-dialog.c:1294
+#: ../app/dialogs/preferences-dialog.c:1297
 msgid "New Image"
 msgstr "Irudi berria"
 
-#: app/dialogs/preferences-dialog.c:1335
+#: ../app/dialogs/preferences-dialog.c:1335
 msgid "Default Image Grid"
 msgstr "Irudi-sareta lehenetsia"
 
-#: app/dialogs/preferences-dialog.c:1338
+#: ../app/dialogs/preferences-dialog.c:1338
 msgid "Default Grid"
 msgstr "Sareta lehentesia"
 
-#: app/dialogs/preferences-dialog.c:1358
+#: ../app/dialogs/preferences-dialog.c:1358
 msgid "User Interface"
 msgstr "Interfazea"
 
-#: app/dialogs/preferences-dialog.c:1361
+#: ../app/dialogs/preferences-dialog.c:1361
 msgid "Interface"
 msgstr "Interfazea"
 
 #. Previews
-#: app/dialogs/preferences-dialog.c:1368
+#: ../app/dialogs/preferences-dialog.c:1368
 msgid "Previews"
 msgstr "Aurrebistak"
 
-#: app/dialogs/preferences-dialog.c:1371
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1371
 msgid "_Enable layer & channel previews"
 msgstr "_Gaitu geruzen eta kanalen aurrebistak"
 
-#: app/dialogs/preferences-dialog.c:1377
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1377
 msgid "Default _layer & channel preview size:"
 msgstr "Lehenespeneko geruzen eta _kanalen aurrebistaren tamaina:"
 
-#: app/dialogs/preferences-dialog.c:1380
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1380
 msgid "Na_vigation preview size:"
-msgstr "_Nabigazioko aurrebisten tamaina:"
+msgstr "Na_bigazioko aurrebisten tamaina:"
 
 #. Keyboard Shortcuts
-#: app/dialogs/preferences-dialog.c:1384
+#: ../app/dialogs/preferences-dialog.c:1384
 msgid "Keyboard Shortcuts"
 msgstr "Laster-teklak"
 
-#: app/dialogs/preferences-dialog.c:1388
+#: ../app/dialogs/preferences-dialog.c:1388
 msgid "Show menu _mnemonics (access keys)"
-msgstr ""
+msgstr "Erakutsi _menu-mnemoteknikoak (sarbide-teklak)"
 
-#: app/dialogs/preferences-dialog.c:1391
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1391
 msgid "Use _dynamic keyboard shortcuts"
 msgstr "Erabili laster-tekla _dinamikoak"
 
-#: app/dialogs/preferences-dialog.c:1395
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1395
 msgid "Configure _Keyboard Shortcuts..."
-msgstr "Laster-teklak"
+msgstr "Konfiguratu laster-teklak..."
 
-#: app/dialogs/preferences-dialog.c:1402
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1402
 msgid "_Save keyboard shortcuts on exit"
-msgstr "Gorde laster-teklak irtetean"
+msgstr "_Gorde laster-teklak irtetean"
 
-#: app/dialogs/preferences-dialog.c:1406
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1406
 msgid "Save Keyboard Shortcuts _Now"
-msgstr "Gorde orain laster-teklak "
+msgstr "Gorde _orain laster-teklak"
 
-#: app/dialogs/preferences-dialog.c:1413
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1413
 msgid "_Reset Saved Keyboard Shortcuts to Default Values"
-msgstr "Leheneratu gordetako laster-teklak abiaraztean"
+msgstr "_Berrezarri gordetako laster-teklak balio lehenetsietan"
 
-#: app/dialogs/preferences-dialog.c:1428 app/dialogs/preferences-dialog.c:1431
-#: app/dialogs/preferences-dialog.c:1467
+#: ../app/dialogs/preferences-dialog.c:1428
+#: ../app/dialogs/preferences-dialog.c:1431
+#: ../app/dialogs/preferences-dialog.c:1467
 msgid "Theme"
 msgstr "Gaia"
 
-#: app/dialogs/preferences-dialog.c:1437
+#: ../app/dialogs/preferences-dialog.c:1437
 msgid "Select Theme"
 msgstr "Hautatu gaia"
 
-#: app/dialogs/preferences-dialog.c:1519
+#: ../app/dialogs/preferences-dialog.c:1519
 msgid "Reload C_urrent Theme"
-msgstr ""
+msgstr "Kargatu _uneko gaia berriro"
 
-#: app/dialogs/preferences-dialog.c:1531 app/dialogs/preferences-dialog.c:1534
+#: ../app/dialogs/preferences-dialog.c:1531
+#: ../app/dialogs/preferences-dialog.c:1534
 msgid "Help System"
 msgstr "Laguntza-sistema"
 
-#: app/dialogs/preferences-dialog.c:1546
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1546
 msgid "Show tool _tips"
 msgstr "Erakutsi aho_lkuak"
 
-#: app/dialogs/preferences-dialog.c:1549
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1549
 msgid "Show help _buttons"
-msgstr "Erakutsi _hautapena"
+msgstr "Erakutsi laguntza-_botoiak"
 
-#: app/dialogs/preferences-dialog.c:1552
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1552
 msgid "Show tips on _startup"
-msgstr "_Erakutsi aholkuak abiaraztean"
+msgstr "Erakutsi aholkuak _abiaraztean"
 
 #. Help Browser
-#: app/dialogs/preferences-dialog.c:1556
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Help Browser"
 msgstr "Laguntza-arakatzailea"
 
-#: app/dialogs/preferences-dialog.c:1560
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1560
 msgid "H_elp browser to use:"
 msgstr "Erabili beharreko _laguntza-arakatzailea:"
 
-#: app/dialogs/preferences-dialog.c:1565
+#: ../app/dialogs/preferences-dialog.c:1565
 msgid "Web Browser"
 msgstr "Web arakatzailea"
 
-#: app/dialogs/preferences-dialog.c:1569
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1569
 msgid "Select web browser"
 msgstr "Hautatu web arakatzailea"
 
-#: app/dialogs/preferences-dialog.c:1572
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1572
 msgid "_Web browser to use:"
-msgstr "Erabili beharreko web arakatzailea:"
+msgstr "Erabili beharreko _web arakatzailea:"
 
 #. Snapping Distance
-#: app/dialogs/preferences-dialog.c:1597
+#: ../app/dialogs/preferences-dialog.c:1597
 msgid "Guide and Grid Snapping"
-msgstr ""
+msgstr "Gida eta sareta atxikitzea"
 
-#: app/dialogs/preferences-dialog.c:1602
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1602
 msgid "_Snap distance:"
-msgstr "_Egokitze-distantzia:"
+msgstr "_Atxikitze-distantzia:"
 
 #. Contiguous Regions
-#: app/dialogs/preferences-dialog.c:1606
+#: ../app/dialogs/preferences-dialog.c:1606
 msgid "Finding Contiguous Regions"
 msgstr "Ondoko eskualdeak bilatzen"
 
-#: app/dialogs/preferences-dialog.c:1611
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1611
 msgid "Default _threshold:"
 msgstr "_Muga lehenetsia:"
 
 #. Scaling
-#: app/dialogs/preferences-dialog.c:1615
+#: ../app/dialogs/preferences-dialog.c:1615
 msgid "Scaling"
 msgstr "Eskalatzen"
 
-#: app/dialogs/preferences-dialog.c:1619
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1619
 msgid "Default _interpolation:"
 msgstr "_Interpolazio lehenetsia:"
 
 #. Global Brush, Pattern, ...
-#: app/dialogs/preferences-dialog.c:1623
+#: ../app/dialogs/preferences-dialog.c:1623
 msgid "Paint Options Shared Between Tools"
-msgstr ""
+msgstr "Margotze-aukerak tresnen artean partekatua"
 
-#: app/dialogs/preferences-dialog.c:1636
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1636
 msgid "Move Tool"
-msgstr "Lekuz aldatu: "
+msgstr "Aldatu tresna lekuz"
 
-#: app/dialogs/preferences-dialog.c:1640
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1640
 msgid "Change current layer or path"
-msgstr "Uneko geruza bakarrik"
+msgstr "Aldatu uneko geruza edo bidea"
 
-#: app/dialogs/preferences-dialog.c:1653 app/dialogs/preferences-dialog.c:1656
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1653
+#: ../app/dialogs/preferences-dialog.c:1656
 msgid "Toolbox"
-msgstr "Tresnak"
+msgstr "Tresna-kutxa"
 
 #. Appearance
-#: app/dialogs/preferences-dialog.c:1663 app/dialogs/preferences-dialog.c:1760
-#: app/widgets/gimpgrideditor.c:206
+#: ../app/dialogs/preferences-dialog.c:1663
+#: ../app/dialogs/preferences-dialog.c:1760
+#: ../app/widgets/gimpgrideditor.c:206
 msgid "Appearance"
 msgstr "Itxura"
 
-#: app/dialogs/preferences-dialog.c:1667
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1667
 msgid "Show _foreground & background color"
-msgstr "Ezarri atzeko planoaren kolorea"
+msgstr "Erakutsi _aurreko eta atzeko planoaren kolorea"
 
-#: app/dialogs/preferences-dialog.c:1671
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1671
 msgid "Show active _brush, pattern & gradient"
-msgstr ""
-"/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/_Brotxak, ereduak eta "
-"gradienteak"
+msgstr "Erakutsi _brotxa, eredu eta gradiente aktiboa"
 
-#: app/dialogs/preferences-dialog.c:1675
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1675
 msgid "Show active _image"
-msgstr "/Jarraitu automatikoki _irudi aktiboari"
+msgstr "Erakutsi _irudi aktiboa"
 
-#: app/dialogs/preferences-dialog.c:1685 app/dialogs/preferences-dialog.c:1688
+#: ../app/dialogs/preferences-dialog.c:1685
+#: ../app/dialogs/preferences-dialog.c:1688
 msgid "Image Windows"
 msgstr "Irudi-leihoak"
 
-#: app/dialogs/preferences-dialog.c:1700
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1700
 msgid "Use \"_Dot for dot\" by default"
 msgstr "Erabili \"_Puntuz puntu\" lehenespenez"
 
-#: app/dialogs/preferences-dialog.c:1706
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1706
 msgid "Marching _ants speed:"
 msgstr "Inurrien _abiadura:"
 
 #. Zoom & Resize Behavior
-#: app/dialogs/preferences-dialog.c:1710
+#: ../app/dialogs/preferences-dialog.c:1710
 msgid "Zoom & Resize Behavior"
 msgstr "Zoomaren eta tamaina-aldaketen portaera"
 
-#: app/dialogs/preferences-dialog.c:1714
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1714
 msgid "Resize window on _zoom"
 msgstr "Aldatu leihoaren _tamaina zoom egitean"
 
-#: app/dialogs/preferences-dialog.c:1717
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1717
 msgid "Resize window on image _size change"
 msgstr "Aldatu leihoaren tamaina _irudiaren tamaina aldatzean"
 
-#: app/dialogs/preferences-dialog.c:1723
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1723
 msgid "Fit to window"
 msgstr "Doitu leihora"
 
-#: app/dialogs/preferences-dialog.c:1725
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1725
 msgid "Initial zoom _ratio:"
-msgstr "Hasierako zoomaren erlazioa:"
+msgstr "Hasierako zoomaren _erlazioa:"
 
 #. Mouse Cursors
-#: app/dialogs/preferences-dialog.c:1729
+#: ../app/dialogs/preferences-dialog.c:1729
 msgid "Mouse Cursors"
-msgstr ""
+msgstr "Saguaren kurtsoreak"
 
-#: app/dialogs/preferences-dialog.c:1733
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1733
 msgid "Show _brush outline"
 msgstr "Erakutsi _brotxaren eskema"
 
-#: app/dialogs/preferences-dialog.c:1736
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1736
 msgid "Show paint _tool cursor"
-msgstr "Erakutsi aho_lkuak"
+msgstr "Erakutsi margotze-_tresnaren kurtsorea"
 
-#: app/dialogs/preferences-dialog.c:1742
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1742
 msgid "Cursor _mode:"
 msgstr "Kurtsore-mo_dua:"
 
-#: app/dialogs/preferences-dialog.c:1745
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1745
 msgid "Cursor re_ndering:"
-msgstr "Kurtsore-mo_dua:"
+msgstr "Kurtsore-errendatzea:"
 
-#: app/dialogs/preferences-dialog.c:1757
+#: ../app/dialogs/preferences-dialog.c:1757
 msgid "Image Window Appearance"
 msgstr "Irudiaren leihoaren itxura"
 
-#: app/dialogs/preferences-dialog.c:1768
+#: ../app/dialogs/preferences-dialog.c:1768
 msgid "Default Appearance in Normal Mode"
 msgstr "Itxura lehenetsia modu normalean"
 
-#: app/dialogs/preferences-dialog.c:1773
+#: ../app/dialogs/preferences-dialog.c:1773
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "Itxura lehenetsia pantaila osoaren moduan"
 
-#: app/dialogs/preferences-dialog.c:1782
+#: ../app/dialogs/preferences-dialog.c:1782
 msgid "Image Title & Statusbar Format"
 msgstr "Irudiaren izenburuaren eta egoera-barraren formatua"
 
-#: app/dialogs/preferences-dialog.c:1785
+#: ../app/dialogs/preferences-dialog.c:1785
 msgid "Title & Status"
 msgstr "Izenburua eta egoera"
 
-#: app/dialogs/preferences-dialog.c:1805
+#: ../app/dialogs/preferences-dialog.c:1805
 msgid "Standard"
 msgstr "Estandarra"
 
-#: app/dialogs/preferences-dialog.c:1806
+#: ../app/dialogs/preferences-dialog.c:1806
 msgid "Show zoom percentage"
 msgstr "Erakutsi zoomaren ehunekoa"
 
-#: app/dialogs/preferences-dialog.c:1807
+#: ../app/dialogs/preferences-dialog.c:1807
 msgid "Show zoom ratio"
 msgstr "Erakutsi zoomaren erlazioa"
 
-#: app/dialogs/preferences-dialog.c:1808
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1808
 msgid "Show image size"
-msgstr "/Erakutsi irudiaren _menua"
+msgstr "Erakutsi irudiaren tamaina"
 
-#: app/dialogs/preferences-dialog.c:1809
+#: ../app/dialogs/preferences-dialog.c:1809
 msgid "Show memory usage"
 msgstr "Erakutsi memoria-erabilera"
 
-#: app/dialogs/preferences-dialog.c:1820
+#: ../app/dialogs/preferences-dialog.c:1820
 msgid "Image Title Format"
 msgstr "Irudiaren izenburuaren formatua"
 
-#: app/dialogs/preferences-dialog.c:1821
+#: ../app/dialogs/preferences-dialog.c:1821
 msgid "Image Statusbar Format"
 msgstr "Irudiaren egoera-barraren formatua"
 
-#: app/dialogs/preferences-dialog.c:1906 app/dialogs/preferences-dialog.c:1909
+#: ../app/dialogs/preferences-dialog.c:1906
+#: ../app/dialogs/preferences-dialog.c:1909
 msgid "Display"
 msgstr "Bistaratu"
 
-#: app/dialogs/preferences-dialog.c:1922
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1922
 msgid "Transparency _type:"
 msgstr "Gardentasun-mo_ta:"
 
-#: app/dialogs/preferences-dialog.c:1925
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:1925
 msgid "Check _size:"
 msgstr "Egia_ztatu tamaina:"
 
-#: app/dialogs/preferences-dialog.c:1928
+#: ../app/dialogs/preferences-dialog.c:1928
 msgid "Get Monitor Resolution"
 msgstr "Eskuratu monitorearen bereizmena"
 
-#: app/dialogs/preferences-dialog.c:1970
-#, fuzzy, c-format
+#: ../app/dialogs/preferences-dialog.c:1970
+#, c-format
 msgid "From _windowing system (currently %d x %d dpi)"
-msgstr "Lortu bereizmena leiho-sistematik (Unean %d x %d dpi)"
+msgstr "_Leihoen sistematik (Unean %d x %d dpi)"
 
-#: app/dialogs/preferences-dialog.c:1993
+#: ../app/dialogs/preferences-dialog.c:1993
 msgid "_Manually"
 msgstr "_Eskuz"
 
-#: app/dialogs/preferences-dialog.c:2008
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2008
 msgid "C_alibrate..."
-msgstr "K_alibratu"
+msgstr "K_alibratu..."
 
-#: app/dialogs/preferences-dialog.c:2028 app/dialogs/preferences-dialog.c:2031
+#: ../app/dialogs/preferences-dialog.c:2028
+#: ../app/dialogs/preferences-dialog.c:2031
 msgid "Input Devices"
 msgstr "Sarrerako gailuak"
 
 #. Extended Input Devices
-#: app/dialogs/preferences-dialog.c:2038
+#: ../app/dialogs/preferences-dialog.c:2038
 msgid "Extended Input Devices"
 msgstr "Sarrerako gailu hedatuak"
 
-#: app/dialogs/preferences-dialog.c:2042
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2042
 msgid "Configure E_xtended Input Devices..."
-msgstr "Konfiguratu sarrerako gailu hedatuak"
+msgstr "Konfiguratu sarrerako gailu _hedatuak..."
 
-#: app/dialogs/preferences-dialog.c:2049
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2049
 msgid "_Save input device settings on exit"
-msgstr "Gorde sarrerako gailuen ezarpenak irtetean"
+msgstr "_Gorde sarrerako gailuen ezarpenak irtetzean"
 
-#: app/dialogs/preferences-dialog.c:2053
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2053
 msgid "Save Input Device Settings _Now"
-msgstr "Gorde orain sarrerako gailuen ezarpenak"
+msgstr "Gorde _orain sarrerako gailuen ezarpenak"
 
-#: app/dialogs/preferences-dialog.c:2060
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2060
 msgid "_Reset Saved Input Device Settings to Default Values"
-msgstr "Garbitu orain gordetako sarrerako gailuen ezarpenak"
+msgstr "Berrezarri gordetako sarrerako gailuen ezarpenak balio lehenetsietan"
 
-#: app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2075
 msgid "Additional Input Controllers"
-msgstr ""
+msgstr "Sarrerako kontroladore gehigarriak"
 
-#: app/dialogs/preferences-dialog.c:2078
+#: ../app/dialogs/preferences-dialog.c:2078
 msgid "Input Controllers"
-msgstr ""
+msgstr "Sarrerako kontroladoreak"
 
-#: app/dialogs/preferences-dialog.c:2119 app/dialogs/preferences-dialog.c:2122
+#: ../app/dialogs/preferences-dialog.c:2119
+#: ../app/dialogs/preferences-dialog.c:2122
 msgid "Window Management"
-msgstr ""
+msgstr "Leiho-kudeaketa"
 
-#: app/dialogs/preferences-dialog.c:2128
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Window Manager Hints"
-msgstr "Leiho motaren aukerak"
+msgstr "Leiho-kudeatzailearen aholkuak"
 
-#: app/dialogs/preferences-dialog.c:2134
+#: ../app/dialogs/preferences-dialog.c:2134
 msgid "Hint for the _toolbox:"
-msgstr ""
+msgstr "_Tresna-kutxaren aholkua:"
 
-#: app/dialogs/preferences-dialog.c:2138
+#: ../app/dialogs/preferences-dialog.c:2138
 msgid "Hint for the _docks:"
-msgstr ""
+msgstr "_Atrakagarrien aholkua:"
 
-#: app/dialogs/preferences-dialog.c:2141
+#: ../app/dialogs/preferences-dialog.c:2141
 msgid "Focus"
 msgstr "Fokoa"
 
-#: app/dialogs/preferences-dialog.c:2145
+#: ../app/dialogs/preferences-dialog.c:2145
 msgid "Activate the _focused image"
-msgstr ""
+msgstr "Aktibatu irudi _enfokatua"
 
 #. Window Positions
-#: app/dialogs/preferences-dialog.c:2149
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Window Positions"
 msgstr "Leihoen kokalekuak"
 
-#: app/dialogs/preferences-dialog.c:2152
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2152
 msgid "_Save window positions on exit"
 msgstr "_Gorde leihoen kokalekuak irtetean"
 
-#: app/dialogs/preferences-dialog.c:2156
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2156
 msgid "Save Window Positions _Now"
-msgstr "Gorde orain leihoen kokalekuak"
+msgstr "Gorde _orain leihoen kokalekuak"
 
-#: app/dialogs/preferences-dialog.c:2163
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2163
 msgid "_Reset Saved Window Positions to Default Values"
-msgstr "Le_heneratu gordetako leihoen kokalekuak abiaraztean"
+msgstr "_Berrezarri gordetako leihoen kokalekuak balio lehenetsietan"
 
-#: app/dialogs/preferences-dialog.c:2178 app/dialogs/preferences-dialog.c:2181
-#: app/dialogs/preferences-dialog.c:2329
+#: ../app/dialogs/preferences-dialog.c:2178
+#: ../app/dialogs/preferences-dialog.c:2181
+#: ../app/dialogs/preferences-dialog.c:2329
 msgid "Environment"
 msgstr "Ingurunea"
 
-#: app/dialogs/preferences-dialog.c:2189
+#: ../app/dialogs/preferences-dialog.c:2189
 msgid "Resource Consumption"
 msgstr "Baliabideen kontsumoa"
 
-#: app/dialogs/preferences-dialog.c:2199
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Minimal number of _undo levels:"
-msgstr "Desegite-mailen gutxieneko kopurua:"
+msgstr "_Desegite-mailen gutxieneko kopurua:"
 
-#: app/dialogs/preferences-dialog.c:2202
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2202
 msgid "Maximum undo _memory:"
-msgstr "Desegiteko gehienezko memoria:"
+msgstr "Desegiteko gehienezko _memoria:"
 
-#: app/dialogs/preferences-dialog.c:2205
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2205
 msgid "Tile cache _size:"
-msgstr "Irudien cachearen tamaina:"
+msgstr "Irudien cachearen _tamaina:"
 
-#: app/dialogs/preferences-dialog.c:2208
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2208
 msgid "Maximum _new image size:"
-msgstr "Gehienezko irudi berriaren tamaina:"
+msgstr "Gehienezko irudi _berriaren tamaina:"
 
-#: app/dialogs/preferences-dialog.c:2213
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2213
 msgid "Number of _processors to use:"
-msgstr "Erabili beharreko prozesadore-kopurua:"
+msgstr "Erabili beharreko p_rozesadore-kopurua:"
 
 #. Image Thumbnails
-#: app/dialogs/preferences-dialog.c:2218
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2218
 msgid "Image Thumbnails"
-msgstr "Irudi-maskara"
+msgstr "Koadro txikiak"
 
-#: app/dialogs/preferences-dialog.c:2223
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2223
 msgid "Size of _thumbnails:"
-msgstr "Koadro txikiko fitxategien tamaina:"
+msgstr "Koadro _txikien tamaina:"
 
-#: app/dialogs/preferences-dialog.c:2227
+#: ../app/dialogs/preferences-dialog.c:2227
 msgid "Maximum _filesize for thumbnailing:"
-msgstr ""
+msgstr "Gehienezko koadro txikien _fitxategi-tamaina:"
 
 #. File Saving
-#: app/dialogs/preferences-dialog.c:2231
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2231
 msgid "Saving Images"
-msgstr "Gorde irudia"
+msgstr "Irudiak gordetzen"
 
-#: app/dialogs/preferences-dialog.c:2234
+#: ../app/dialogs/preferences-dialog.c:2234
 msgid "Confirm closing of unsa_ved images"
-msgstr ""
+msgstr "Berretsi gorde g_abeko irudiak ixtea"
 
-#: app/dialogs/preferences-dialog.c:2245 app/dialogs/preferences-dialog.c:2248
+#: ../app/dialogs/preferences-dialog.c:2245
+#: ../app/dialogs/preferences-dialog.c:2248
 msgid "Folders"
 msgstr "Karpetak"
 
-#: app/dialogs/preferences-dialog.c:2263
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2263
 msgid "Temp folder:"
-msgstr "Aldi baterako direktorioa:"
+msgstr "Aldi baterako karpeta:"
 
-#: app/dialogs/preferences-dialog.c:2263
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2263
 msgid "Select Temp Folder"
-msgstr "Hautatu gaien karpetak"
+msgstr "Hautatu aldi baterako karpeta"
 
-#: app/dialogs/preferences-dialog.c:2264
-#: app/dialogs/user-install-dialog.c:1403
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2264
+#: ../app/dialogs/user-install-dialog.c:1401
 msgid "Swap folder:"
-msgstr "Swap karpeta:"
+msgstr "Trukatze-karpeta:"
 
-#: app/dialogs/preferences-dialog.c:2264
-#, fuzzy
+#: ../app/dialogs/preferences-dialog.c:2264
 msgid "Select Swap Folder"
-msgstr "Hautatu swap direktorioa"
+msgstr "Hautatu trukatze-karpeta"
 
-#: app/dialogs/preferences-dialog.c:2297
+#: ../app/dialogs/preferences-dialog.c:2297
 msgid "Brush Folders"
 msgstr "Brotxa-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2299
+#: ../app/dialogs/preferences-dialog.c:2299
 msgid "Select Brush Folders"
 msgstr "Hautatu brotxa-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2301
+#: ../app/dialogs/preferences-dialog.c:2301
 msgid "Pattern Folders"
 msgstr "Eredu-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2303
+#: ../app/dialogs/preferences-dialog.c:2303
 msgid "Select Pattern Folders"
 msgstr "Hautatu eredu-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2305
+#: ../app/dialogs/preferences-dialog.c:2305
 msgid "Palette Folders"
 msgstr "Paleta-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2307
+#: ../app/dialogs/preferences-dialog.c:2307
 msgid "Select Palette Folders"
 msgstr "Hautatu paleta-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2309
+#: ../app/dialogs/preferences-dialog.c:2309
 msgid "Gradient Folders"
 msgstr "Gradiente-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2311
+#: ../app/dialogs/preferences-dialog.c:2311
 msgid "Select Gradient Folders"
 msgstr "Hautatu gradiente-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2313
+#: ../app/dialogs/preferences-dialog.c:2313
 msgid "Font Folders"
 msgstr "Letra-tipoen karpetak"
 
-#: app/dialogs/preferences-dialog.c:2315
+#: ../app/dialogs/preferences-dialog.c:2315
 msgid "Select Font Folders"
 msgstr "Hautatu letra-tipoen karpetak"
 
-#: app/dialogs/preferences-dialog.c:2317
+#: ../app/dialogs/preferences-dialog.c:2317
 msgid "Plug-In Folders"
 msgstr "Plugin-en karpetak"
 
-#: app/dialogs/preferences-dialog.c:2319
+#: ../app/dialogs/preferences-dialog.c:2319
 msgid "Select Plug-In Folders"
 msgstr "Hautatu plugin-en karpetak"
 
-#: app/dialogs/preferences-dialog.c:2321
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Scripts"
 msgstr "Script-ak"
 
-#: app/dialogs/preferences-dialog.c:2321
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Script-Fu Folders"
 msgstr "Script-Fu karpetak"
 
-#: app/dialogs/preferences-dialog.c:2323
+#: ../app/dialogs/preferences-dialog.c:2323
 msgid "Select Script-Fu Folders"
 msgstr "Hautatu script-Fu karpetak"
 
-#: app/dialogs/preferences-dialog.c:2325
+#: ../app/dialogs/preferences-dialog.c:2325
 msgid "Module Folders"
 msgstr "Modulu-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2327
+#: ../app/dialogs/preferences-dialog.c:2327
 msgid "Select Module Folders"
 msgstr "Hautatu modulu-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2329
+#: ../app/dialogs/preferences-dialog.c:2329
 msgid "Environment Folders"
 msgstr "Ingurune-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2331
+#: ../app/dialogs/preferences-dialog.c:2331
 msgid "Select Environment Folders"
 msgstr "Hautatu ingurune-karpetak"
 
-#: app/dialogs/preferences-dialog.c:2333
+#: ../app/dialogs/preferences-dialog.c:2333
 msgid "Themes"
 msgstr "Gaiak"
 
-#: app/dialogs/preferences-dialog.c:2333
+#: ../app/dialogs/preferences-dialog.c:2333
 msgid "Theme Folders"
 msgstr "Gaien karpetak"
 
-#: app/dialogs/preferences-dialog.c:2335
+#: ../app/dialogs/preferences-dialog.c:2335
 msgid "Select Theme Folders"
 msgstr "Hautatu gaien karpetak"
 
-#: app/dialogs/print-size-dialog.c:128
-#, fuzzy
+#: ../app/dialogs/print-size-dialog.c:128
 msgid "Print Size"
-msgstr "Inprimatze-tamaina:"
+msgstr "Inprimatze-tamaina"
 
 #. the image size labels
-#: app/dialogs/print-size-dialog.c:155 app/widgets/gimpsizebox.c:223
-#: app/widgets/gimptemplateeditor.c:236
-#, fuzzy
+#: ../app/dialogs/print-size-dialog.c:155 ../app/widgets/gimpsizebox.c:223
+#: ../app/widgets/gimptemplateeditor.c:236
 msgid "_Width:"
-msgstr "Zabalera:"
+msgstr "_Zabalera:"
 
-#: app/dialogs/print-size-dialog.c:162 app/widgets/gimpsizebox.c:227
-#: app/widgets/gimptemplateeditor.c:243
-#, fuzzy
+#: ../app/dialogs/print-size-dialog.c:162 ../app/widgets/gimpsizebox.c:227
+#: ../app/widgets/gimptemplateeditor.c:243
 msgid "H_eight:"
-msgstr "Altuera:"
+msgstr "_Altuera:"
 
 #. the resolution labels
-#: app/dialogs/print-size-dialog.c:210 app/widgets/gimpsizebox.c:276
-#: app/widgets/gimptemplateeditor.c:363
-#, fuzzy
+#: ../app/dialogs/print-size-dialog.c:210 ../app/widgets/gimpsizebox.c:276
+#: ../app/widgets/gimptemplateeditor.c:363
 msgid "_X resolution:"
-msgstr "Bereizmena:"
+msgstr "_X bereizmena:"
 
-#: app/dialogs/print-size-dialog.c:217 app/widgets/gimpsizebox.c:279
-#: app/widgets/gimptemplateeditor.c:370
-#, fuzzy
+#: ../app/dialogs/print-size-dialog.c:217 ../app/widgets/gimpsizebox.c:279
+#: ../app/widgets/gimptemplateeditor.c:370
 msgid "_Y resolution:"
-msgstr "Bereizmena:"
+msgstr "_Y bereizmena:"
 
-#: app/dialogs/print-size-dialog.c:228 app/widgets/gimpsizebox.c:272
-#: app/widgets/gimptemplateeditor.c:383
+#: ../app/dialogs/print-size-dialog.c:228 ../app/widgets/gimpsizebox.c:272
+#: ../app/widgets/gimptemplateeditor.c:383
 #, c-format
 msgid "pixels/%a"
 msgstr "pixel/%a"
 
-#: app/dialogs/quit-dialog.c:84
-#, fuzzy
+#: ../app/dialogs/quit-dialog.c:84
 msgid "Quit The GIMP"
-msgstr "GIMPetik irten?"
+msgstr "Irten GIMPetik"
 
-#: app/dialogs/quit-dialog.c:126
+#: ../app/dialogs/quit-dialog.c:126
 msgid "If you quit GIMP now, these changes will be lost."
-msgstr ""
+msgstr "GIMPetik irtetzen bazara, aldaketa guztiak galduko dituzu."
 
-#: app/dialogs/quit-dialog.c:164
-#, fuzzy
+#: ../app/dialogs/quit-dialog.c:164
 msgid "There is one image with unsaved changes:"
-msgstr "Aldatu leihoaren tamaina _irudiaren tamaina aldatzean"
+msgstr "Irudi batek gorde gabeko aldaketak ditu:"
 
-#: app/dialogs/quit-dialog.c:167
+#: ../app/dialogs/quit-dialog.c:167
 #, c-format
 msgid "There are %d images with unsaved changes:"
-msgstr ""
+msgstr "%d irudik gorde gabeko aldaketak dute:"
 
-#: app/dialogs/quit-dialog.c:183
-#, fuzzy
+#: ../app/dialogs/quit-dialog.c:183
 msgid "_Discard Changes"
-msgstr "Bikoiztu kanala"
+msgstr "_Baztertu aldaketak"
 
-#: app/dialogs/resize-dialog.c:115
+#: ../app/dialogs/resize-dialog.c:115
 msgid "Canvas Size"
 msgstr "Oihalaren tamaina"
 
-#: app/dialogs/resize-dialog.c:126 app/dialogs/scale-dialog.c:107
-#, fuzzy
+#: ../app/dialogs/resize-dialog.c:126 ../app/dialogs/scale-dialog.c:107
 msgid "Layer Size"
-msgstr "Geruza-hautapena"
+msgstr "Geruza-tamaina"
 
-#: app/dialogs/resolution-calibrate-dialog.c:67
+#: ../app/dialogs/resolution-calibrate-dialog.c:67
 msgid "Calibrate Monitor Resolution"
 msgstr "Kalibratu monitorearen bereizmena"
 
-#: app/dialogs/resolution-calibrate-dialog.c:120
-#, fuzzy
+#: ../app/dialogs/resolution-calibrate-dialog.c:120
 msgid "Measure the rulers and enter their lengths:"
-msgstr "Neurtu erregelak eta sartu haien luzerak behean."
+msgstr "Neurtu erregelak eta sartu haien luzerak:"
 
-#: app/dialogs/resolution-calibrate-dialog.c:145
+#: ../app/dialogs/resolution-calibrate-dialog.c:145
 msgid "_Horizontal:"
 msgstr "_Horizontala:"
 
-#: app/dialogs/resolution-calibrate-dialog.c:150
+#: ../app/dialogs/resolution-calibrate-dialog.c:150
 msgid "_Vertical:"
 msgstr "_Bertikala:"
 
 #. Image size frame
-#: app/dialogs/scale-dialog.c:96 app/widgets/gimptemplateeditor.c:214
+#: ../app/dialogs/scale-dialog.c:96 ../app/widgets/gimptemplateeditor.c:214
 msgid "Image Size"
 msgstr "Irudiaren tamaina"
 
-#: app/dialogs/scale-dialog.c:166
-#, fuzzy
+#: ../app/dialogs/scale-dialog.c:166
 msgid "Quality"
-msgstr "/Fitxategia/_Irten"
+msgstr "Kalitatea"
 
-#: app/dialogs/scale-dialog.c:178
-#, fuzzy
+#: ../app/dialogs/scale-dialog.c:178
 msgid "I_nterpolation:"
-msgstr "Interpolazioa:"
+msgstr "I_nterpolazioa:"
 
-#: app/dialogs/scale-dialog.c:192
+#: ../app/dialogs/scale-dialog.c:192
 msgid ""
 "Indexed color layers are always scaled without interpolation. The chosen "
 "interpolation type will affect channels and masks only."
 msgstr ""
+"Kolore indexatutako geruzak interpolaziorik gabe eskalatzen dira beti. "
+"Aukeratutako interpolazio motak kanalei eta maskarei eragingo die bakarrik."
 
-#: app/dialogs/stroke-dialog.c:104
+#: ../app/dialogs/stroke-dialog.c:104
 msgid "Choose Stroke Style"
-msgstr ""
+msgstr "Aukeratu traza-estiloa"
 
-#: app/dialogs/stroke-dialog.c:209
+#: ../app/dialogs/stroke-dialog.c:209
 msgid "Paint Tool:"
 msgstr "Margotzeko tresna:"
 
-#: app/dialogs/tips-dialog.c:90
+#: ../app/dialogs/tips-dialog.c:90
 msgid "Your GIMP tips file appears to be missing!"
 msgstr "GIMPen aholkuen fitxategia falta da!"
 
-#: app/dialogs/tips-dialog.c:92
+#: ../app/dialogs/tips-dialog.c:92
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr "'%s' izeneko fitxategi bat egon beharko luke. Egiaztatu instalazioa."
 
-#: app/dialogs/tips-dialog.c:98
+#: ../app/dialogs/tips-dialog.c:98
 msgid "The GIMP tips file could not be parsed!"
 msgstr "GIMPen aholkuen fitxategia ezin izan da analizatu!"
 
-#: app/dialogs/tips-dialog.c:131
+#: ../app/dialogs/tips-dialog.c:131
 msgid "GIMP Tip of the Day"
 msgstr "GIMPen eguneko aholkua"
 
-#: app/dialogs/tips-dialog.c:195
+#: ../app/dialogs/tips-dialog.c:195
 msgid "Show tip next time GIMP starts"
 msgstr "Erakutsi aholkua GIMP abiarazten den hurrengo aldian"
 
-#: app/dialogs/tips-dialog.c:219
-#, fuzzy
+#: ../app/dialogs/tips-dialog.c:219
 msgid "_Previous tip"
-msgstr "Aurreko a_holkua"
+msgstr "_Aurreko aholkua"
 
-#: app/dialogs/tips-dialog.c:228
-#, fuzzy
+#: ../app/dialogs/tips-dialog.c:228
 msgid "_Next tip"
-msgstr "Hurrengo _aholkua"
+msgstr "_Hurrengo aholkua"
 
 #. 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:165
+#: ../app/dialogs/tips-parser.c:165
 msgid "tips-locale:C"
 msgstr "tips-locale:eu"
 
-#: app/dialogs/user-install-dialog.c:134
+#: ../app/dialogs/user-install-dialog.c:134
 msgid ""
 "The gimprc is used to store personal preferences that affect GIMP's default "
 "behavior.  Paths to search for brushes, palettes, gradients, patterns, plug-"
@@ -7629,7 +6986,7 @@ msgstr ""
 "erabiltzen da gimprc. Brotxak, paletak, gradienteak, ereduak, plugin-ak eta "
 "moduluak bilatzeko bide-izenak ere konfigura daitezke hemen."
 
-#: app/dialogs/user-install-dialog.c:143
+#: ../app/dialogs/user-install-dialog.c:143
 msgid ""
 "GIMP uses an additional gtkrc file so you can configure it to look "
 "differently than other GTK apps."
@@ -7637,7 +6994,7 @@ msgstr ""
 "GIMPek beste gtkrc fitxategi bat erabiltzen du, aukera izan dezazun "
 "gainerako GTK aplikazioek ez bezalako itxura eduki dezan konfiguratzeko."
 
-#: app/dialogs/user-install-dialog.c:149
+#: ../app/dialogs/user-install-dialog.c:149
 msgid ""
 "Plug-ins and extensions are external programs run by the GIMP which provide "
 "additional functionality.  These programs are searched for at run-time and "
@@ -7650,7 +7007,7 @@ msgstr ""
 "honetan gordetzen da. Fitxategi hauek GIMPek bakarrik irakurriko du eta ez "
 "da editatuko."
 
-#: app/dialogs/user-install-dialog.c:159
+#: ../app/dialogs/user-install-dialog.c:159
 msgid ""
 "Key shortcuts can be dynamically redefined in The GIMP. The menurc is a dump "
 "of your configuration so it can. be remembered for the next session.  You "
@@ -7663,7 +7020,7 @@ msgstr ""
 "GIMPetik definitzea. Fitxategi hau ezabatuz gero, laster-tekla lehenetsiak "
 "leheneratuko dira."
 
-#: app/dialogs/user-install-dialog.c:169
+#: ../app/dialogs/user-install-dialog.c:169
 msgid ""
 "The sessionrc is used to store what dialog windows were open the last time "
 "you quit The GIMP.  You can configure The GIMP to reopen these dialogs at "
@@ -7673,7 +7030,7 @@ msgstr ""
 "gordetzeko erabiltzen da. GIMP konfigura dezakezu leiho horiek gordetako "
 "kokalekuan berriro irekitzeko."
 
-#: app/dialogs/user-install-dialog.c:176
+#: ../app/dialogs/user-install-dialog.c:176
 msgid ""
 "This file holds a collection of standard media sizes that serve as image "
 "templates."
@@ -7681,7 +7038,7 @@ msgstr ""
 "Fitxategi honek euskarri-tamaina estandarren bilduma gordetzen du eta horiek "
 "irudi-txantiloi gisa balio dute."
 
-#: app/dialogs/user-install-dialog.c:182
+#: ../app/dialogs/user-install-dialog.c:182
 msgid ""
 "The unitrc is used to store your user units database.  You can define "
 "additional units and use them just like you use the built-in units inches, "
@@ -7693,7 +7050,7 @@ msgstr ""
 "puntuak eta pikak- erabiltzen dituzun bezala erabili. Fitxategi hau GIMPetik "
 "irteten duzun bakoitzean gainidazten da."
 
-#: app/dialogs/user-install-dialog.c:191
+#: ../app/dialogs/user-install-dialog.c:191
 msgid ""
 "This folder is used to store user defined brushes. The GIMP checks this "
 "folder in addition to the system-wide GIMP brushes installation when "
@@ -7703,7 +7060,7 @@ msgstr ""
 "GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko brotxen "
 "instalazioaz gain, brotxak bilatzen dituenean."
 
-#: app/dialogs/user-install-dialog.c:199
+#: ../app/dialogs/user-install-dialog.c:199
 msgid ""
 "This folder is used to store fonts you only want visible in the GIMP. The "
 "GIMP checks this folder in addition to the system-wide GIMP fonts "
@@ -7716,7 +7073,7 @@ msgstr ""
 "tipoak GIMPerako bakarrik nahi dituzunean, bestela jarri gauzak letra-tipoen "
 "direktorio orokorrean."
 
-#: app/dialogs/user-install-dialog.c:209
+#: ../app/dialogs/user-install-dialog.c:209
 msgid ""
 "This folder is used to store user defined gradients.  The GIMP checks this "
 "folder in addition to the system-wide GIMP gradients installation when "
@@ -7726,7 +7083,7 @@ msgstr ""
 "da. GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko gradienteen "
 "instalazioaz gain, gradienteak bilatzen dituenean."
 
-#: app/dialogs/user-install-dialog.c:216
+#: ../app/dialogs/user-install-dialog.c:216
 msgid ""
 "This folder is used to store user defined palettes.  The GIMP checks this "
 "folder in addition to the system-wide GIMP palettes installation when "
@@ -7736,7 +7093,7 @@ msgstr ""
 "GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko paleten "
 "instalazioaz gain, paletak bilatzen dituenean."
 
-#: app/dialogs/user-install-dialog.c:223
+#: ../app/dialogs/user-install-dialog.c:223
 msgid ""
 "This folder is used to store user defined patterns.  The GIMP checks this "
 "folder in addition to the system-wide GIMP patterns installation when "
@@ -7746,7 +7103,7 @@ msgstr ""
 "GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko ereduen "
 "instalazioaz gain, ereduak bilatzen dituenean."
 
-#: app/dialogs/user-install-dialog.c:230
+#: ../app/dialogs/user-install-dialog.c:230
 msgid ""
 "This folder is used to store user created, temporary, or otherwise non-"
 "system-supported plug-ins.  The GIMP checks this folder in addition to the "
@@ -7757,7 +7114,7 @@ msgstr ""
 "egiaztatzen du, GIMPen sistema orokorreko plugin-en karpetaz gaina, plugin-"
 "ak bilatzean."
 
-#: app/dialogs/user-install-dialog.c:238
+#: ../app/dialogs/user-install-dialog.c:238
 msgid ""
 "This folder is used to store user created, temporary, or otherwise non-"
 "system-supported DLL modules.  The GIMP checks this folder in addition to "
@@ -7769,7 +7126,7 @@ msgstr ""
 "egiaztatzen du, GIMPen sistema orokorreko plugin-en karpetaz gain, "
 "abiaraztean kargatzeko moduluak bilatzean."
 
-#: app/dialogs/user-install-dialog.c:247
+#: ../app/dialogs/user-install-dialog.c:247
 msgid ""
 "This folder is used to store user created, temporary, or otherwise non-"
 "system-supported additions to the plug-in environment.  The GIMP checks this "
@@ -7781,7 +7138,7 @@ msgstr ""
 "da. GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko ingurune-"
 "karpetaz gain, plugin-en inguruneko aldaketa-fitxategiak bilatzean."
 
-#: app/dialogs/user-install-dialog.c:257
+#: ../app/dialogs/user-install-dialog.c:257
 msgid ""
 "This folder is used to store user created and installed scripts.  The GIMP "
 "checks this folder in addition to the systemwide GIMP scripts folder when "
@@ -7791,15 +7148,15 @@ msgstr ""
 "erabiltzen da. GIMPek karpeta hau egiaztatzen du, GIMPen sistema orokorreko "
 "script-en karpetaz gain, script-ak bilatzean."
 
-#: app/dialogs/user-install-dialog.c:265
+#: ../app/dialogs/user-install-dialog.c:265
 msgid "This folder is searched for image templates."
 msgstr "Karpeta honetan irudi-txantiloiak bilatzen dira."
 
-#: app/dialogs/user-install-dialog.c:270
+#: ../app/dialogs/user-install-dialog.c:270
 msgid "This folder is searched for user-installed themes."
 msgstr "Karpeta honetan erabiltzaileak instalatutako gaiak bilatzen dira."
 
-#: app/dialogs/user-install-dialog.c:275
+#: ../app/dialogs/user-install-dialog.c:275
 msgid ""
 "This folder is used to temporarily store undo buffers to reduce memory "
 "usage.  If The GIMP is unceremoniously killed, files of the form: gimp<#>."
@@ -7811,53 +7168,50 @@ msgstr ""
 "motako fitxategiak karpeta honetan gera daitezke. Fitxategi horiek ezin dira "
 "GIMPen saioetan erabili eta arazorik gabe ezaba daitezke."
 
-#: app/dialogs/user-install-dialog.c:284
+#: ../app/dialogs/user-install-dialog.c:284
 msgid "This folder is used to store tool options."
 msgstr "Karpeta hau tresna-aukerak gordetzeko erabiltzen da."
 
-#: app/dialogs/user-install-dialog.c:289
+#: ../app/dialogs/user-install-dialog.c:289
 msgid "This folder is used to store parameter files for the Curves tool."
-msgstr ""
-"Karpeta hau kurben tresnen parametro-fitxategiak gordetzeko erabiltzen da."
+msgstr "Karpeta hau kurben tresnen parametro-fitxategiak gordetzeko erabiltzen da."
 
-#: app/dialogs/user-install-dialog.c:294
+#: ../app/dialogs/user-install-dialog.c:294
 msgid "This folder is used to store parameter files for the Levels tool."
-msgstr ""
-"Karpeta hau mailen tresnen parametro-fitxategiak gordetzeko erabiltzen da."
+msgstr "Karpeta hau mailen tresnen parametro-fitxategiak gordetzeko erabiltzen da."
 
-#: app/dialogs/user-install-dialog.c:390
+#: ../app/dialogs/user-install-dialog.c:390
 msgid "Installation successful.  Click \"Continue\" to proceed."
 msgstr "Instalazioa ondo egin da. Sakatu \"Jarraitu\" hasteko."
 
-#: app/dialogs/user-install-dialog.c:396
+#: ../app/dialogs/user-install-dialog.c:396
 msgid "Installation failed.  Contact system administrator."
-msgstr ""
-"Instalazioak huts egin du. Jarri harremanetan sistema-administratzailearekin."
+msgstr "Instalazioak huts egin du. Jarri harremanetan sistema-administratzailearekin."
 
-#: app/dialogs/user-install-dialog.c:609
+#: ../app/dialogs/user-install-dialog.c:609
 msgid "GIMP User Installation"
-msgstr "GIMPen erabiltzailearen instalazioa"
+msgstr "GIMPen erabiltzaile-instalazioa"
 
-#: app/dialogs/user-install-dialog.c:614
+#: ../app/dialogs/user-install-dialog.c:614
 msgid "Continue"
 msgstr "Jarraitu"
 
 #. GPL_PAGE
 #. version number
-#: app/dialogs/user-install-dialog.c:765
-#, fuzzy, c-format
+#: ../app/dialogs/user-install-dialog.c:763
+#, c-format
 msgid ""
 "Welcome to\n"
 "The GIMP %d.%d User Installation"
 msgstr ""
 "Ongi etorri\n"
-"GIMPen erabiltzailearen instalaziora"
+"GIMP %d.%d erabiltzaile-instalaziora"
 
-#: app/dialogs/user-install-dialog.c:771
+#: ../app/dialogs/user-install-dialog.c:769
 msgid "Click \"Continue\" to enter the GIMP user installation."
-msgstr "Sakatu \"Jarraitu\" GIMPen erabiltzailearen instalazioa hasteko."
+msgstr "Sakatu \"Jarraitu\" GIMPen erabiltzaile-instalazioarekin hasteko."
 
-#: app/dialogs/user-install-dialog.c:778
+#: ../app/dialogs/user-install-dialog.c:776
 msgid ""
 "The GIMP - GNU Image Manipulation Program\n"
 "Copyright (C) 1995-2004\n"
@@ -7867,7 +7221,7 @@ msgstr ""
 "Copyright (C) 1995-2004\n"
 "Spencer Kimball, Peter Mattis eta GIMP garatzeko lan-taldea."
 
-#: app/dialogs/user-install-dialog.c:788
+#: ../app/dialogs/user-install-dialog.c:786
 msgid ""
 "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 the Free "
@@ -7878,7 +7232,7 @@ msgstr ""
 "Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
 "edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero."
 
-#: app/dialogs/user-install-dialog.c:794
+#: ../app/dialogs/user-install-dialog.c:792
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -7890,7 +7244,7 @@ msgstr ""
 "MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago "
 "nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra."
 
-#: app/dialogs/user-install-dialog.c:800
+#: ../app/dialogs/user-install-dialog.c:798
 msgid ""
 "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., 59 Temple "
@@ -7900,45 +7254,42 @@ msgstr ""
 "zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: app/dialogs/user-install-dialog.c:810
+#: ../app/dialogs/user-install-dialog.c:808
 msgid "Migrate User Settings"
-msgstr ""
+msgstr "Migratu erabiltzaile-ezarpenak"
 
-#: app/dialogs/user-install-dialog.c:811
-#, fuzzy
+#: ../app/dialogs/user-install-dialog.c:809
 msgid "Click \"Continue\" to proceed with the user installation."
-msgstr "Sakatu \"Jarraitu\" GIMPen erabiltzailearen instalazioa hasteko."
+msgstr "Sakatu \"Jarraitu\" GIMPen erabiltzaile-instalazioarekin jarraitzeko."
 
-#: app/dialogs/user-install-dialog.c:816
+#: ../app/dialogs/user-install-dialog.c:814
 msgid "It seems you have used GIMP 2.0 before."
-msgstr ""
+msgstr "Badirudi GIMP 2.0 erabili izan duzula aurretik."
 
-#: app/dialogs/user-install-dialog.c:820
+#: ../app/dialogs/user-install-dialog.c:818
 msgid "_Migrate GIMP 2.0 user settings"
-msgstr ""
+msgstr "_Migratu GIMP 2.0 erabiltzaile-ezarpenak"
 
-#: app/dialogs/user-install-dialog.c:823
-#, fuzzy
+#: ../app/dialogs/user-install-dialog.c:821
 msgid "Do a _fresh user installation"
-msgstr "GIMPen erabiltzailearen instalazioa"
+msgstr "Egin GIMPen erabiltzaile-instalazio garbia"
 
-#: app/dialogs/user-install-dialog.c:851
+#: ../app/dialogs/user-install-dialog.c:849
 msgid "Personal GIMP Folder"
 msgstr "GIMPen karpeta pertsonala"
 
-#: app/dialogs/user-install-dialog.c:852
+#: ../app/dialogs/user-install-dialog.c:850
 msgid "Click \"Continue\" to create your personal GIMP folder."
 msgstr "Sakatu \"Jarraitu\" GIMPen zure karpeta pertsonala sortzeko."
 
-#: app/dialogs/user-install-dialog.c:896
+#: ../app/dialogs/user-install-dialog.c:894
 #, c-format
 msgid ""
 "For a proper GIMP installation, a folder named '%s' needs to be "
 "created."
-msgstr ""
-"GIMP behar bezala instalatzeko, '%s' izeneko karpeta sortu behar da."
+msgstr "GIMP behar bezala instalatzeko, '%s' izeneko karpeta sortu behar da."
 
-#: app/dialogs/user-install-dialog.c:903
+#: ../app/dialogs/user-install-dialog.c:901
 msgid ""
 "This folder will contain a number of important files.  Click on one of the "
 "files or folders in the tree to get more information about the selected item."
@@ -7947,620 +7298,595 @@ msgstr ""
 "fitxategi edo karpeta batean hautatutako elementuari buruzko informazio "
 "gehiago eskuratzeko."
 
-#: app/dialogs/user-install-dialog.c:991
+#: ../app/dialogs/user-install-dialog.c:989
 msgid "User Installation Log"
 msgstr "Erabiltzailearen instalazioaren egunkaria"
 
-#: app/dialogs/user-install-dialog.c:992
+#: ../app/dialogs/user-install-dialog.c:990
 msgid "Please wait while your personal GIMP folder is being created..."
 msgstr "Itxaron GIMPen karpeta pertsonala sortu bitartean..."
 
-#: app/dialogs/user-install-dialog.c:999
+#: ../app/dialogs/user-install-dialog.c:997
 msgid "GIMP Performance Tuning"
-msgstr "GIMPen errendimentuaren doitzea"
+msgstr "GIMPen errendimentua doitzea"
 
-#: app/dialogs/user-install-dialog.c:1000
+#: ../app/dialogs/user-install-dialog.c:998
 msgid "Click \"Continue\" to accept the settings above."
 msgstr "Sakatu \"Jarraitu\" goiko ezarpenak onartzeko."
 
-#: app/dialogs/user-install-dialog.c:1005
-msgid ""
-"For optimal GIMP performance, some settings may have to be adjusted."
-msgstr ""
-"GIMPen errendimendua hobetzeko, ezarpen batzuk doitu behar dira."
+#: ../app/dialogs/user-install-dialog.c:1003
+msgid "For optimal GIMP performance, some settings may have to be adjusted."
+msgstr "GIMPen errendimendua hobetzeko, ezarpen batzuk doitu behar dira."
 
-#: app/dialogs/user-install-dialog.c:1065
+#: ../app/dialogs/user-install-dialog.c:1063
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "'%s' fitxategia kopiatzen '%s'(e)tik..."
 
-#: app/dialogs/user-install-dialog.c:1084
+#: ../app/dialogs/user-install-dialog.c:1082
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "'%s' karpeta sortzen..."
 
-#: app/dialogs/user-install-dialog.c:1098
+#: ../app/dialogs/user-install-dialog.c:1096
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Ezin da '%s' karpeta sortu: %s"
 
-#: app/dialogs/user-install-dialog.c:1362
+#: ../app/dialogs/user-install-dialog.c:1360
 msgid ""
 "GIMP uses a limited amount of memory to store image data, the so-called "
 "\"Tile Cache\".  You should adjust its size to fit into memory.  Consider "
 "the amount of memory used by other running processes."
 msgstr ""
-"GIMPek momoria-kantitate mugatua erabiltzen du irudien datuak gordetzeko, "
+"GIMPek memoria-kantitate mugatua erabiltzen du irudien datuak gordetzeko, "
 "\"Irudien cachea\" izenekoa. Haren tamaina doitu behar duzu memoriara "
 "egokitzeko. Kontuan hartu martxan dauden beste programek erabiltzen duten "
 "memoria-kantitatea."
 
-#: app/dialogs/user-install-dialog.c:1375
-#, fuzzy
+#: ../app/dialogs/user-install-dialog.c:1373
 msgid "Tile cache size:"
-msgstr "Irudien cachearen tamaina:"
+msgstr "Irudien cache-tamaina:"
 
-#: app/dialogs/user-install-dialog.c:1387
+#: ../app/dialogs/user-install-dialog.c:1385
 msgid ""
 "All image and undo data which doesn't fit into the Tile Cache will be "
 "written to a swap file.  This file should be located on a local filesystem "
 "with enough free space (several hundred MB). On a UNIX system, you may want "
 "to use the system-wide temp-dir (\"/tmp\" or \"/var/tmp\")."
 msgstr ""
-"Irudien cachean sartzen ez diren irudi eta desegiteko datu guztiak swap "
+"Irudien cachean sartzen ez diren irudi eta desegiteko datu guztiak trukatze-"
 "fitxategi batean idatziko dira. Fitxategi hori fitxategi-sistema lokalean "
 "kokatuko da eta behar adina leku libre edukiko du (zazpiehun MB). UNIX "
 "sisteman, sistema orokorreko aldi baterako direktorioa erabiltzea komeni "
 "zaizu (\"/tmp\" edo \"/var/tmp\")."
 
-#: app/dialogs/user-install-dialog.c:1398
-#, fuzzy
+#: ../app/dialogs/user-install-dialog.c:1396
 msgid "Select swap dir"
-msgstr "Hautatu swap direktorioa"
+msgstr "Hautatu trukatze-direktorioa"
 
-#: app/dialogs/vectors-export-dialog.c:53
+#: ../app/dialogs/vectors-export-dialog.c:53
 msgid "Export Path to SVG"
 msgstr "Esportatu bidea SVGra"
 
-#: app/dialogs/vectors-export-dialog.c:78
-#, fuzzy
+#: ../app/dialogs/vectors-export-dialog.c:78
 msgid "Export the active path"
-msgstr "Lekuz aldatu uneko bidea"
+msgstr "Esportatu uneko bidea"
 
-#: app/dialogs/vectors-export-dialog.c:79
-#, fuzzy
+#: ../app/dialogs/vectors-export-dialog.c:79
 msgid "Export all paths from this image"
-msgstr "Sortu ikuspegi berria irudi honentzat\t"
+msgstr "Esportatu bide guztiak iruditik"
 
-#: app/dialogs/vectors-import-dialog.c:57
+#: ../app/dialogs/vectors-import-dialog.c:57
 msgid "Import Paths from SVG"
 msgstr "Inportatu bideak SVGtik"
 
-#: app/dialogs/vectors-import-dialog.c:83
-#, fuzzy
+#: ../app/dialogs/vectors-import-dialog.c:83
 msgid "All Files (*.*)"
-msgstr "Iragazki erabilgarriak"
+msgstr "Fitxategi guztiak (*.*)"
 
-#: app/dialogs/vectors-import-dialog.c:88
+#: ../app/dialogs/vectors-import-dialog.c:88
 msgid "Scalable SVG image (*.svg)"
-msgstr ""
+msgstr "SVG irudi eskalakorra (*.svg)"
 
-#: app/dialogs/vectors-import-dialog.c:99
-#, fuzzy
+#: ../app/dialogs/vectors-import-dialog.c:99
 msgid "_Merge imported paths"
-msgstr "Inportatu bideak"
+msgstr "_Batu inportatutako bideak"
 
-#: app/dialogs/vectors-import-dialog.c:109
+#: ../app/dialogs/vectors-import-dialog.c:109
 msgid "_Scale imported paths to fit image"
-msgstr ""
+msgstr "_Eskalatu inportatutako bideak irudian doitzeko"
 
-#: app/dialogs/vectors-options-dialog.c:113
-#, fuzzy
+#: ../app/dialogs/vectors-options-dialog.c:113
 msgid "Path Name:"
 msgstr "Bidearen izena:"
 
-#: app/display/display-enums.c:24
-#, fuzzy
+#: ../app/display/display-enums.c:24
 msgid "Tool icon"
 msgstr "Tresnaren ikonoa"
 
-#: app/display/display-enums.c:25
-#, fuzzy
+#: ../app/display/display-enums.c:25
 msgid "Tool icon with crosshair"
 msgstr "Tresnaren ikonoa, gurutzagunearekin"
 
-#: app/display/display-enums.c:26
+#: ../app/display/display-enums.c:26
 msgid "Crosshair only"
 msgstr "Gurutzagunea bakarrik"
 
-#: app/display/display-enums.c:55
-#, fuzzy
+#: ../app/display/display-enums.c:55
 msgid "From theme"
 msgstr "Gaitik"
 
-#: app/display/display-enums.c:56
-#, fuzzy
+#: ../app/display/display-enums.c:56
 msgid "Light check color"
 msgstr "Koadrikularen kolore argia"
 
-#: app/display/display-enums.c:57
-#, fuzzy
+#: ../app/display/display-enums.c:57
 msgid "Dark check color"
 msgstr "Koadrikularen kolore iluna"
 
-#: app/display/display-enums.c:58
-#, fuzzy
+#: ../app/display/display-enums.c:58
 msgid "Custom color"
 msgstr "Kolore pertsonalizatua"
 
-#: app/display/gimpdisplayshell.c:943
+#: ../app/display/gimpdisplayshell.c:948
 msgid "Zoom image when window size changes"
-msgstr ""
+msgstr "Aldatu irudiaren zooma leihoaren tamaina aldatzean"
 
-#: app/display/gimpdisplayshell.c:963
-#, fuzzy
+#: ../app/display/gimpdisplayshell.c:968
 msgid "Toggle Quick Mask"
-msgstr "Maskara bizkorra bai/ez"
+msgstr "Txandakatu maskara azkarra"
 
-#: app/display/gimpdisplayshell-close.c:122
-#: app/display/gimpdisplayshell-close.c:185
-#, fuzzy, c-format
+#: ../app/display/gimpdisplayshell-close.c:122
+#: ../app/display/gimpdisplayshell-close.c:185
+#, c-format
 msgid "Close %s"
-msgstr "Itxi %s?"
+msgstr "Itxi %s"
 
-#: app/display/gimpdisplayshell-close.c:131
+#: ../app/display/gimpdisplayshell-close.c:131
 msgid "Do_n't save"
-msgstr ""
+msgstr "E_z gorde"
 
-#: app/display/gimpdisplayshell-close.c:192
+#: ../app/display/gimpdisplayshell-close.c:192
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
-msgstr ""
+msgstr "Gorde aldaketak '%s' irudian itxi aurretik?"
 
-#: app/display/gimpdisplayshell-close.c:209
+#: ../app/display/gimpdisplayshell-close.c:209
 #, c-format
 msgid "If you don't save the image, changes from the last %s will be lost."
-msgstr ""
+msgstr "Ez baduzu irudia gorde, azken %s(e)ko aldaketak galduko dira."
 
 #. one second, the time period
-#: app/display/gimpdisplayshell-close.c:266
-#, fuzzy
+#: ../app/display/gimpdisplayshell-close.c:266
 msgid "second"
-msgstr "Ikonoa"
+msgstr "segundo"
 
-#: app/display/gimpdisplayshell-close.c:269
+#: ../app/display/gimpdisplayshell-close.c:269
 #, c-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d segundo"
 
-#: app/display/gimpdisplayshell-close.c:275
-#, fuzzy
+#: ../app/display/gimpdisplayshell-close.c:275
 msgid "minute"
-msgstr "Marra"
+msgstr "minutu"
 
-#: app/display/gimpdisplayshell-close.c:277
+#: ../app/display/gimpdisplayshell-close.c:277
 #, c-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d minutu"
 
-#: app/display/gimpdisplayshell-dnd.c:98
+#: ../app/display/gimpdisplayshell-dnd.c:98
 msgid "Drop New Layer"
 msgstr "Bota geruza berria"
 
-#: app/display/gimpdisplayshell-dnd.c:142
+#: ../app/display/gimpdisplayshell-dnd.c:142
 msgid "Drop New Path"
 msgstr "Bota bide berria"
 
-#: app/display/gimpdisplayshell-filter-dialog.c:73
+#: ../app/display/gimpdisplayshell-filter-dialog.c:73
 msgid "Color Display Filters"
 msgstr "Kolore-pantailen iragazkiak"
 
-#: app/display/gimpdisplayshell-filter-dialog.c:76
+#: ../app/display/gimpdisplayshell-filter-dialog.c:76
 msgid "Configure Color Display Filters"
 msgstr "Konfiguratu kolore-pantailen iragazkiak"
 
-#: app/display/gimpdisplayshell-layer-select.c:122
+#: ../app/display/gimpdisplayshell-layer-select.c:122
 msgid "Layer Select"
 msgstr "Geruza-hautapena"
 
-#: app/display/gimpdisplayshell-scale.c:537
+#: ../app/display/gimpdisplayshell-scale.c:541
 msgid "Zoom Ratio"
 msgstr "Zoomaren erlazioa"
 
-#: app/display/gimpdisplayshell-scale.c:539
+#: ../app/display/gimpdisplayshell-scale.c:543
 msgid "Select Zoom Ratio"
 msgstr "Hautatu zoomaren erlazioa"
 
-#: app/display/gimpdisplayshell-scale.c:574
+#: ../app/display/gimpdisplayshell-scale.c:578
 msgid "Zoom Ratio:"
 msgstr "Zoomaren erlazioa:"
 
-#: app/display/gimpdisplayshell-scale.c:601
+#: ../app/display/gimpdisplayshell-scale.c:605
 msgid "Zoom:"
 msgstr "Zooma:"
 
-#: app/display/gimpdisplayshell-title.c:234
+#: ../app/display/gimpdisplayshell-title.c:234
 msgid "RGB-empty"
-msgstr "RGB hutsik"
+msgstr "GBU hutsik"
 
-#: app/display/gimpdisplayshell-title.c:237
+#: ../app/display/gimpdisplayshell-title.c:237
 msgid "grayscale-empty"
 msgstr "gris-eskala hutsik"
 
-#: app/display/gimpdisplayshell-title.c:237
+#: ../app/display/gimpdisplayshell-title.c:237
 msgid "grayscale"
 msgstr "gris-eskala"
 
-#: app/display/gimpdisplayshell-title.c:240
+#: ../app/display/gimpdisplayshell-title.c:240
 msgid "indexed-empty"
 msgstr "indexatua hutsik"
 
-#: app/display/gimpdisplayshell-title.c:240
+#: ../app/display/gimpdisplayshell-title.c:240
 msgid "indexed"
 msgstr "indexatua"
 
-#: app/display/gimpdisplayshell-title.c:292
-#, fuzzy
+#: ../app/display/gimpdisplayshell-title.c:292
 msgid "(modified)"
-msgstr "Testua aldatuta"
+msgstr "(aldatuta)"
 
-#: app/display/gimpdisplayshell-title.c:298
+#: ../app/display/gimpdisplayshell-title.c:298
 msgid "(clean)"
-msgstr ""
+msgstr "(garbia)"
 
-#: app/display/gimpdisplayshell-title.c:325
+#: ../app/display/gimpdisplayshell-title.c:325
 msgid "1 layer"
 msgstr "Geruza bat"
 
-#: app/display/gimpdisplayshell-title.c:325
+#: ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layers"
 msgstr "%d geruza"
 
-#: app/display/gimpstatusbar.c:142
-#, fuzzy
+#: ../app/display/gimpstatusbar.c:142
 msgid "Shadow type"
-msgstr "Itzalak"
+msgstr "Itzal-mota"
 
-#: app/display/gimpstatusbar.c:143
+#: ../app/display/gimpstatusbar.c:143
 msgid "Style of bevel around the statusbar text"
-msgstr ""
+msgstr "Egoera-barrako testuaren inguruko alakaren estiloa"
 
-#: app/display/gimpstatusbar.c:218
+#: ../app/display/gimpstatusbar.c:229
 msgid "Cancel"
 msgstr "Utzi"
 
-#: app/file/file-open.c:105 app/file/file-save.c:132
+#: ../app/file/file-open.c:105 ../app/file/file-save.c:132
 msgid "Unknown file type"
 msgstr "Fitxategi-mota ezezaguna"
 
-#: app/file/file-open.c:120 app/file/file-save.c:146
+#: ../app/file/file-open.c:120 ../app/file/file-save.c:146
 msgid "Not a regular file"
 msgstr "Ez da fitxategi erregularra"
 
-#: app/file/file-open.c:173
+#: ../app/file/file-open.c:173
 msgid "Plug-In returned SUCCESS but did not return an image"
 msgstr "Plugin-ak SUCCESS eman du, baina ez du irudirik itzuli"
 
-#: app/file/file-open.c:181
+#: ../app/file/file-open.c:181
 msgid "Plug-In could not open image"
 msgstr "Plugin-ak ezin izan du irudia ireki"
 
-#: app/file/file-open.c:417
-#, fuzzy
+#: ../app/file/file-open.c:417
 msgid "Image doesn't contain any visible layers"
-msgstr "Oinarrizko hautapena ikusgai dauden geruza guztietan"
+msgstr "Irudiak ez du geruza ikusgairik"
 
-#: app/file/file-save.c:220
+#: ../app/file/file-save.c:220
 msgid "Plug-In could not save image"
 msgstr "Plugin-ak ezin izan du irudia gorde"
 
-#: app/file/file-utils.c:107
+#: ../app/file/file-utils.c:107
 msgid "Invalid character sequence in URI"
-msgstr "Karaktere-sekuentzia baliogabea URIn"
+msgstr "Karaktere-sekuentzia baliogabea URIan"
 
-#: app/gui/session.c:247 app/menus/menus.c:351 app/widgets/gimpdevices.c:218
-#, fuzzy, c-format
+#: ../app/gui/session.c:247 ../app/menus/menus.c:351
+#: ../app/widgets/gimpdevices.c:218
+#, c-format
 msgid "Deleting \"%s\" failed: %s"
-msgstr "Ezin izan da '%s' ireki: %s"
+msgstr "Huts egin du \"%s\" ezabatzean: %s"
 
-#: app/gui/splash.c:118
+#: ../app/gui/splash.c:118
 msgid "GIMP Startup"
 msgstr "GIMPen abioa"
 
-#: app/gui/themes.c:231 app/plug-in/plug-ins.c:254
+#: ../app/gui/themes.c:231 ../app/plug-in/plug-ins.c:254
 #, c-format
 msgid "Writing '%s'\n"
 msgstr "'%s' idazten\n"
 
-#: app/gui/themes.c:284
+#: ../app/gui/themes.c:284
 #, c-format
 msgid "Adding theme '%s' (%s)\n"
-msgstr ""
+msgstr "'%s' gaia gehitzen (%s)\n"
 
-#: app/paint/gimpairbrush.c:69 app/tools/gimpairbrushtool.c:55
+#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush"
 msgstr "Aerografoa"
 
-#: app/paint/gimpbrushcore.c:369
+#: ../app/paint/gimpbrushcore.c:369
 msgid "No brushes available for use with this tool."
 msgstr "Ez dago brotxa erabilgarririk tresna honekin erabiltzeko."
 
-#: app/paint/gimpclone.c:89 app/tools/gimpclonetool.c:89
+#: ../app/paint/gimpclone.c:89 ../app/tools/gimpclonetool.c:89
 msgid "Clone"
 msgstr "Klonatu"
 
-#: app/paint/gimpconvolve.c:121 app/tools/gimpconvolvetool.c:70
+#: ../app/paint/gimpconvolve.c:121 ../app/tools/gimpconvolvetool.c:70
 msgid "Convolve"
 msgstr "Konboluzioa"
 
-#: app/paint/gimpdodgeburn.c:87 app/tools/gimpdodgeburntool.c:70
+#: ../app/paint/gimpdodgeburn.c:87 ../app/tools/gimpdodgeburntool.c:70
 msgid "Dodge/Burn"
 msgstr "Zuritu/Belztu"
 
-#: app/paint/gimperaser.c:64 app/tools/gimperasertool.c:70
+#: ../app/paint/gimperaser.c:64 ../app/tools/gimperasertool.c:70
 msgid "Eraser"
 msgstr "Borragoma"
 
-#: app/paint/gimppaintbrush.c:65 app/tools/gimppaintbrushtool.c:51
+#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush"
 msgstr "Pintzela"
 
-#: app/paint/gimppencil.c:38 app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppencil.c:38 ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "Arkatza"
 
-#: app/paint/gimpsmudge.c:78 app/tools/gimpsmudgetool.c:54
+#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge"
 msgstr "Zirriborroa egin"
 
-#: app/paint/paint-enums.c:23
-#, fuzzy
+#: ../app/paint/paint-enums.c:23
 msgid "Image source"
 msgstr "Irudi-iturburua"
 
-#: app/paint/paint-enums.c:24
-#, fuzzy
+#: ../app/paint/paint-enums.c:24
 msgid "Pattern source"
 msgstr "Eredu-iturburua"
 
-#: app/paint/paint-enums.c:52
-#, fuzzy
+#: ../app/paint/paint-enums.c:52
 msgid "Non-aligned"
 msgstr "Lerrokatu gabe"
 
-#: app/paint/paint-enums.c:53
+#: ../app/paint/paint-enums.c:53
 msgid "Aligned"
 msgstr "Lerrokatuta"
 
-#: app/paint/paint-enums.c:54
+#: ../app/paint/paint-enums.c:54
 msgid "Registered"
 msgstr "Erregistratuta"
 
-#: app/paint/paint-enums.c:81 app/widgets/gimpwidgets-constructors.c:60
-#: app/widgets/gimpwidgets-constructors.c:93
+#: ../app/paint/paint-enums.c:81 ../app/widgets/gimpwidgets-constructors.c:60
+#: ../app/widgets/gimpwidgets-constructors.c:93
 msgid "Dodge"
 msgstr "Zuritu"
 
-#: app/paint/paint-enums.c:82 app/widgets/gimpwidgets-constructors.c:61
-#: app/widgets/gimpwidgets-constructors.c:94
+#: ../app/paint/paint-enums.c:82 ../app/widgets/gimpwidgets-constructors.c:61
+#: ../app/widgets/gimpwidgets-constructors.c:94
 msgid "Burn"
 msgstr "Belztu"
 
-#: app/paint/paint-enums.c:109
+#: ../app/paint/paint-enums.c:109
 msgid "Blur"
 msgstr "Lausotu"
 
-#: app/paint/paint-enums.c:110
+#: ../app/paint/paint-enums.c:110
 msgid "Sharpen"
-msgstr "Garbitu"
+msgstr "Enfokatzea"
 
-#: app/paint/paint-enums.c:167
+#: ../app/paint/paint-enums.c:167
 msgid "Constant"
 msgstr "Konstantea"
 
-#: app/paint/paint-enums.c:168 app/tools/gimppaintoptions-gui.c:163
+#: ../app/paint/paint-enums.c:168 ../app/tools/gimppaintoptions-gui.c:163
 msgid "Incremental"
 msgstr "Inkrementala"
 
-#: app/pdb/color_cmds.c:140 app/tools/gimpbrightnesscontrasttool.c:85
+#: ../app/pdb/color_cmds.c:140 ../app/tools/gimpbrightnesscontrasttool.c:85
 msgid "Brightness-Contrast"
 msgstr "Distira/Kontrastea"
 
-#: app/pdb/color_cmds.c:457 app/tools/gimpposterizetool.c:78
+#: ../app/pdb/color_cmds.c:457 ../app/tools/gimpposterizetool.c:78
 msgid "Posterize"
 msgstr "Posterizatu"
 
-#: app/pdb/color_cmds.c:745 app/pdb/color_cmds.c:870
-#: app/tools/gimpcurvestool.c:141
+#: ../app/pdb/color_cmds.c:745 ../app/pdb/color_cmds.c:870
+#: ../app/tools/gimpcurvestool.c:141
 msgid "Curves"
 msgstr "Kurbak"
 
-#: app/pdb/color_cmds.c:995 app/tools/gimpcolorbalancetool.c:96
+#: ../app/pdb/color_cmds.c:995 ../app/tools/gimpcolorbalancetool.c:96
 msgid "Color Balance"
 msgstr "Kolore-balantzea"
 
-#: app/pdb/color_cmds.c:1120 app/tools/gimpcolorizetool.c:96
+#: ../app/pdb/color_cmds.c:1120 ../app/tools/gimpcolorizetool.c:96
 msgid "Colorize"
 msgstr "Koloreztatu"
 
-#: app/pdb/color_cmds.c:1399 app/tools/gimphuesaturationtool.c:110
+#: ../app/pdb/color_cmds.c:1399 ../app/tools/gimphuesaturationtool.c:110
 msgid "Hue-Saturation"
 msgstr "Ñabardura/Saturazioa"
 
-#: app/pdb/color_cmds.c:1506 app/tools/gimpthresholdtool.c:92
+#: ../app/pdb/color_cmds.c:1506 ../app/tools/gimpthresholdtool.c:92
 msgid "Threshold"
 msgstr "Muga"
 
-#: app/pdb/drawable_transform_cmds.c:249 app/pdb/drawable_transform_cmds.c:404
-#, fuzzy
+#: ../app/pdb/drawable_transform_cmds.c:249
+#: ../app/pdb/drawable_transform_cmds.c:404
 msgid "Flip..."
-msgstr "Iraultzen..."
+msgstr "Irauli..."
 
-#: app/pdb/drawable_transform_cmds.c:563 app/pdb/drawable_transform_cmds.c:746
-#: app/pdb/transform_tools_cmds.c:197 app/tools/gimpperspectivetool.c:141
+#: ../app/pdb/drawable_transform_cmds.c:563
+#: ../app/pdb/drawable_transform_cmds.c:746
+#: ../app/pdb/transform_tools_cmds.c:197
+#: ../app/tools/gimpperspectivetool.c:141
 msgid "Perspective..."
 msgstr "Perspektiba..."
 
-#: app/pdb/drawable_transform_cmds.c:1650
-#: app/pdb/drawable_transform_cmds.c:1791 app/pdb/transform_tools_cmds.c:586
-#: app/tools/gimpsheartool.c:158
+#: ../app/pdb/drawable_transform_cmds.c:1650
+#: ../app/pdb/drawable_transform_cmds.c:1791
+#: ../app/pdb/transform_tools_cmds.c:586 ../app/tools/gimpsheartool.c:158
 msgid "Shearing..."
 msgstr "Zizailatzen..."
 
-#: app/pdb/drawable_transform_cmds.c:1943
-#: app/pdb/drawable_transform_cmds.c:2124
-#: app/pdb/drawable_transform_cmds.c:2311
-#: app/pdb/drawable_transform_cmds.c:2512 app/pdb/transform_tools_cmds.c:719
-#, fuzzy
+#: ../app/pdb/drawable_transform_cmds.c:1943
+#: ../app/pdb/drawable_transform_cmds.c:2124
+#: ../app/pdb/drawable_transform_cmds.c:2311
+#: ../app/pdb/drawable_transform_cmds.c:2512
+#: ../app/pdb/transform_tools_cmds.c:719
 msgid "2D Transform..."
-msgstr "Eraldatzen..."
+msgstr "2D eraldatzea..."
 
-#: app/pdb/edit_cmds.c:673 app/tools/gimpblendtool.c:249
+#: ../app/pdb/edit_cmds.c:673 ../app/tools/gimpblendtool.c:249
 msgid "Blending..."
 msgstr "Nahasten..."
 
-#: app/pdb/image_cmds.c:3756 app/text/gimptext-parasite.c:168
+#: ../app/pdb/image_cmds.c:3767 ../app/text/gimptext-parasite.c:168
 msgid "(invalid UTF-8 string)"
 msgstr "(UTF-8 kate baliogabea)"
 
-#: app/pdb/image_cmds.c:3898
-msgid ""
-"Image resolution is out of bounds, using the default resolution instead."
+#: ../app/pdb/image_cmds.c:3909
+msgid "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 "Irudiaren bereizmena mugetatik kanpo dago, bereizmen lehenetsia erabiliko da "
 "horren ordez."
 
-#: app/pdb/internal_procs.c:86
+#: ../app/pdb/internal_procs.c:86
 msgid "Internal Procedures"
 msgstr "Barne-prozedurak"
 
-#: app/pdb/internal_procs.c:86
-#, fuzzy
+#: ../app/pdb/internal_procs.c:86
 msgid "Brush"
-msgstr "Brotxa:"
+msgstr "Brotxa"
 
-#: app/pdb/internal_procs.c:89
+#: ../app/pdb/internal_procs.c:89
 msgid "Brush UI"
 msgstr "Brotxen erabiltzailearen interfazea"
 
-#: app/pdb/internal_procs.c:98 app/tools/gimppaintoptions-gui.c:283
-#: app/widgets/gimpwidgets-constructors.c:75
-#: app/widgets/gimpwidgets-constructors.c:108
+#: ../app/pdb/internal_procs.c:98 ../app/tools/gimppaintoptions-gui.c:283
+#: ../app/widgets/gimpwidgets-constructors.c:75
+#: ../app/widgets/gimpwidgets-constructors.c:108
 msgid "Color"
 msgstr "Kolorea"
 
-#: app/pdb/internal_procs.c:104
+#: ../app/pdb/internal_procs.c:104
 msgid "Convert"
 msgstr "Bihurtu"
 
-#: app/pdb/internal_procs.c:107
+#: ../app/pdb/internal_procs.c:107
 msgid "Display procedures"
 msgstr "Bistaratu prozedurak"
 
-#: app/pdb/internal_procs.c:110
+#: ../app/pdb/internal_procs.c:110
 msgid "Drawable procedures"
 msgstr "Marrazgaien prozedurak"
 
-#: app/pdb/internal_procs.c:113
-#, fuzzy
+#: ../app/pdb/internal_procs.c:113
 msgid "Transformation procedures"
-msgstr "Eraldatze-tresnen prozedurak"
+msgstr "Eraldatze-prozedurak"
 
-#: app/pdb/internal_procs.c:116
+#: ../app/pdb/internal_procs.c:116
 msgid "Edit procedures"
 msgstr "Editatu prozedurak"
 
-#: app/pdb/internal_procs.c:119
+#: ../app/pdb/internal_procs.c:119
 msgid "File Operations"
 msgstr "Fitxategi-eragiketak"
 
-#: app/pdb/internal_procs.c:122
+#: ../app/pdb/internal_procs.c:122
 msgid "Floating selections"
 msgstr "Hautapen mugikorrak"
 
-#: app/pdb/internal_procs.c:125
+#: ../app/pdb/internal_procs.c:125
 msgid "Font UI"
-msgstr "Letra-tipoen erabiltzailearen interfazea"
+msgstr "Letra-tipoak hautatzeko interfazea"
 
-#: app/pdb/internal_procs.c:131
+#: ../app/pdb/internal_procs.c:131
 msgid "Gimprc procedures"
 msgstr "Gimprc prozedurak"
 
-#: app/pdb/internal_procs.c:134
-#, fuzzy
+#: ../app/pdb/internal_procs.c:134
 msgid "Gradient"
-msgstr "Gradientea:"
+msgstr "Gradientea"
 
-#: app/pdb/internal_procs.c:137
+#: ../app/pdb/internal_procs.c:137
 msgid "Gradient UI"
-msgstr "Gradienteen erabiltzailearen interfazea"
+msgstr "Gradienteak hautatzeko interfazea"
 
-#: app/pdb/internal_procs.c:143
+#: ../app/pdb/internal_procs.c:143
 msgid "Guide procedures"
 msgstr "Giden prozedurak"
 
-#: app/pdb/internal_procs.c:146
+#: ../app/pdb/internal_procs.c:146
 msgid "Help procedures"
 msgstr "Laguntzaren prozedurak"
 
-#: app/pdb/internal_procs.c:155
+#: ../app/pdb/internal_procs.c:155
 msgid "Message procedures"
 msgstr "Mezuen prozedurak"
 
-#: app/pdb/internal_procs.c:158
+#: ../app/pdb/internal_procs.c:158
 msgid "Miscellaneous"
 msgstr "Hainbat"
 
-#: app/pdb/internal_procs.c:161
+#: ../app/pdb/internal_procs.c:161
 msgid "Paint Tool procedures"
 msgstr "Margotzeko tresnen prozedurak"
 
-#: app/pdb/internal_procs.c:164
+#: ../app/pdb/internal_procs.c:164
 msgid "Palette"
 msgstr "Paleta"
 
-#: app/pdb/internal_procs.c:167
+#: ../app/pdb/internal_procs.c:167
 msgid "Palette UI"
-msgstr "Paletaren erabiltzailearen interfazea"
+msgstr "Paletak hautatzeko interfazea"
 
-#: app/pdb/internal_procs.c:173
+#: ../app/pdb/internal_procs.c:173
 msgid "Parasite procedures"
 msgstr "Prozedura parasitoak"
 
-#: app/pdb/internal_procs.c:182
+#: ../app/pdb/internal_procs.c:182
 msgid "Pattern UI"
-msgstr "Ereduen erabiltzailearen interfazea"
+msgstr "Ereduak hautatzeko interfazea"
 
-#: app/pdb/internal_procs.c:188
+#: ../app/pdb/internal_procs.c:188
 msgid "Plug-in"
 msgstr "Plugin-a"
 
-#: app/pdb/internal_procs.c:191
+#: ../app/pdb/internal_procs.c:191
 msgid "Procedural database"
 msgstr "Prozeduren datu-basea"
 
-#: app/pdb/internal_procs.c:194 app/widgets/gimpprogressdialog.c:239
+#: ../app/pdb/internal_procs.c:194 ../app/widgets/gimpprogressdialog.c:239
 msgid "Progress"
 msgstr "Aurrerapena"
 
-#: app/pdb/internal_procs.c:197
+#: ../app/pdb/internal_procs.c:197
 msgid "Image mask"
 msgstr "Irudi-maskara"
 
-#: app/pdb/internal_procs.c:200
+#: ../app/pdb/internal_procs.c:200
 msgid "Selection Tool procedures"
 msgstr "Hautapen-tresnen prozedurak"
 
-#: app/pdb/internal_procs.c:203
+#: ../app/pdb/internal_procs.c:203
 msgid "Text procedures"
 msgstr "Testu-prozedurak"
 
-#: app/pdb/internal_procs.c:206
+#: ../app/pdb/internal_procs.c:206
 msgid "Transform Tool procedures"
 msgstr "Eraldatze-tresnen prozedurak"
 
-#: app/pdb/procedural_db.c:254
+#: ../app/pdb/procedural_db.c:254
 #, c-format
 msgid ""
 "PDB calling error:\n"
@@ -8569,7 +7895,7 @@ msgstr ""
 "PDB dei-errorea:\n"
 "'%s' prozedura ez da aurkitu"
 
-#: app/pdb/procedural_db.c:275 app/pdb/procedural_db.c:387
+#: ../app/pdb/procedural_db.c:275 ../app/pdb/procedural_db.c:392
 #, c-format
 msgid ""
 "PDB calling error for procedure '%s':\n"
@@ -8578,32 +7904,32 @@ msgstr ""
 "PDB dei-errorea '%s' prozedurarako:\n"
 "#%d argumentuaren mota ez dator bat (%s espero zen, %s jaso da)"
 
-#: app/pdb/procedural_db_cmds.c:80
+#: ../app/pdb/procedural_db_cmds.c:80
 msgid "Internal GIMP procedure"
 msgstr "GIMPen barne-prozedura"
 
-#: app/pdb/procedural_db_cmds.c:81
+#: ../app/pdb/procedural_db_cmds.c:81
 msgid "GIMP Plug-In"
 msgstr "GIMPen plugin-a"
 
-#: app/pdb/procedural_db_cmds.c:82
+#: ../app/pdb/procedural_db_cmds.c:82
 msgid "GIMP Extension"
 msgstr "GIMPen luzapena"
 
-#: app/pdb/procedural_db_cmds.c:83
+#: ../app/pdb/procedural_db_cmds.c:83
 msgid "Temporary Procedure"
 msgstr "Aldi baterako prozedura"
 
-#: app/pdb/selection_tools_cmds.c:332 app/tools/gimpfreeselecttool.c:96
+#: ../app/pdb/selection_tools_cmds.c:332 ../app/tools/gimpfreeselecttool.c:96
 msgid "Free Select"
 msgstr "Hautapen librea"
 
-#: app/plug-in/plug-in.c:544 app/plug-in/plug-in.c:574
-#, fuzzy, c-format
+#: ../app/plug-in/plug-in.c:551 ../app/plug-in/plug-in.c:581
+#, c-format
 msgid "Terminating plug-in: '%s'\n"
-msgstr "plugin-a kontsultatzen: \"%s\"\n"
+msgstr "Plugin-a amaitzen: '%s'\n"
 
-#: app/plug-in/plug-in.c:730
+#: ../app/plug-in/plug-in.c:737
 #, c-format
 msgid ""
 "Plug-In crashed: \"%s\"\n"
@@ -8618,77 +7944,75 @@ msgstr ""
 "Baliteke huts egin duen plugin-ak GIMPen barneko egoera nahaspilatu izana. "
 "Irudiak gordetzea eta GIMP berrabiaraztea komeni zaizu, segurutik jokatzeko."
 
-#: app/plug-in/plug-in-rc.c:176
+#: ../app/plug-in/plug-in-rc.c:176
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
-msgstr ""
+msgstr "'%s' baztertzen: okerreko GIMP protokolo bertsioa"
 
-#: app/plug-in/plug-in-rc.c:432
-#, fuzzy, c-format
+#: ../app/plug-in/plug-in-rc.c:432
+#, c-format
 msgid "invalid value '%s' for icon type"
-msgstr "baliogabeko '%s' balioa %s tokenarentzat"
+msgstr "ikono-motaren baliogabeko '%s' balioa"
 
-#: app/plug-in/plug-in-rc.c:447
-#, fuzzy, c-format
+#: ../app/plug-in/plug-in-rc.c:447
+#, c-format
 msgid "invalid value '%ld' for icon type"
-msgstr "Baliogabeko '%ld' balioa %s tokenarentzat"
+msgstr "ikono-motaren baliogabeko '%ld' balioa"
 
-#: app/plug-in/plug-ins.c:139
+#: ../app/plug-in/plug-ins.c:139
 msgid "Resource configuration"
 msgstr "Baliabideen konfigurazioa"
 
 #. Query any plug-ins that have changed since we last wrote out
 #. *  the pluginrc file.
 #.
-#: app/plug-in/plug-ins.c:153
+#: ../app/plug-in/plug-ins.c:153
 msgid "Querying new Plug-ins"
 msgstr "Plugin berriak kontsultatzen"
 
-#: app/plug-in/plug-ins.c:170
+#: ../app/plug-in/plug-ins.c:170
 #, c-format
 msgid "Querying plug-in: '%s'\n"
 msgstr "plugin-a kontsultatzen: \"%s\"\n"
 
 #. initialize the plug-ins
-#: app/plug-in/plug-ins.c:180
+#: ../app/plug-in/plug-ins.c:180
 msgid "Initializing Plug-ins"
 msgstr "Plugin-ak abiarazten"
 
-#: app/plug-in/plug-ins.c:194
+#: ../app/plug-in/plug-ins.c:194
 #, c-format
 msgid "Initializing plug-in: '%s'\n"
 msgstr "Plugin-a abiarazten: \"%s\"\n"
 
-#: app/plug-in/plug-ins.c:351
+#: ../app/plug-in/plug-ins.c:351
 msgid "Starting Extensions"
 msgstr "Luzapenak abiarazten"
 
-#: app/plug-in/plug-ins.c:358
+#: ../app/plug-in/plug-ins.c:358
 #, c-format
 msgid "Starting extension: '%s'\n"
 msgstr "Luzapenak abiarazten: \"%s\"\n"
 
-#: app/text/text-enums.c:81
-#, fuzzy
+#: ../app/text/text-enums.c:81
 msgid "Left justified"
 msgstr "Ezkerrean lerrokatuta"
 
-#: app/text/text-enums.c:82
-#, fuzzy
+#: ../app/text/text-enums.c:82
 msgid "Right justified"
 msgstr "Eskuinean lerrokatuta"
 
-#: app/text/text-enums.c:83
+#: ../app/text/text-enums.c:83
 msgid "Centered"
 msgstr "Zentratuta"
 
-#: app/text/text-enums.c:84
+#: ../app/text/text-enums.c:84
 msgid "Filled"
 msgstr "Beteta"
 
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
-#: app/text/gimpfont.c:39
+#: ../app/text/gimpfont.c:39
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -8696,60 +8020,55 @@ msgstr ""
 "Gure etxe berrian ez da urik sartzen\n"
 "ateri dagoenean."
 
-#: app/text/gimptext-compat.c:106 app/tools/gimptexttool.c:697
+#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:699
 msgid "Add Text Layer"
 msgstr "Gehitu testu-geruza"
 
-#: app/text/gimptextlayer.c:170
+#: ../app/text/gimptextlayer.c:170
 msgid "Text Layer"
 msgstr "Testu-geruza"
 
-#: app/text/gimptextlayer.c:171
-#, fuzzy
+#: ../app/text/gimptextlayer.c:171
 msgid "Rename Text Layer"
-msgstr "Aldatu geruzaren izena"
+msgstr "Aldatu testuaren izena"
 
-#: app/text/gimptextlayer.c:172
-#, fuzzy
+#: ../app/text/gimptextlayer.c:172
 msgid "Move Text Layer"
-msgstr "Biratu testu-geruza"
+msgstr "Aldatu testu-geruza lekuz"
 
-#: app/text/gimptextlayer.c:173
-#, fuzzy
+#: ../app/text/gimptextlayer.c:173
 msgid "Scale Text Layer"
-msgstr "Eskalatu geruza"
+msgstr "Eskalatu testu-geruza"
 
-#: app/text/gimptextlayer.c:174
-#, fuzzy
+#: ../app/text/gimptextlayer.c:174
 msgid "Resize Text Layer"
-msgstr "Aldatu geruza tamainaz"
+msgstr "Aldatu testu-geruza tamainaz"
 
-#: app/text/gimptextlayer.c:175
+#: ../app/text/gimptextlayer.c:175
 msgid "Flip Text Layer"
 msgstr "Irauli testu-geruza"
 
-#: app/text/gimptextlayer.c:176
+#: ../app/text/gimptextlayer.c:176
 msgid "Rotate Text Layer"
 msgstr "Biratu testu-geruza"
 
-#: app/text/gimptextlayer.c:177
-#, fuzzy
+#: ../app/text/gimptextlayer.c:177
 msgid "Transform Text Layer"
-msgstr "Eraldatu geruza"
+msgstr "Eraldatu testu-geruza"
 
-#: app/text/gimptextlayer.c:531
+#: ../app/text/gimptextlayer.c:531
 msgid "Discard Text Information"
 msgstr "Baztertu informazioaren testua"
 
-#: app/text/gimptextlayer.c:581
+#: ../app/text/gimptextlayer.c:581
 msgid "Due to lack of any fonts, text functionality is not available."
-msgstr ""
+msgstr "Tipografiak falta direla eta, testu funtzionalitatea ez dago eskuragarri."
 
-#: app/text/gimptextlayer.c:616
+#: ../app/text/gimptextlayer.c:616
 msgid "Empty Text Layer"
 msgstr "Testu-geruza hutsa"
 
-#: app/text/gimptextlayer-xcf.c:73
+#: ../app/text/gimptextlayer-xcf.c:73
 #, c-format
 msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
@@ -8758,1276 +8077,1189 @@ msgid ""
 "Some text properties may be wrong. Unless you want to edit the text layer, "
 "you don't need to worry about this."
 msgstr ""
+"Arazoak egon dira '%s' geruzako testu-parasitoa analizatzean:\n"
+"%s\n"
+"\n"
+"Testu-propietate batzuk gaizki daude. Testu-geruza editatzea ez baduzu nahi, "
+"ez duzu zer kezkatu beharrik."
 
-#: app/tools/tools-enums.c:25
-#, fuzzy
+#: ../app/tools/tools-enums.c:25
 msgid "Pick only"
 msgstr "Hautatu bakarrik"
 
-#: app/tools/tools-enums.c:26
-#, fuzzy
+#: ../app/tools/tools-enums.c:26
 msgid "Set foreground color"
 msgstr "Ezarri aurreko planoaren kolorea"
 
-#: app/tools/tools-enums.c:27
-#, fuzzy
+#: ../app/tools/tools-enums.c:27
 msgid "Set background color"
 msgstr "Ezarri atzeko planoaren kolorea"
 
-#: app/tools/tools-enums.c:54
+#: ../app/tools/tools-enums.c:54
 msgid "Crop"
 msgstr "Ebaki"
 
-#: app/tools/tools-enums.c:55
+#: ../app/tools/tools-enums.c:55
 msgid "Resize"
 msgstr "Aldatu tamaina"
 
-#: app/tools/tools-enums.c:83
-#, fuzzy
+#: ../app/tools/tools-enums.c:83
 msgid "Free select"
 msgstr "Hautapen librea"
 
-#: app/tools/tools-enums.c:84
-#, fuzzy
+#: ../app/tools/tools-enums.c:84
 msgid "Fixed size"
 msgstr "Tamaina finkoa"
 
-#: app/tools/tools-enums.c:85
-#, fuzzy
+#: ../app/tools/tools-enums.c:85
 msgid "Fixed aspect ratio"
 msgstr "Aspektu-erlazio finkoa"
 
-#: app/tools/tools-enums.c:113
-#, fuzzy
+#: ../app/tools/tools-enums.c:113
 msgid "Transform layer"
 msgstr "Eraldatu geruza"
 
-#: app/tools/tools-enums.c:114
-#, fuzzy
+#: ../app/tools/tools-enums.c:114
 msgid "Transform selection"
 msgstr "Eraldatu hautapena"
 
-#: app/tools/tools-enums.c:115
-#, fuzzy
+#: ../app/tools/tools-enums.c:115
 msgid "Transform path"
 msgstr "Eraldatu bidea"
 
-#: app/tools/tools-enums.c:143
+#: ../app/tools/tools-enums.c:143
 msgid "Design"
-msgstr ""
+msgstr "Diseinua"
 
-#: app/tools/tools-enums.c:145 app/tools/gimpmovetool.c:116
+#: ../app/tools/tools-enums.c:145 ../app/tools/gimpmovetool.c:116
 msgid "Move"
 msgstr "Lekuz aldatu"
 
-#: app/tools/tools-enums.c:174
+#: ../app/tools/tools-enums.c:174
 msgid "Outline"
-msgstr ""
+msgstr "Eskema"
 
-#: app/tools/tools-enums.c:177
-#, fuzzy
+#: ../app/tools/tools-enums.c:177
 msgid "Image + Grid"
-msgstr "Irudiaren sareta"
+msgstr "Irudia + sareta"
 
-#: app/tools/tools-enums.c:204
-#, fuzzy
+#: ../app/tools/tools-enums.c:204
 msgid "Number of grid lines"
 msgstr "Sareta-lerroen kopurua"
 
-#: app/tools/tools-enums.c:205
-#, fuzzy
+#: ../app/tools/tools-enums.c:205
 msgid "Grid line spacing"
 msgstr "Sareta-lerroen tartea"
 
-#: app/tools/gimp-tools.c:283
+#: ../app/tools/gimp-tools.c:284
 msgid "This tool has no options."
 msgstr "Tresna honek ez du aukerarik."
 
-#: app/tools/gimpairbrushtool.c:56
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "Airbrush with variable pressure"
 msgstr "Aerografoa presio aldagarriarekin"
 
-#: app/tools/gimpairbrushtool.c:57
-#, fuzzy
+#: ../app/tools/gimpairbrushtool.c:57
 msgid "_Airbrush"
-msgstr "Aerografoa"
+msgstr "_Aerografoa"
 
-#: app/tools/gimpairbrushtool.c:123 app/tools/gimpconvolvetool.c:211
-#: app/tools/gimpsmudgetool.c:123
+#: ../app/tools/gimpairbrushtool.c:123 ../app/tools/gimpconvolvetool.c:211
+#: ../app/tools/gimpsmudgetool.c:123
 msgid "Rate:"
 msgstr "Abiadura:"
 
-#: app/tools/gimpairbrushtool.c:129
+#: ../app/tools/gimpairbrushtool.c:129
 msgid "Pressure:"
 msgstr "Presioa:"
 
-#: app/tools/gimpblendoptions.c:246
+#: ../app/tools/gimpblendoptions.c:246
 msgid "Offset:"
 msgstr "Desplazamendua:"
 
-#: app/tools/gimpblendoptions.c:255 app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:255 ../app/widgets/gimpbrusheditor.c:145
 msgid "Shape:"
 msgstr "Forma:"
 
-#: app/tools/gimpblendoptions.c:261 app/tools/gimppaintoptions-gui.c:417
+#: ../app/tools/gimpblendoptions.c:261 ../app/tools/gimppaintoptions-gui.c:419
 msgid "Repeat:"
 msgstr "Errepikatu:"
 
-#: app/tools/gimpblendoptions.c:279
-#, fuzzy
+#: ../app/tools/gimpblendoptions.c:279
 msgid "Adaptive supersampling"
 msgstr "Gainlaginketa moldakorra"
 
-#: app/tools/gimpblendoptions.c:297
+#: ../app/tools/gimpblendoptions.c:297
 msgid "Max Depth:"
 msgstr "Gehienezko sakonera:"
 
-#: app/tools/gimpblendoptions.c:304 app/tools/gimpbucketfilloptions.c:295
-#: app/tools/gimpmagnifyoptions.c:226 app/tools/gimpselectionoptions.c:466
+#: ../app/tools/gimpblendoptions.c:304
+#: ../app/tools/gimpbucketfilloptions.c:295
+#: ../app/tools/gimpmagnifyoptions.c:226
+#: ../app/tools/gimpselectionoptions.c:466
 msgid "Threshold:"
 msgstr "Muga:"
 
-#: app/tools/gimpblendtool.c:102
+#: ../app/tools/gimpblendtool.c:102
 msgid "Fill with a color gradient"
 msgstr "Bete kolore-gradiente batekin"
 
-#: app/tools/gimpblendtool.c:103
-#, fuzzy
+#: ../app/tools/gimpblendtool.c:103
 msgid "Blen_d"
-msgstr "Nahastuta"
+msgstr "_Nahastuta"
 
-#: app/tools/gimpblendtool.c:191
+#: ../app/tools/gimpblendtool.c:191
 msgid "Blend: Invalid for indexed images."
 msgstr "Nahastea: ez du balio irudi indexatuentzat."
 
 #. initialize the statusbar display
-#: app/tools/gimpblendtool.c:209 app/tools/gimpblendtool.c:308
+#: ../app/tools/gimpblendtool.c:209 ../app/tools/gimpblendtool.c:308
 msgid "Blend: "
 msgstr "Nahastea: "
 
-#: app/tools/gimpbrightnesscontrasttool.c:86
+#: ../app/tools/gimpbrightnesscontrasttool.c:86
 msgid "Adjust brightness and contrast"
 msgstr "Doitu distira eta kontrastea"
 
-#: app/tools/gimpbrightnesscontrasttool.c:87
-#, fuzzy
+#: ../app/tools/gimpbrightnesscontrasttool.c:87
 msgid "B_rightness-Contrast..."
-msgstr "Distira/Kontrastea"
+msgstr "_Distira-Kontrastea..."
 
-#: app/tools/gimpbrightnesscontrasttool.c:138
+#: ../app/tools/gimpbrightnesscontrasttool.c:138
 msgid "Adjust Brightness and Contrast"
 msgstr "Doitu distira eta kontrastea"
 
-#: app/tools/gimpbrightnesscontrasttool.c:181
+#: ../app/tools/gimpbrightnesscontrasttool.c:181
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "Distirak/Kontrasteak ez du geruza indexatuetan funtzionatzen."
 
-#: app/tools/gimpbrightnesscontrasttool.c:236
+#: ../app/tools/gimpbrightnesscontrasttool.c:236
 msgid "_Brightness:"
 msgstr "_Distira:"
 
-#: app/tools/gimpbrightnesscontrasttool.c:251
+#: ../app/tools/gimpbrightnesscontrasttool.c:251
 msgid "Con_trast:"
 msgstr "Kon_trastea:"
 
-#: app/tools/gimpbucketfilloptions.c:129
+#: ../app/tools/gimpbucketfilloptions.c:129
 msgid "Allow completely transparent regions to be filled"
 msgstr "Utzi guztiz gardenak diren eskualdeak betetzen"
 
-#: app/tools/gimpbucketfilloptions.c:135
+#: ../app/tools/gimpbucketfilloptions.c:135
 msgid "Base filled area on all visible layers"
 msgstr "Oinarri-area betea ikusgai dauden geruza guztietan"
 
-#: app/tools/gimpbucketfilloptions.c:141 app/tools/gimpselectionoptions.c:161
+#: ../app/tools/gimpbucketfilloptions.c:141
+#: ../app/tools/gimpselectionoptions.c:161
 msgid "Maximum color difference"
 msgstr "Gehienezko kolore-diferentzia"
 
 #. fill type
-#: app/tools/gimpbucketfilloptions.c:238
+#: ../app/tools/gimpbucketfilloptions.c:238
 #, c-format
 msgid "Fill Type  %s"
 msgstr "Betegarri-mota: %s"
 
 #. fill selection
-#: app/tools/gimpbucketfilloptions.c:250
+#: ../app/tools/gimpbucketfilloptions.c:250
 #, c-format
 msgid "Affected Area  %s"
-msgstr ""
+msgstr "Eragindako area: %s"
 
-#: app/tools/gimpbucketfilloptions.c:254
-#, fuzzy
+#: ../app/tools/gimpbucketfilloptions.c:254
 msgid "Fill whole selection"
 msgstr "Bete hautapen osoa"
 
-#: app/tools/gimpbucketfilloptions.c:255
-#, fuzzy
+#: ../app/tools/gimpbucketfilloptions.c:255
 msgid "Fill similar colors"
 msgstr "Bete antzeko koloreak"
 
-#: app/tools/gimpbucketfilloptions.c:261 app/tools/gimpselectionoptions.c:438
+#: ../app/tools/gimpbucketfilloptions.c:261
+#: ../app/tools/gimpselectionoptions.c:438
 msgid "Finding Similar Colors"
 msgstr "Antzeko koloreak bilatzen"
 
-#: app/tools/gimpbucketfilloptions.c:277
-#, fuzzy
+#: ../app/tools/gimpbucketfilloptions.c:277
 msgid "Fill transparent areas"
 msgstr "Bete area gardenak"
 
-#: app/tools/gimpbucketfilloptions.c:283
-#: app/tools/gimpcolorpickeroptions.c:179 app/tools/gimpselectionoptions.c:454
-#: app/tools/gimpselectionoptions.c:502
-#, fuzzy
+#: ../app/tools/gimpbucketfilloptions.c:283
+#: ../app/tools/gimpcolorpickeroptions.c:179
+#: ../app/tools/gimpselectionoptions.c:454
+#: ../app/tools/gimpselectionoptions.c:502
 msgid "Sample merged"
 msgstr "Batutako lagina"
 
-#: app/tools/gimpbucketfilltool.c:92
+#: ../app/tools/gimpbucketfilltool.c:92
 msgid "Fill with a color or pattern"
 msgstr "Bete kolore edo eredu batez"
 
-#: app/tools/gimpbucketfilltool.c:93
-#, fuzzy
+#: ../app/tools/gimpbucketfilltool.c:93
 msgid "_Bucket Fill"
-msgstr "Bete"
+msgstr "_Betetzea"
 
-#: app/tools/gimpbycolorselecttool.c:82
+#: ../app/tools/gimpbycolorselecttool.c:83
 msgid "Select By Color"
 msgstr "Hautatu kolorearen arabera"
 
-#: app/tools/gimpbycolorselecttool.c:83
+#: ../app/tools/gimpbycolorselecttool.c:84
 msgid "Select regions by color"
 msgstr "Hautatu eskualdeak kolorearen arabera"
 
-#: app/tools/gimpbycolorselecttool.c:84
-#, fuzzy
+#: ../app/tools/gimpbycolorselecttool.c:85
 msgid "_By Color Select"
-msgstr "Geruza-hautapena"
+msgstr "_Geruza-hautapenaren arabera"
 
-#: app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:90
 msgid "Paint using Patterns or Image Regions"
 msgstr "Margotu ereduak edo irudi-eskualdeak erabiliz"
 
-#: app/tools/gimpclonetool.c:91
-#, fuzzy
+#: ../app/tools/gimpclonetool.c:91
 msgid "_Clone"
-msgstr "Klonatu"
+msgstr "_Klonatu"
 
-#: app/tools/gimpclonetool.c:266
+#: ../app/tools/gimpclonetool.c:288
 msgid "Source"
 msgstr "Iturburua"
 
-#: app/tools/gimpclonetool.c:275
+#: ../app/tools/gimpclonetool.c:297
 msgid "Alignment"
 msgstr "Lerrokatzea"
 
-#: app/tools/gimpcolorbalancetool.c:97
+#: ../app/tools/gimpcolorbalancetool.c:97
 msgid "Adjust color balance"
 msgstr "Doitu kolore-balantzea"
 
-#: app/tools/gimpcolorbalancetool.c:98
-#, fuzzy
+#: ../app/tools/gimpcolorbalancetool.c:98
 msgid "Color _Balance..."
-msgstr "Kolore-balantzea"
+msgstr "Kolore-_balantzea..."
 
-#: app/tools/gimpcolorbalancetool.c:149
+#: ../app/tools/gimpcolorbalancetool.c:149
 msgid "Adjust Color Balance"
 msgstr "Doitu kolore-balantzea"
 
-#: app/tools/gimpcolorbalancetool.c:193
+#: ../app/tools/gimpcolorbalancetool.c:193
 msgid "Color balance operates only on RGB color layers."
-msgstr "Kolore-balantzeak RGB koloreko geruzetan bakarrik funtzionatzen du."
+msgstr "Kolore-balantzeak GBU koloreko geruzetan bakarrik funtzionatzen du."
 
-#: app/tools/gimpcolorbalancetool.c:276
+#: ../app/tools/gimpcolorbalancetool.c:276
 msgid "Select Range to Modify"
 msgstr "Hautatu aldatu beharreko barrutia"
 
-#: app/tools/gimpcolorbalancetool.c:284
+#: ../app/tools/gimpcolorbalancetool.c:284
 msgid "Modify Selected Range's Color Levels"
 msgstr "Aldatu hautatutako barrutiaren kolore-mailak"
 
-#: app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimpcolorbalancetool.c:301
 msgid "Cyan"
 msgstr "Cyana"
 
-#: app/tools/gimpcolorbalancetool.c:308
+#: ../app/tools/gimpcolorbalancetool.c:308
 msgid "Magenta"
 msgstr "Magenta"
 
-#: app/tools/gimpcolorbalancetool.c:315
+#: ../app/tools/gimpcolorbalancetool.c:315
 msgid "Yellow"
 msgstr "Horia"
 
-#: app/tools/gimpcolorbalancetool.c:325
-#, fuzzy
+#: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset range"
 msgstr "Be_rrezarri barrutia"
 
-#: app/tools/gimpcolorbalancetool.c:334
-#, fuzzy
+#: ../app/tools/gimpcolorbalancetool.c:334
 msgid "Preserve _luminosity"
 msgstr "Mantendu _argitasuna"
 
-#: app/tools/gimpcolorizetool.c:97
+#: ../app/tools/gimpcolorizetool.c:97
 msgid "Colorize the image"
 msgstr "Koloreztatu irudia"
 
-#: app/tools/gimpcolorizetool.c:98
-#, fuzzy
+#: ../app/tools/gimpcolorizetool.c:98
 msgid "Colori_ze..."
-msgstr "Koloreztatu"
+msgstr "_Koloreztatu..."
 
-#: app/tools/gimpcolorizetool.c:152
+#: ../app/tools/gimpcolorizetool.c:152
 msgid "Colorize the Image"
 msgstr "Koloreztatu irudia"
 
-#: app/tools/gimpcolorizetool.c:195
+#: ../app/tools/gimpcolorizetool.c:195
 msgid "Colorize operates only on RGB color layers."
-msgstr "Koloreztatuk RGB koloreko geruzetan bakarrik funtzionatzen du."
+msgstr "Koloreztatuk GBU koloreko geruzetan bakarrik funtzionatzen du."
 
-#: app/tools/gimpcolorizetool.c:235
+#: ../app/tools/gimpcolorizetool.c:235
 msgid "Select Color"
 msgstr "Hautatu kolorea"
 
-#: app/tools/gimpcolorizetool.c:253 app/tools/gimphuesaturationtool.c:361
+#: ../app/tools/gimpcolorizetool.c:253
+#: ../app/tools/gimphuesaturationtool.c:361
 msgid "_Hue:"
 msgstr "_Ñabardura:"
 
-#: app/tools/gimpcolorizetool.c:267 app/tools/gimphuesaturationtool.c:389
+#: ../app/tools/gimpcolorizetool.c:267
+#: ../app/tools/gimphuesaturationtool.c:389
 msgid "_Saturation:"
 msgstr "_Saturazioa:"
 
-#: app/tools/gimpcolorizetool.c:281 app/tools/gimphuesaturationtool.c:375
+#: ../app/tools/gimpcolorizetool.c:281
+#: ../app/tools/gimphuesaturationtool.c:375
 msgid "_Lightness:"
 msgstr "_Argitasuna:"
 
-#: app/tools/gimpcoloroptions.c:184
-#, fuzzy
+#: ../app/tools/gimpcoloroptions.c:184
 msgid "Sample average"
 msgstr "Batez besteko lagina"
 
-#: app/tools/gimpcoloroptions.c:194 app/tools/gimpselectionoptions.c:416
-#: app/widgets/gimpbrusheditor.c:153
+#: ../app/tools/gimpcoloroptions.c:194 ../app/tools/gimpselectionoptions.c:416
+#: ../app/widgets/gimpbrusheditor.c:153
 msgid "Radius:"
 msgstr "Erradioa:"
 
 #. the pick FG/BG frame
-#: app/tools/gimpcolorpickeroptions.c:184
+#: ../app/tools/gimpcolorpickeroptions.c:184
 #, c-format
 msgid "Pick Mode  %s"
 msgstr "Hautatze-modua: %s"
 
 #. the add to palette toggle
-#: app/tools/gimpcolorpickeroptions.c:193
-#, fuzzy, c-format
+#: ../app/tools/gimpcolorpickeroptions.c:193
+#, c-format
 msgid "Add to palette  %s"
-msgstr "/_Editatu paleta..."
+msgstr "Gehitu %s paletara"
 
-#: app/tools/gimpcolorpickertool.c:99
+#: ../app/tools/gimpcolorpickertool.c:99
 msgid "Color Picker"
 msgstr "Kolore-hautatzailea"
 
-#: app/tools/gimpcolorpickertool.c:100
+#: ../app/tools/gimpcolorpickertool.c:100
 msgid "Pick colors from the image"
 msgstr "Hautatu koloreak iruditik"
 
-#: app/tools/gimpcolorpickertool.c:101
-#, fuzzy
+#: ../app/tools/gimpcolorpickertool.c:101
 msgid "C_olor Picker"
-msgstr "Kolore-hautatzailea"
+msgstr "_Kolore-hautatzailea"
 
 #. tool->gdisp->shell
-#: app/tools/gimpcolorpickertool.c:343
+#: ../app/tools/gimpcolorpickertool.c:343
 msgid "Color Picker Information"
 msgstr "Kolore-hautatzailearen informazioa"
 
-#: app/tools/gimpconvolvetool.c:71
+#: ../app/tools/gimpconvolvetool.c:71
 msgid "Blur or Sharpen"
 msgstr "Lausotu edo enfokatu"
 
-#: app/tools/gimpconvolvetool.c:72
-#, fuzzy
+#: ../app/tools/gimpconvolvetool.c:72
 msgid "Con_volve"
-msgstr "Konboluzioa"
+msgstr "_Konboluzioa"
 
 #. the type radio box
-#: app/tools/gimpconvolvetool.c:193
+#: ../app/tools/gimpconvolvetool.c:193
 #, c-format
 msgid "Convolve Type  %s"
-msgstr "%s konboluzio-mota "
+msgstr "%s konboluzio-mota"
 
 #. tool toggle
-#: app/tools/gimpcropoptions.c:188 app/tools/gimpmagnifyoptions.c:208
-#: app/tools/gimpmoveoptions.c:217
+#: ../app/tools/gimpcropoptions.c:188 ../app/tools/gimpmagnifyoptions.c:208
+#: ../app/tools/gimpmoveoptions.c:217
 #, c-format
 msgid "Tool Toggle  %s"
 msgstr "Aktibatu %s tresna"
 
-#: app/tools/gimpcropoptions.c:200
-#, fuzzy
+#: ../app/tools/gimpcropoptions.c:200
 msgid "Current layer only"
 msgstr "Uneko geruza bakarrik"
 
 #. enlarge toggle
-#: app/tools/gimpcropoptions.c:205
-#, fuzzy, c-format
+#: ../app/tools/gimpcropoptions.c:205
+#, c-format
 msgid "Allow enlarging  %s"
 msgstr "Utzi %s handitzen"
 
 #. layer toggle
-#: app/tools/gimpcropoptions.c:215
-#, fuzzy, c-format
+#: ../app/tools/gimpcropoptions.c:215
+#, c-format
 msgid "Keep aspect ratio  %s"
-msgstr "Aspektu-erlazio finkoa"
+msgstr "%s aspektu-erlazio finkoa"
 
-#: app/tools/gimpcroptool.c:164
+#: ../app/tools/gimpcroptool.c:164
 msgid "Crop & Resize"
 msgstr "Ebaki eta aldatu tamainaz"
 
-#: app/tools/gimpcroptool.c:165
+#: ../app/tools/gimpcroptool.c:165
 msgid "Crop or Resize an image"
 msgstr "Ebaki edo aldatu tamainaz irudia "
 
-#: app/tools/gimpcroptool.c:166
-#, fuzzy
+#: ../app/tools/gimpcroptool.c:166
 msgid "_Crop & Resize"
-msgstr "Ebaki eta aldatu tamainaz"
+msgstr "_Ebaki eta aldatu tamainaz"
 
 #. initialize the statusbar display
-#: app/tools/gimpcroptool.c:499 app/tools/gimpcroptool.c:983
+#: ../app/tools/gimpcroptool.c:499 ../app/tools/gimpcroptool.c:983
 msgid "Crop: "
 msgstr "Ebaki: "
 
-#: app/tools/gimpcroptool.c:1010
+#: ../app/tools/gimpcroptool.c:1010
 msgid "Crop & Resize Information"
 msgstr "Ebakitzearen eta tamaina aldatzearen informazioa"
 
-#: app/tools/gimpcroptool.c:1029
+#: ../app/tools/gimpcroptool.c:1029
 msgid "Origin X:"
 msgstr "X iturburua:"
 
-#: app/tools/gimpcroptool.c:1033
-#, fuzzy
+#: ../app/tools/gimpcroptool.c:1033
 msgid "Origin Y:"
-msgstr "X iturburua:"
+msgstr "Y iturburua:"
 
-#: app/tools/gimpcroptool.c:1071 app/widgets/gimpbrusheditor.c:194
-#, fuzzy
+#: ../app/tools/gimpcroptool.c:1071 ../app/widgets/gimpbrusheditor.c:194
 msgid "Aspect ratio:"
 msgstr "Aspektu-erlazioa:"
 
-#: app/tools/gimpcroptool.c:1082
-#, fuzzy
+#: ../app/tools/gimpcroptool.c:1082
 msgid "From selection"
 msgstr "Hautapenetik"
 
-#: app/tools/gimpcroptool.c:1090
-#, fuzzy
+#: ../app/tools/gimpcroptool.c:1090
 msgid "Auto shrink"
 msgstr "Uzkurtze automatikoa"
 
-#: app/tools/gimpcurvestool.c:142
+#: ../app/tools/gimpcurvestool.c:142
 msgid "Adjust color curves"
 msgstr "Doitu kolore-kurbak"
 
-#: app/tools/gimpcurvestool.c:143
-#, fuzzy
+#: ../app/tools/gimpcurvestool.c:143
 msgid "_Curves..."
-msgstr "Kurbak"
+msgstr "_Kurbak..."
 
-#: app/tools/gimpcurvestool.c:202
+#: ../app/tools/gimpcurvestool.c:202
 msgid "Adjust Color Curves"
 msgstr "Doitu kolore-kurbak"
 
-#: app/tools/gimpcurvestool.c:204
+#: ../app/tools/gimpcurvestool.c:204
 msgid "Load Curves"
-msgstr "kargatu kurbak"
+msgstr "Kargatu kurbak"
 
-#: app/tools/gimpcurvestool.c:205
-#, fuzzy
+#: ../app/tools/gimpcurvestool.c:205
 msgid "Load curves settings from file"
-msgstr "Irakurri kurben ezarpenak fitxategitik"
+msgstr "Kargatu kurben ezarpenak fitxategitik"
 
-#: app/tools/gimpcurvestool.c:206
+#: ../app/tools/gimpcurvestool.c:206
 msgid "Save Curves"
 msgstr "Gorde kurbak"
 
-#: app/tools/gimpcurvestool.c:207
+#: ../app/tools/gimpcurvestool.c:207
 msgid "Save curves settings to file"
 msgstr "Gorde kurben ezarpenak fitxategian"
 
-#: app/tools/gimpcurvestool.c:283
+#: ../app/tools/gimpcurvestool.c:283
 msgid "Curves for indexed layers cannot be adjusted."
 msgstr "Geruza indexatuentzako kurbak ezin dira doitu."
 
-#: app/tools/gimpcurvestool.c:479 app/tools/gimplevelstool.c:415
-#: app/widgets/gimphistogrameditor.c:161
+#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:419
+#: ../app/widgets/gimphistogrameditor.c:161
 msgid "Channel:"
 msgstr "Kanala:"
 
-#: app/tools/gimpcurvestool.c:494 app/tools/gimplevelstool.c:430
-#, fuzzy
+#: ../app/tools/gimpcurvestool.c:494 ../app/tools/gimplevelstool.c:434
 msgid "R_eset channel"
 msgstr "Berrezarri kana_la"
 
 #. Horizontal button box for load / save
-#: app/tools/gimpcurvestool.c:596 app/tools/gimplevelstool.c:640
+#: ../app/tools/gimpcurvestool.c:596 ../app/tools/gimplevelstool.c:644
 msgid "All Channels"
 msgstr "Kanal guztiak"
 
 #. The radio box for selecting the curve type
-#: app/tools/gimpcurvestool.c:614
+#: ../app/tools/gimpcurvestool.c:614
 msgid "Curve Type"
 msgstr "Kurba-mota"
 
-#: app/tools/gimpdodgeburntool.c:71
+#: ../app/tools/gimpdodgeburntool.c:71
 msgid "Dodge or Burn strokes"
 msgstr "Zuritu edo belztu trazuak"
 
-#: app/tools/gimpdodgeburntool.c:72
-#, fuzzy
+#: ../app/tools/gimpdodgeburntool.c:72
 msgid "Dod_geBurn"
-msgstr "Zuritu/Belztu"
+msgstr "_Zuritu-Belztu"
 
 #. the type (dodge or burn)
-#: app/tools/gimpdodgeburntool.c:192
+#: ../app/tools/gimpdodgeburntool.c:192
 #, c-format
 msgid "Type  %s"
 msgstr "Mota: %s"
 
-#: app/tools/gimpdodgeburntool.c:204
+#: ../app/tools/gimpdodgeburntool.c:204
 msgid "Mode"
 msgstr "Modua"
 
-#: app/tools/gimpdodgeburntool.c:216
+#: ../app/tools/gimpdodgeburntool.c:216
 msgid "Exposure:"
 msgstr "Esposizioa:"
 
-#: app/tools/gimpeditselectiontool.c:262
-#: app/tools/gimpeditselectiontool.c:1203
-#, fuzzy
+#: ../app/tools/gimpeditselectiontool.c:262
+#: ../app/tools/gimpeditselectiontool.c:1203
 msgid "Move Floating Selection"
-msgstr "Kendu hautapen mugikorra"
+msgstr "Aldatu hautapen mugikorra lekuz"
 
-#: app/tools/gimpeditselectiontool.c:464 app/tools/gimpeditselectiontool.c:732
+#: ../app/tools/gimpeditselectiontool.c:464
+#: ../app/tools/gimpeditselectiontool.c:732
 msgid "Move: "
 msgstr "Lekuz aldatu: "
 
-#: app/tools/gimpellipseselecttool.c:72
+#: ../app/tools/gimpellipseselecttool.c:72
 msgid "Select elliptical regions"
 msgstr "Hautatu eskualde eliptikoak"
 
-#: app/tools/gimpellipseselecttool.c:73
-#, fuzzy
+#: ../app/tools/gimpellipseselecttool.c:73
 msgid "_Ellipse Select"
-msgstr "Hautapen eliptikoa"
+msgstr "Hautapen _eliptikoa"
 
-#: app/tools/gimperasertool.c:71
+#: ../app/tools/gimperasertool.c:71
 msgid "Erase to background or transparency"
 msgstr "Ezabatu atzeko planoa edo gardentasuna"
 
-#: app/tools/gimperasertool.c:72
-#, fuzzy
+#: ../app/tools/gimperasertool.c:72
 msgid "_Eraser"
-msgstr "Borragoma"
+msgstr "_Borragoma"
 
 #. the anti_erase toggle
-#: app/tools/gimperasertool.c:185
-#, fuzzy, c-format
+#: ../app/tools/gimperasertool.c:185
+#, c-format
 msgid "Anti erase  %s"
 msgstr "Desezabatu %s"
 
-#: app/tools/gimpflipoptions.c:161 app/tools/gimpmoveoptions.c:211
-#: app/tools/gimptransformoptions.c:323
+#: ../app/tools/gimpflipoptions.c:161 ../app/tools/gimpmoveoptions.c:211
+#: ../app/tools/gimptransformoptions.c:323
 msgid "Affect:"
 msgstr "Eragina:"
 
 #. tool toggle
-#: app/tools/gimpflipoptions.c:167
+#: ../app/tools/gimpflipoptions.c:167
 #, c-format
 msgid "Flip Type  %s"
 msgstr "Iraultze-mota: %s"
 
-#: app/tools/gimpfliptool.c:83
+#: ../app/tools/gimpfliptool.c:83
 msgid "Flip the layer or selection"
 msgstr "Irauli geruza edo hautapena"
 
-#: app/tools/gimpfliptool.c:84
-#, fuzzy
+#: ../app/tools/gimpfliptool.c:84
 msgid "_Flip"
-msgstr "Irauli"
+msgstr "_Irauli"
 
-#: app/tools/gimpfreeselecttool.c:97
+#: ../app/tools/gimpfreeselecttool.c:97
 msgid "Select hand-drawn regions"
 msgstr "Hautatu eskuz marraztutako eskualdeak"
 
-#: app/tools/gimpfreeselecttool.c:98
-#, fuzzy
+#: ../app/tools/gimpfreeselecttool.c:98
 msgid "_Free Select"
-msgstr "Hautapen librea"
+msgstr "Hautapen _librea"
 
-#: app/tools/gimpfuzzyselecttool.c:98
+#: ../app/tools/gimpfuzzyselecttool.c:98
 msgid "Select contiguous regions"
 msgstr "Hautatu alboko eskualdeak"
 
-#: app/tools/gimpfuzzyselecttool.c:99
-#, fuzzy
+#: ../app/tools/gimpfuzzyselecttool.c:99
 msgid "Fu_zzy Select"
-msgstr "Hurbilketazko hautapena"
+msgstr "_Hurbilketazko hautapena"
 
-#: app/tools/gimphistogramoptions.c:151
+#: ../app/tools/gimphistogramoptions.c:151
 msgid "Histogram Scale"
 msgstr "Histograma-eskala"
 
-#: app/tools/gimphuesaturationtool.c:111
+#: ../app/tools/gimphuesaturationtool.c:111
 msgid "Adjust hue and saturation"
 msgstr "Doitu ñabardura eta saturazioa"
 
-#: app/tools/gimphuesaturationtool.c:112
-#, fuzzy
+#: ../app/tools/gimphuesaturationtool.c:112
 msgid "Hue-_Saturation..."
-msgstr "Ñabardura/Saturazioa"
+msgstr "Ñabardura-_Saturazioa..."
 
-#: app/tools/gimphuesaturationtool.c:166
-#, fuzzy
+#: ../app/tools/gimphuesaturationtool.c:166
 msgid "Adjust hue / lightness / saturation"
 msgstr "Doitu ñabardura / argitasuna/ saturazioa"
 
-#: app/tools/gimphuesaturationtool.c:210
+#: ../app/tools/gimphuesaturationtool.c:210
 msgid "Hue-Saturation operates only on RGB color layers."
-msgstr ""
-"Ñabardurak/Saturazioak RGB koloreko geruzetan bakarrik funtzionatzen du."
+msgstr "Ñabardurak/Saturazioak GBU koloreko geruzetan bakarrik funtzionatzen du."
 
-#: app/tools/gimphuesaturationtool.c:263
-#, fuzzy
+#: ../app/tools/gimphuesaturationtool.c:263
 msgid "M_aster"
 msgstr "_Maisua"
 
-#: app/tools/gimphuesaturationtool.c:264
+#: ../app/tools/gimphuesaturationtool.c:264
 msgid "_R"
 msgstr "_G"
 
-#: app/tools/gimphuesaturationtool.c:265
+#: ../app/tools/gimphuesaturationtool.c:265
 msgid "_Y"
 msgstr "_H"
 
-#: app/tools/gimphuesaturationtool.c:266
+#: ../app/tools/gimphuesaturationtool.c:266
 msgid "_G"
 msgstr "_B"
 
-#: app/tools/gimphuesaturationtool.c:267
+#: ../app/tools/gimphuesaturationtool.c:267
 msgid "_C"
 msgstr "_C"
 
-#: app/tools/gimphuesaturationtool.c:268
+#: ../app/tools/gimphuesaturationtool.c:268
 msgid "_B"
 msgstr "_U"
 
-#: app/tools/gimphuesaturationtool.c:269
+#: ../app/tools/gimphuesaturationtool.c:269
 msgid "_M"
 msgstr "_M"
 
-#: app/tools/gimphuesaturationtool.c:272
+#: ../app/tools/gimphuesaturationtool.c:272
 msgid "Select Primary Color to Modify"
 msgstr "Hautatu aldatu beharreko lehen mailako kolorea"
 
-#: app/tools/gimphuesaturationtool.c:300
+#: ../app/tools/gimphuesaturationtool.c:300
 msgid "Modify all colors"
 msgstr "Aldatu kolore guztiak"
 
-#: app/tools/gimphuesaturationtool.c:343
+#: ../app/tools/gimphuesaturationtool.c:343
 msgid "Modify Selected Color"
 msgstr "Aldatu hautatutako kolorea"
 
-#: app/tools/gimphuesaturationtool.c:405
-#, fuzzy
+#: ../app/tools/gimphuesaturationtool.c:405
 msgid "R_eset color"
 msgstr "Berr_ezarri kolorea"
 
-#: app/tools/gimpimagemaptool.c:259 app/widgets/gimpthumbbox.c:354
+#: ../app/tools/gimpimagemaptool.c:259 ../app/widgets/gimpthumbbox.c:354
 msgid "_Preview"
 msgstr "_Aurrebista"
 
-#: app/tools/gimpimagemaptool.c:292
-#, fuzzy
+#: ../app/tools/gimpimagemaptool.c:292
 msgid "Quick Load"
-msgstr "Maskara bizkorra"
+msgstr "Maskara azkarra"
 
-#: app/tools/gimpimagemaptool.c:322
-#, fuzzy
+#: ../app/tools/gimpimagemaptool.c:322
 msgid "Quick Save"
-msgstr "Maskara bizkorra"
+msgstr "Gordetze-azkarra"
 
 #. adjust sliders
-#: app/tools/gimpinkoptions-gui.c:59
+#: ../app/tools/gimpinkoptions-gui.c:59
 msgid "Adjustment"
 msgstr "Doitzea"
 
-#: app/tools/gimpinkoptions-gui.c:71 app/tools/gimpinkoptions-gui.c:96
-#: app/tools/gimptextoptions.c:426
+#: ../app/tools/gimpinkoptions-gui.c:71 ../app/tools/gimpinkoptions-gui.c:96
+#: ../app/tools/gimptextoptions.c:426
 msgid "Size:"
 msgstr "Tamaina:"
 
-#: app/tools/gimpinkoptions-gui.c:79 app/tools/gimpmeasuretool.c:891
-#: app/tools/gimprotatetool.c:169 app/widgets/gimpbrusheditor.c:207
+#: ../app/tools/gimpinkoptions-gui.c:79 ../app/tools/gimpmeasuretool.c:891
+#: ../app/tools/gimprotatetool.c:169 ../app/widgets/gimpbrusheditor.c:207
 msgid "Angle:"
 msgstr "Angelua:"
 
 #. sens sliders
-#: app/tools/gimpinkoptions-gui.c:84
+#: ../app/tools/gimpinkoptions-gui.c:84
 msgid "Sensitivity"
 msgstr "Sentikortasuna"
 
-#: app/tools/gimpinkoptions-gui.c:103
+#: ../app/tools/gimpinkoptions-gui.c:103
 msgid "Tilt:"
 msgstr "Okerdura:"
 
-#: app/tools/gimpinkoptions-gui.c:110
+#: ../app/tools/gimpinkoptions-gui.c:110
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: app/tools/gimpinkoptions-gui.c:121
+#: ../app/tools/gimpinkoptions-gui.c:121
 msgid "Type"
 msgstr "Mota"
 
 #. Blob shape widget
-#: app/tools/gimpinkoptions-gui.c:151
+#: ../app/tools/gimpinkoptions-gui.c:151
 msgid "Shape"
 msgstr "Forma"
 
-#: app/tools/gimpinktool.c:63
+#: ../app/tools/gimpinktool.c:63
 msgid "Draw in ink"
 msgstr "Marraztu tintaz"
 
-#: app/tools/gimpinktool.c:64
-#, fuzzy
+#: ../app/tools/gimpinktool.c:64
 msgid "In_k"
-msgstr "Tinta"
+msgstr "_Tinta"
 
-#: app/tools/gimpiscissorstool.c:277
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Scissors"
 msgstr "Guraizeak"
 
-#: app/tools/gimpiscissorstool.c:278
+#: ../app/tools/gimpiscissorstool.c:278
 msgid "Select shapes from image"
 msgstr "Hautatu formak iruditik"
 
-#: app/tools/gimpiscissorstool.c:279
-#, fuzzy
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Intelligent _Scissors"
-msgstr "/Tresnak/Hautapen-tresnak/_Guraize adimendunak"
+msgstr "_Guraize adimentsua"
 
-#: app/tools/gimplevelstool.c:161
+#: ../app/tools/gimplevelstool.c:161
 msgid "Adjust color levels"
 msgstr "Doitu kolore-mailak"
 
-#: app/tools/gimplevelstool.c:162
-#, fuzzy
+#: ../app/tools/gimplevelstool.c:162
 msgid "_Levels..."
-msgstr "Mailak"
+msgstr "_Mailak..."
 
-#: app/tools/gimplevelstool.c:220
+#: ../app/tools/gimplevelstool.c:220
 msgid "Adjust Color Levels"
 msgstr "Doitu kolore-mailak"
 
-#: app/tools/gimplevelstool.c:222
+#: ../app/tools/gimplevelstool.c:222
 msgid "Load Levels"
 msgstr "Kargatu mailak"
 
-#: app/tools/gimplevelstool.c:223
-#, fuzzy
+#: ../app/tools/gimplevelstool.c:223
 msgid "Load levels settings from file"
-msgstr "Irakurri mailen ezarpenak fitxategitik"
+msgstr "Kargatu mailen ezarpenak fitxategitik"
 
-#: app/tools/gimplevelstool.c:224
+#: ../app/tools/gimplevelstool.c:224
 msgid "Save Levels"
 msgstr "Gorde mailak"
 
-#: app/tools/gimplevelstool.c:225
+#: ../app/tools/gimplevelstool.c:225
 msgid "Save levels settings to file"
 msgstr "Gorde mailen ezarpenak fitxategian"
 
-#: app/tools/gimplevelstool.c:285
+#: ../app/tools/gimplevelstool.c:285
 msgid "Levels for indexed layers cannot be adjusted."
 msgstr "Geruza indexatuen mailak ezin dira doitu."
 
-#: app/tools/gimplevelstool.c:355
-#, fuzzy
+#: ../app/tools/gimplevelstool.c:356
 msgid "Pick black point"
 msgstr "Hautatu puntu beltza"
 
-#: app/tools/gimplevelstool.c:359
-#, fuzzy
+#: ../app/tools/gimplevelstool.c:360
 msgid "Pick gray point"
 msgstr "Hautatu puntu grisa"
 
-#: app/tools/gimplevelstool.c:363
-#, fuzzy
+#: ../app/tools/gimplevelstool.c:364
 msgid "Pick white point"
 msgstr "Hautatu puntu zuria"
 
 #. Input levels frame
-#: app/tools/gimplevelstool.c:445
+#: ../app/tools/gimplevelstool.c:449
 msgid "Input Levels"
 msgstr "Sarrerako mailak"
 
-#: app/tools/gimplevelstool.c:539
+#: ../app/tools/gimplevelstool.c:543
 msgid "Gamma"
 msgstr "Gamma"
 
 #. Output levels frame
-#: app/tools/gimplevelstool.c:569
+#: ../app/tools/gimplevelstool.c:573
 msgid "Output Levels"
 msgstr "Irteerako mailak"
 
-#: app/tools/gimplevelstool.c:667
+#: ../app/tools/gimplevelstool.c:671
 msgid "Adjust levels automatically"
 msgstr "Doitu mailak automatikoki"
 
-#: app/tools/gimpmagnifyoptions.c:203
-#, fuzzy
+#: ../app/tools/gimpmagnifyoptions.c:203
 msgid "Auto-resize window"
-msgstr "Aldatu leihoaren _tamaina zoom egitean"
+msgstr "Aldatu leihoaren tamaina automatikoki"
 
-#: app/tools/gimpmagnifytool.c:95
+#: ../app/tools/gimpmagnifytool.c:95
 msgid "Magnify"
 msgstr "Handitu"
 
-#: app/tools/gimpmagnifytool.c:96
+#: ../app/tools/gimpmagnifytool.c:96
 msgid "Zoom in & out"
 msgstr "Handiagotu eta txikiagotu"
 
-#: app/tools/gimpmagnifytool.c:97
-#, fuzzy
+#: ../app/tools/gimpmagnifytool.c:97
 msgid "M_agnify"
-msgstr "Handitu"
+msgstr "_Handitu"
 
-#: app/tools/gimpmeasureoptions.c:157
-#, fuzzy
+#: ../app/tools/gimpmeasureoptions.c:157
 msgid "Use info window"
 msgstr "Erabili informazio-leihoa"
 
-#: app/tools/gimpmeasuretool.c:118
+#: ../app/tools/gimpmeasuretool.c:118
 msgid "Measure"
 msgstr "Neurtu"
 
-#: app/tools/gimpmeasuretool.c:119
+#: ../app/tools/gimpmeasuretool.c:119
 msgid "Measure distances and angles"
 msgstr "Neurtu distantziak eta angeluak"
 
-#: app/tools/gimpmeasuretool.c:120
-#, fuzzy
+#: ../app/tools/gimpmeasuretool.c:120
 msgid "_Measure"
-msgstr "Neurtu"
+msgstr "_Neurtu"
 
-#: app/tools/gimpmeasuretool.c:264
+#: ../app/tools/gimpmeasuretool.c:264
 msgid "Add Guides"
 msgstr "Gehitu gidak"
 
 #. tool->gdisp->shell
-#: app/tools/gimpmeasuretool.c:847
+#: ../app/tools/gimpmeasuretool.c:847
 msgid "Measure Distances and Angles"
 msgstr "Neurtu distantziak eta angeluak"
 
-#: app/tools/gimpmeasuretool.c:865
+#: ../app/tools/gimpmeasuretool.c:865
 msgid "Distance:"
 msgstr "Distantzia:"
 
-#: app/tools/gimpmoveoptions.c:171
-#, fuzzy
+#: ../app/tools/gimpmoveoptions.c:171
 msgid "Pick a layer or guide"
-msgstr "Aukeratu lekuz aldatu beharreko geruza edo gida bat"
+msgstr "Hautatu geruza edo gida"
 
-#: app/tools/gimpmoveoptions.c:172
-#, fuzzy
+#: ../app/tools/gimpmoveoptions.c:172
 msgid "Move the current layer"
-msgstr "Lekuz aldatu uneko geruza"
+msgstr "Aldatu uneko geruza lekuz"
 
-#: app/tools/gimpmoveoptions.c:176
-#, fuzzy
+#: ../app/tools/gimpmoveoptions.c:176
 msgid "Move selection"
 msgstr "Aldatu hautapena lekuz"
 
-#: app/tools/gimpmoveoptions.c:180
-#, fuzzy
+#: ../app/tools/gimpmoveoptions.c:180
 msgid "Pick a path"
-msgstr "Aukeratu lekuz aldatu beharreko bide bat"
+msgstr "Hautatu bidea"
 
-#: app/tools/gimpmoveoptions.c:181
-#, fuzzy
+#: ../app/tools/gimpmoveoptions.c:181
 msgid "Move the current path"
-msgstr "Lekuz aldatu uneko bidea"
+msgstr "Aldatu uneko bidea lekuz"
 
-#: app/tools/gimpmovetool.c:117
+#: ../app/tools/gimpmovetool.c:117
 msgid "Move layers & selections"
 msgstr "Aldatu lekuz geruzak eta hautapenak"
 
-#: app/tools/gimpmovetool.c:118
-#, fuzzy
+#: ../app/tools/gimpmovetool.c:118
 msgid "_Move"
-msgstr "Lekuz aldatu"
+msgstr "_Lekuz aldatu"
 
-#: app/tools/gimpmovetool.c:298 app/tools/gimpmovetool.c:576
-#, fuzzy
+#: ../app/tools/gimpmovetool.c:298 ../app/tools/gimpmovetool.c:576
 msgid "Move Guide: "
-msgstr "Aldatu lekuz gida"
+msgstr "Aldatu gida lekuz: "
 
-#: app/tools/gimpmovetool.c:570
-#, fuzzy
+#: ../app/tools/gimpmovetool.c:570
 msgid "Cancel Guide"
-msgstr "Utzi"
+msgstr "Utzi gida"
 
-#: app/tools/gimpmovetool.c:576
-#, fuzzy
+#: ../app/tools/gimpmovetool.c:576
 msgid "Add Guide: "
-msgstr "Gehitu gidak"
+msgstr "Gehitu gida: "
 
-#: app/tools/gimppaintbrushtool.c:52
+#: ../app/tools/gimppaintbrushtool.c:52
 msgid "Paint fuzzy brush strokes"
 msgstr "Margotu brotxakada lausoak"
 
-#: app/tools/gimppaintbrushtool.c:53
-#, fuzzy
+#: ../app/tools/gimppaintbrushtool.c:53
 msgid "_Paintbrush"
-msgstr "Pintzela"
+msgstr "_Pintzela"
 
-#: app/tools/gimppaintoptions-gui.c:103 app/widgets/gimpbrushselect.c:201
-#: app/widgets/gimplayertreeview.c:332
+#: ../app/tools/gimppaintoptions-gui.c:103
+#: ../app/widgets/gimpbrushselect.c:201 ../app/widgets/gimplayertreeview.c:332
 msgid "Opacity:"
 msgstr "Opakutasuna:"
 
-#: app/tools/gimppaintoptions-gui.c:108 app/tools/gimpselectionoptions.c:374
-#: app/widgets/gimpbrushselect.c:218 app/widgets/gimplayertreeview.c:325
+#: ../app/tools/gimppaintoptions-gui.c:108
+#: ../app/tools/gimpselectionoptions.c:374
+#: ../app/widgets/gimpbrushselect.c:218 ../app/widgets/gimplayertreeview.c:325
 msgid "Mode:"
 msgstr "Modua:"
 
-#: app/tools/gimppaintoptions-gui.c:126
+#: ../app/tools/gimppaintoptions-gui.c:126
 msgid "Brush:"
 msgstr "Brotxa:"
 
-#: app/tools/gimppaintoptions-gui.c:135 app/tools/gimppaintoptions-gui.c:394
+#: ../app/tools/gimppaintoptions-gui.c:135
+#: ../app/tools/gimppaintoptions-gui.c:395
 msgid "Gradient:"
 msgstr "Gradientea:"
 
-#: app/tools/gimppaintoptions-gui.c:177
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:177
 msgid "Hard edge"
 msgstr "Ertz gogorra"
 
-#: app/tools/gimppaintoptions-gui.c:216
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:216
 msgid "Pressure sensitivity"
 msgstr "Presio-sentikortasuna"
 
-#: app/tools/gimppaintoptions-gui.c:236
+#: ../app/tools/gimppaintoptions-gui.c:236
 msgid "Opacity"
 msgstr "Opakutasuna"
 
-#: app/tools/gimppaintoptions-gui.c:250
+#: ../app/tools/gimppaintoptions-gui.c:250
 msgid "Hardness"
 msgstr "Gogortasuna"
 
-#: app/tools/gimppaintoptions-gui.c:261
+#: ../app/tools/gimppaintoptions-gui.c:261
 msgid "Rate"
 msgstr "Tasa"
 
-#: app/tools/gimppaintoptions-gui.c:274
+#: ../app/tools/gimppaintoptions-gui.c:274
 msgid "Size"
 msgstr "Tamaina"
 
-#: app/tools/gimppaintoptions-gui.c:313
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:313
 msgid "Fade out"
 msgstr "Iraungi"
 
-#: app/tools/gimppaintoptions-gui.c:333 app/tools/gimppaintoptions-gui.c:403
+#: ../app/tools/gimppaintoptions-gui.c:333
+#: ../app/tools/gimppaintoptions-gui.c:404
 msgid "Length:"
 msgstr "Luzera:"
 
-#: app/tools/gimppaintoptions-gui.c:367
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:368
 msgid "Use color from gradient"
 msgstr "Erabili kolorea gradientetik"
 
-#: app/tools/gimppenciltool.c:52
+#: ../app/tools/gimppenciltool.c:52
 msgid "Paint hard edged pixels"
 msgstr "Margotu ertz gogorreko pixelak"
 
-#: app/tools/gimppenciltool.c:53
-#, fuzzy
+#: ../app/tools/gimppenciltool.c:53
 msgid "Pe_ncil"
-msgstr "Arkatza"
+msgstr "_Arkatza"
 
-#: app/tools/gimpperspectivetool.c:81
+#: ../app/tools/gimpperspectivetool.c:81
 msgid "Perspective"
 msgstr "Perspektiba"
 
-#: app/tools/gimpperspectivetool.c:82
+#: ../app/tools/gimpperspectivetool.c:82
 msgid "Change perspective of the layer or selection"
 msgstr "Aldatu geruzaren edo hautapenaren perspektiba"
 
-#: app/tools/gimpperspectivetool.c:83
-#, fuzzy
+#: ../app/tools/gimpperspectivetool.c:83
 msgid "_Perspective"
-msgstr "Perspektiba"
+msgstr "_Perspektiba"
 
-#: app/tools/gimpperspectivetool.c:140
+#: ../app/tools/gimpperspectivetool.c:140
 msgid "Perspective Transform Information"
 msgstr "Perspektiba eraldatzeari buruzko informazioa"
 
-#: app/tools/gimpperspectivetool.c:149
+#: ../app/tools/gimpperspectivetool.c:149
 msgid "Matrix:"
 msgstr "Matrizea:"
 
-#: app/tools/gimpposterizetool.c:79
+#: ../app/tools/gimpposterizetool.c:79
 msgid "Reduce image to a fixed number of colors"
 msgstr "Murriztu irudia kolore-kopuru finko batera"
 
-#: app/tools/gimpposterizetool.c:80
-#, fuzzy
+#: ../app/tools/gimpposterizetool.c:80
 msgid "_Posterize..."
-msgstr "Posterizatu"
+msgstr "P_osterizatu..."
 
-#: app/tools/gimpposterizetool.c:131
+#: ../app/tools/gimpposterizetool.c:131
 msgid "Posterize (Reduce Number of Colors)"
 msgstr "Posterizatu (murriztu kolore-kopurua)"
 
-#: app/tools/gimpposterizetool.c:173
+#: ../app/tools/gimpposterizetool.c:173
 msgid "Posterize does not operate on indexed layers."
 msgstr "Posterizatzeak ez du geruza indexatuetan funtzionatzen."
 
-#: app/tools/gimpposterizetool.c:223
-#, fuzzy
+#: ../app/tools/gimpposterizetool.c:223
 msgid "Posterize _levels:"
 msgstr "Posterizatu _mailak:"
 
-#: app/tools/gimprectselecttool.c:97
+#: ../app/tools/gimprectselecttool.c:97
 msgid "Select rectangular regions"
 msgstr "Hautatu eskualde laukizuzenak"
 
-#: app/tools/gimprectselecttool.c:98
-#, fuzzy
+#: ../app/tools/gimprectselecttool.c:98
 msgid "_Rect Select"
-msgstr "Hautapen laukizuzena"
+msgstr "Hautapen _laukizuzena"
 
-#: app/tools/gimprectselecttool.c:224
+#: ../app/tools/gimprectselecttool.c:226
 msgid "Selection: ADD"
 msgstr "Hautapena: GEHITU"
 
-#: app/tools/gimprectselecttool.c:227
+#: ../app/tools/gimprectselecttool.c:229
 msgid "Selection: SUBTRACT"
 msgstr "Hautapena: KENDU"
 
-#: app/tools/gimprectselecttool.c:230
+#: ../app/tools/gimprectselecttool.c:232
 msgid "Selection: INTERSECT"
 msgstr "Hautapena: GURUTZATU"
 
-#: app/tools/gimprectselecttool.c:233
+#: ../app/tools/gimprectselecttool.c:235
 msgid "Selection: REPLACE"
 msgstr "Hautapena: ORDEZTU"
 
-#: app/tools/gimprectselecttool.c:468
+#: ../app/tools/gimprectselecttool.c:414
 msgid "Selection: "
 msgstr "Hautapena: "
 
-#: app/tools/gimprotatetool.c:98
+#: ../app/tools/gimprotatetool.c:98
 msgid "Rotate the layer or selection"
 msgstr "Biratu geruza edo hautapena"
 
-#: app/tools/gimprotatetool.c:99
-#, fuzzy
+#: ../app/tools/gimprotatetool.c:99
 msgid "_Rotate"
-msgstr "Biratu"
+msgstr "_Biratu"
 
-#: app/tools/gimprotatetool.c:158
+#: ../app/tools/gimprotatetool.c:158
 msgid "Rotation Information"
 msgstr "Biratze-informazioa"
 
-#: app/tools/gimprotatetool.c:185
+#: ../app/tools/gimprotatetool.c:185
 msgid "Center X:"
-msgstr "X erdia:"
+msgstr "X erdigunea:"
 
-#: app/tools/gimprotatetool.c:190
-#, fuzzy
+#: ../app/tools/gimprotatetool.c:190
 msgid "Center Y:"
-msgstr "X erdia:"
+msgstr "Y erdigunea:"
 
-#: app/tools/gimpscaletool.c:91
+#: ../app/tools/gimpscaletool.c:91
 msgid "Scale"
 msgstr "Eskala"
 
-#: app/tools/gimpscaletool.c:92
+#: ../app/tools/gimpscaletool.c:92
 msgid "Scale the layer or selection"
 msgstr "Eskalatu geruza edo hautapena"
 
-#: app/tools/gimpscaletool.c:93
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:93
 msgid "_Scale"
-msgstr "Eskala"
+msgstr "_Eskalatu"
 
-#: app/tools/gimpscaletool.c:152
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:152
 msgid "Scaling information"
 msgstr "Eskalatze-informazioa"
 
-#: app/tools/gimpscaletool.c:163
+#: ../app/tools/gimpscaletool.c:163
 msgid "Original Width:"
 msgstr "Jatorrizko zabalera:"
 
-#: app/tools/gimpscaletool.c:170
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:170
 msgid "Current width:"
 msgstr "Uneko zabalera:"
 
-#: app/tools/gimpscaletool.c:174
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:174
 msgid "Current height:"
-msgstr "Uneko zabalera:"
+msgstr "Uneko altuera:"
 
-#: app/tools/gimpscaletool.c:189
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:189
 msgid "Scale ratio X:"
 msgstr "X eskalatze-erlazioa:"
 
-#: app/tools/gimpscaletool.c:192
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:192
 msgid "Scale ratio Y:"
-msgstr "X eskalatze-erlazioa:"
+msgstr "Y eskalatze-erlazioa:"
 
-#: app/tools/gimpscaletool.c:196
-#, fuzzy
+#: ../app/tools/gimpscaletool.c:196
 msgid "Aspect Ratio:"
 msgstr "Aspektu-erlazioa:"
 
-#: app/tools/gimpselectionoptions.c:136
+#: ../app/tools/gimpselectionoptions.c:136
 msgid "Smooth edges"
 msgstr "Ertz leunak"
 
-#: app/tools/gimpselectionoptions.c:150
+#: ../app/tools/gimpselectionoptions.c:150
 msgid "Allow completely transparent regions to be selected"
 msgstr "Baimendu guztiz gardenak diren eskualdeak hautatzea"
 
-#: app/tools/gimpselectionoptions.c:156
+#: ../app/tools/gimpselectionoptions.c:156
 msgid "Base selection on all visible layers"
 msgstr "Oinarrizko hautapena ikusgai dauden geruza guztietan"
 
-#: app/tools/gimpselectionoptions.c:171
+#: ../app/tools/gimpselectionoptions.c:171
 msgid "Use all visible layers when shrinking the selection"
 msgstr "Erabili ikusgai dauden geruza guztiak hautapena uzkurtzean"
 
-#: app/tools/gimpselectionoptions.c:382 app/tools/gimptextoptions.c:447
+#: ../app/tools/gimpselectionoptions.c:382 ../app/tools/gimptextoptions.c:447
 msgid "Antialiasing"
 msgstr "Antialiasing-a"
 
-#: app/tools/gimpselectionoptions.c:399
-#, fuzzy
+#: ../app/tools/gimpselectionoptions.c:399
 msgid "Feather edges"
 msgstr "Difuminatu ertzak"
 
-#: app/tools/gimpselectionoptions.c:425
-#, fuzzy
+#: ../app/tools/gimpselectionoptions.c:425
 msgid "Show interactive boundary"
 msgstr "Erakutsi muga interaktiboak"
 
-#: app/tools/gimpselectionoptions.c:448
-#, fuzzy
+#: ../app/tools/gimpselectionoptions.c:448
 msgid "Select transparent areas"
 msgstr "Hautatu area gardenak"
 
-#: app/tools/gimpselectionoptions.c:488
-#, fuzzy
+#: ../app/tools/gimpselectionoptions.c:488
 msgid "Auto shrink selection"
 msgstr "Uzkurtu hautapena automatikoki"
 
-#: app/tools/gimpsheartool.c:98
+#: ../app/tools/gimpsheartool.c:98
 msgid "Shear"
 msgstr "Zizailamendua"
 
-#: app/tools/gimpsheartool.c:99
+#: ../app/tools/gimpsheartool.c:99
 msgid "Shear the layer or selection"
 msgstr "Zizailatu geruza edo hautapena"
 
-#: app/tools/gimpsheartool.c:100
-#, fuzzy
+#: ../app/tools/gimpsheartool.c:100
 msgid "S_hear"
-msgstr "Zizailamendua"
+msgstr "_Zizaila"
 
-#: app/tools/gimpsheartool.c:157
+#: ../app/tools/gimpsheartool.c:157
 msgid "Shearing Information"
 msgstr "Zizailamendu-informazioa"
 
-#: app/tools/gimpsheartool.c:167
-#, fuzzy
+#: ../app/tools/gimpsheartool.c:167
 msgid "Shear magnitude X:"
-msgstr "Zizailamenduaren X magnitudea:"
+msgstr "Zizailaren X magnitudea:"
 
-#: app/tools/gimpsheartool.c:174
-#, fuzzy
+#: ../app/tools/gimpsheartool.c:174
 msgid "Shear magnitude Y:"
-msgstr "Zizailamenduaren X magnitudea:"
+msgstr "Zizailaren Y magnitudea:"
 
-#: app/tools/gimpsmudgetool.c:55
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "Smudge image"
 msgstr "Zirriborratu irudia"
 
-#: app/tools/gimpsmudgetool.c:56
-#, fuzzy
+#: ../app/tools/gimpsmudgetool.c:56
 msgid "_Smudge"
-msgstr "Zirriborroa egin"
+msgstr "_Zirriborroa egin"
 
-#: app/tools/gimptextoptions.c:146
-msgid ""
-"Hinting alters the font outline to produce a crisp bitmap at small sizes"
+#: ../app/tools/gimptextoptions.c:146
+msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
-"Hinting-ek letra-tipoen eskema aldatzen dute tamaina txikiko bit-mapa doia "
-"egiteko"
+"Atxikitze-indizeak letra-tipoen eskema aldatzen du tamaina txikiko bit-mapa "
+"doitzeko"
 
-#: app/tools/gimptextoptions.c:153
+#: ../app/tools/gimptextoptions.c:153
 msgid ""
 "If available, hints from the font are used but you may prefer to always use "
 "the automatic hinter"
 msgstr ""
-"Erabilgarri badaude, letra-tipoen \"hint\"ak erabiltzen dira, baina agian "
-"nahiago duzu beti \"hint\" automatikoak erabiltzea"
+"Erabilgarri badaude, letra-tipoen atxikitze-indizeak erabiltzen dira, baina "
+"agian nahiago duzu beti atxikitze-automatikoa erabiltzea"
 
-#: app/tools/gimptextoptions.c:178
+#: ../app/tools/gimptextoptions.c:178
 msgid "Indentation of the first line"
-msgstr ""
+msgstr "Lehen lerroa koskatzea"
 
-#: app/tools/gimptextoptions.c:183
+#: ../app/tools/gimptextoptions.c:183
 msgid "Modify line spacing"
 msgstr "Aldatu lerroen tartea"
 
-#: app/tools/gimptextoptions.c:419
+#: ../app/tools/gimptextoptions.c:419
 msgid "Font:"
 msgstr "Letra-tipoa:"
 
-#: app/tools/gimptextoptions.c:431
-#, fuzzy
+#: ../app/tools/gimptextoptions.c:431
 msgid "Hinting"
-msgstr "_Hinting"
+msgstr "Atxikitzea"
 
-#: app/tools/gimptextoptions.c:438
-#, fuzzy
+#: ../app/tools/gimptextoptions.c:438
 msgid "Force auto-hinter"
-msgstr "Behartu \"hint\" automatikoak"
+msgstr "Behartu atxikitze-automatikoak"
 
-#: app/tools/gimptextoptions.c:453
+#: ../app/tools/gimptextoptions.c:453
 msgid "Text Color"
 msgstr "Testuaren kolorea"
 
-#: app/tools/gimptextoptions.c:458
+#: ../app/tools/gimptextoptions.c:458
 msgid "Color:"
 msgstr "Kolorea:"
 
-#: app/tools/gimptextoptions.c:463
+#: ../app/tools/gimptextoptions.c:463
 msgid "Justify:"
 msgstr "Justifikatu:"
 
-#: app/tools/gimptextoptions.c:469
+#: ../app/tools/gimptextoptions.c:469
 msgid "Indent:"
 msgstr "Koska:"
 
-#: app/tools/gimptextoptions.c:475
-#, fuzzy
+#: ../app/tools/gimptextoptions.c:475
 msgid ""
 "Line\n"
 "spacing:"
@@ -10035,29 +9267,27 @@ msgstr ""
 "Lerro arteko\n"
 "tartea:"
 
-#: app/tools/gimptextoptions.c:478
-#, fuzzy
+#: ../app/tools/gimptextoptions.c:478
 msgid "Create path from text"
 msgstr "Sortu bidea testutik"
 
-#: app/tools/gimptexttool.c:143
+#: ../app/tools/gimptexttool.c:145
 msgid "Add text to the image"
 msgstr "Gehitu testua irudiari"
 
-#: app/tools/gimptexttool.c:144
-#, fuzzy
+#: ../app/tools/gimptexttool.c:146
 msgid "Te_xt"
-msgstr "Testua"
+msgstr "Te_stua"
 
-#: app/tools/gimptexttool.c:732
+#: ../app/tools/gimptexttool.c:744
 msgid "GIMP Text Editor"
 msgstr "GIMP Testu-editorea"
 
-#: app/tools/gimptexttool.c:842 app/tools/gimptexttool.c:845
+#: ../app/tools/gimptexttool.c:854 ../app/tools/gimptexttool.c:857
 msgid "Confirm Text Editing"
-msgstr ""
+msgstr "Berretsi testu-edizioa"
 
-#: app/tools/gimptexttool.c:866
+#: ../app/tools/gimptexttool.c:878
 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 "
@@ -10065,91 +9295,93 @@ msgid ""
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 msgstr ""
+"Hautatu duzun geruza testu-geruza bat da, baina bestelako tresnak erabiliz "
+"aldatua izan da. Geruza testu-tresnarekin editatzean aldaketa hauek galduko "
+"dira.\n"
+"\n"
+"Geruza edita dezakezu, edo sortu testu-geruza berria bere testu-atributuak "
+"oinarritzat hartuz."
 
-#: app/tools/gimpthresholdtool.c:93
+#: ../app/tools/gimpthresholdtool.c:93
 msgid "Reduce image to two colors using a threshold"
 msgstr "Murriztu irudia bi koloretara muga erabiliz"
 
-#: app/tools/gimpthresholdtool.c:94
-#, fuzzy
+#: ../app/tools/gimpthresholdtool.c:94
 msgid "_Threshold..."
-msgstr "Muga"
+msgstr "_Muga..."
 
-#: app/tools/gimpthresholdtool.c:148
+#: ../app/tools/gimpthresholdtool.c:148
 msgid "Apply Threshold"
 msgstr "Aplikatu muga"
 
-#: app/tools/gimpthresholdtool.c:199
+#: ../app/tools/gimpthresholdtool.c:199
 msgid "Threshold does not operate on indexed layers."
 msgstr "Mugak ez du geruza indexatuetan funtzionatzen."
 
-#: app/tools/gimptransformoptions.c:329
+#: ../app/tools/gimptransformoptions.c:329
 msgid "Transform Direction"
 msgstr "Eraldatzearen noranzkoa"
 
-#: app/tools/gimptransformoptions.c:338
+#: ../app/tools/gimptransformoptions.c:338
 msgid "Interpolation:"
 msgstr "Interpolazioa:"
 
-#: app/tools/gimptransformoptions.c:348
+#: ../app/tools/gimptransformoptions.c:348
 msgid "Supersampling"
 msgstr "Gainlaginketa"
 
 #. the clip resulting image toggle button
-#: app/tools/gimptransformoptions.c:353
-#, fuzzy
+#: ../app/tools/gimptransformoptions.c:353
 msgid "Clip result"
-msgstr "Ebaki emaitza"
+msgstr "Moztu emaitza"
 
-#: app/tools/gimptransformoptions.c:367
-#, fuzzy
+#: ../app/tools/gimptransformoptions.c:367
 msgid "Preview:"
-msgstr "Aurrebista"
+msgstr "Aurrebista:"
 
 #. the constraints frame
-#: app/tools/gimptransformoptions.c:413
+#: ../app/tools/gimptransformoptions.c:413
 msgid "Constraints"
 msgstr "Murriztapenak"
 
-#: app/tools/gimptransformoptions.c:425
-#, fuzzy, c-format
+#: ../app/tools/gimptransformoptions.c:425
+#, c-format
 msgid "15 degrees  %s"
 msgstr "15 gradu: %s"
 
-#: app/tools/gimptransformoptions.c:445
-#, fuzzy, c-format
+#: ../app/tools/gimptransformoptions.c:445
+#, c-format
 msgid "Keep height  %s"
 msgstr "Mantendu altuera: %s"
 
-#: app/tools/gimptransformoptions.c:447
-#, fuzzy, c-format
+#: ../app/tools/gimptransformoptions.c:447
+#, c-format
 msgid "Keep width  %s"
 msgstr "Mantendu zabalera: %s"
 
-#: app/tools/gimptransformoptions.c:449
-#, fuzzy, c-format
+#: ../app/tools/gimptransformoptions.c:449
+#, c-format
 msgid "Keep aspect  %s"
-msgstr "Aspektu-erlazio finkoa"
+msgstr "Mantendu aspektua: %s"
 
-#: app/tools/gimptransformtool.c:253
+#: ../app/tools/gimptransformtool.c:253
 msgid "Transforming..."
 msgstr "Eraldatzen..."
 
-#: app/tools/gimpvectoroptions.c:113
-#, fuzzy
+#: ../app/tools/gimpvectoroptions.c:113
 msgid "Restrict editing to polygons"
-msgstr "murriztu editatzea poligonaletara"
+msgstr "Murriztu poligonoen edizioa"
 
-#: app/tools/gimpvectoroptions.c:177
+#: ../app/tools/gimpvectoroptions.c:177
 msgid "Edit Mode"
 msgstr "Editatze-modua"
 
-#: app/tools/gimpvectoroptions.c:182
+#: ../app/tools/gimpvectoroptions.c:182
 msgid "Polygonal"
 msgstr "Poligonala"
 
-#: app/tools/gimpvectoroptions.c:186
-#, fuzzy, c-format
+#: ../app/tools/gimpvectoroptions.c:186
+#, c-format
 msgid ""
 "Path to Selection\n"
 "%s  Add\n"
@@ -10159,1142 +9391,1108 @@ msgstr ""
 "Bidea hautapenera\n"
 "%s  Gehitu\n"
 "%s  Kendu\n"
-"%s%s%s  Gurutzatu"
+"%s  Gurutzatu"
 
-#: app/tools/gimpvectoroptions.c:196
-#, fuzzy
+#: ../app/tools/gimpvectoroptions.c:196
 msgid "Create selection from path"
 msgstr "Sortu hautapena bidetik"
 
-#: app/tools/gimpvectoroptions.c:207
-#, fuzzy
+#: ../app/tools/gimpvectoroptions.c:207
 msgid "Stroke path"
 msgstr "Trazatu bidea"
 
-#: app/tools/gimpvectortool.c:161
+#: ../app/tools/gimpvectortool.c:161
 msgid "Create and edit paths"
 msgstr "Sortu eta editatu bideak"
 
-#: app/tools/gimpvectortool.c:363
+#: ../app/tools/gimpvectortool.c:363
 msgid "Add Stroke"
-msgstr ""
+msgstr "Gehitu traza"
 
-#: app/tools/gimpvectortool.c:381
+#: ../app/tools/gimpvectortool.c:381
 msgid "Add Anchor"
-msgstr ""
+msgstr "Gehitu aingura"
 
-#: app/tools/gimpvectortool.c:404
+#: ../app/tools/gimpvectortool.c:404
 msgid "Insert Anchor"
-msgstr ""
+msgstr "Txertatu aingura"
 
-#: app/tools/gimpvectortool.c:433
+#: ../app/tools/gimpvectortool.c:433
 msgid "Drag Handle"
-msgstr ""
+msgstr "Arrastatu heldulekua"
 
-#: app/tools/gimpvectortool.c:462
+#: ../app/tools/gimpvectortool.c:462
 msgid "Drag Anchor"
-msgstr ""
+msgstr "Arrastatu aingura"
 
-#: app/tools/gimpvectortool.c:479
+#: ../app/tools/gimpvectortool.c:479
 msgid "Drag Anchors"
-msgstr ""
+msgstr "Arrastatu aingurak"
 
-#: app/tools/gimpvectortool.c:499
+#: ../app/tools/gimpvectortool.c:499
 msgid "Drag Curve"
 msgstr "Arrastatu kurba"
 
-#: app/tools/gimpvectortool.c:527
+#: ../app/tools/gimpvectortool.c:527
 msgid "Connect Strokes"
-msgstr ""
+msgstr "Konektatu trazak"
 
-#: app/tools/gimpvectortool.c:557
+#: ../app/tools/gimpvectortool.c:557
 msgid "Drag Path"
 msgstr "Bota bide berria"
 
-#: app/tools/gimpvectortool.c:567
+#: ../app/tools/gimpvectortool.c:567
 msgid "Convert Edge"
 msgstr "Bihurtu ertza"
 
-#: app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:597
 msgid "Delete Anchor"
 msgstr "Ezabatu aingura"
 
-#: app/tools/gimpvectortool.c:619
+#: ../app/tools/gimpvectortool.c:619
 msgid "Delete Segment"
 msgstr "Ezabatu segmentua"
 
-#: app/tools/gimpvectortool.c:831
+#: ../app/tools/gimpvectortool.c:831
 msgid "Move Anchors"
-msgstr ""
+msgstr "Mugitu aingurak"
 
-#: app/tools/gimpvectortool.c:1196
+#: ../app/tools/gimpvectortool.c:1196
 msgid "Click to pick path to edit."
 msgstr "Klik egin editatzeko bidea aukeratzeko"
 
-#: app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1199
 msgid "Click to create a new path."
 msgstr "Klik egin bide berria sortzeko"
 
-#: app/tools/gimpvectortool.c:1202
+#: ../app/tools/gimpvectortool.c:1202
 msgid "Click to create a new component of the path."
 msgstr "Klik egin bidearen osagai berria sortzeko."
 
-#: app/tools/gimpvectortool.c:1205
+#: ../app/tools/gimpvectortool.c:1205
 msgid "Click to create a new anchor. (try SHIFT)"
-msgstr ""
+msgstr "Egin klik aingura berria sortzeko (Maius)"
 
-#: app/tools/gimpvectortool.c:1208
+#: ../app/tools/gimpvectortool.c:1208
 msgid "Click-Drag to move the anchor around."
-msgstr ""
+msgstr "Egin klik eta arrastatu aingura lekuz aldatzeko."
 
-#: app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1211 ../app/tools/gimpvectortool.c:1218
 msgid "Click-Drag to move the anchors around."
-msgstr ""
+msgstr "Egin klik eta arrastatu aingurak lekuz aldatzeko."
 
-#: app/tools/gimpvectortool.c:1214
+#: ../app/tools/gimpvectortool.c:1214
 msgid "Click-Drag to move the handle around. (try SHIFT)"
-msgstr ""
+msgstr "Egin klik eta arrastatu heldulekua lekuz aldatzeko (Maius)"
 
-#: app/tools/gimpvectortool.c:1217
+#: ../app/tools/gimpvectortool.c:1220
 msgid "Click-Drag to change the shape of the curve. (SHIFT: symmetrical)"
-msgstr ""
+msgstr "Egin klik eta arrastatu kurbaren forma aldatzeko (Maius: simetrikoa)"
 
-#: app/tools/gimpvectortool.c:1221
+#: ../app/tools/gimpvectortool.c:1224
 msgid "Click-Drag to move the component around. (try SHIFT)"
-msgstr ""
+msgstr "Egin klik eta arrastatu osagaia lekuz aldatzeko (Maius)"
 
-#: app/tools/gimpvectortool.c:1225
+#: ../app/tools/gimpvectortool.c:1228
 msgid "Click-Drag to move the path around."
-msgstr ""
+msgstr "Egin klik eta arrastatu bidea lekuz aldatzeko."
 
-#: app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1231
 msgid "Click to insert an anchor on the path. (try SHIFT)"
-msgstr "Klik egin bidean aingura txertatzeko. (Shift-ekin saiatu)"
+msgstr "Egin klik bidean aingura txertatzeko. (Shift-ekin saiatu)"
 
-#: app/tools/gimpvectortool.c:1231
+#: ../app/tools/gimpvectortool.c:1234
 msgid "Click to delete this anchor."
-msgstr ""
+msgstr "Egin klik aingura ezabatzeko."
 
-#: app/tools/gimpvectortool.c:1234
+#: ../app/tools/gimpvectortool.c:1237
 msgid "Click to connect this anchor with the selected endpoint."
-msgstr ""
+msgstr "Egin klik aingura hau hautatutako amaiera-puntuarekin konektatzeko."
 
-#: app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1241
 msgid "Click to open up the path."
-msgstr "Klik egin bidea irekitzeko."
+msgstr "Egin klik bidea irekitzeko."
 
-#: app/tools/gimpvectortool.c:1241
+#: ../app/tools/gimpvectortool.c:1244
 msgid "Click to make this node angular."
-msgstr ""
+msgstr "Egin klik nodoa angularra egiteko."
 
-#: app/tools/gimpvectortool.c:1751
-#, fuzzy
+#: ../app/tools/gimpvectortool.c:1761
 msgid "Delete Anchors"
-msgstr "Ezabatu aingura"
+msgstr "Ezabatu aingurak"
 
-#: app/tools/gimpvectortool.c:1918
+#: ../app/tools/gimpvectortool.c:1928
 msgid "There is no active layer or channel to stroke to"
 msgstr "Ez dago trazatzeko geruza edo kanal aktiborik."
 
-#: app/vectors/gimpvectors.c:229
+#: ../app/vectors/gimpvectors.c:229
 msgid "Path"
 msgstr "Bidea"
 
-#: app/vectors/gimpvectors.c:230
+#: ../app/vectors/gimpvectors.c:230
 msgid "Rename Path"
 msgstr "Aldatu bidearen izena"
 
-#: app/vectors/gimpvectors.c:231 app/vectors/gimpvectors.c:356
+#: ../app/vectors/gimpvectors.c:231 ../app/vectors/gimpvectors.c:356
 msgid "Move Path"
 msgstr "Aldatu lekuz bidea"
 
-#: app/vectors/gimpvectors.c:232
+#: ../app/vectors/gimpvectors.c:232
 msgid "Scale Path"
 msgstr "Eskalatu bidea"
 
-#: app/vectors/gimpvectors.c:233
+#: ../app/vectors/gimpvectors.c:233
 msgid "Resize Path"
 msgstr "Aldatu bidearen tamaina"
 
-#: app/vectors/gimpvectors.c:234 app/vectors/gimpvectors.c:447
+#: ../app/vectors/gimpvectors.c:234 ../app/vectors/gimpvectors.c:447
 msgid "Flip Path"
 msgstr "Irauli bidea"
 
-#: app/vectors/gimpvectors.c:235 app/vectors/gimpvectors.c:491
+#: ../app/vectors/gimpvectors.c:235 ../app/vectors/gimpvectors.c:491
 msgid "Rotate Path"
 msgstr "Biratu bidea"
 
-#: app/vectors/gimpvectors.c:236 app/vectors/gimpvectors.c:522
+#: ../app/vectors/gimpvectors.c:236 ../app/vectors/gimpvectors.c:522
 msgid "Transform Path"
 msgstr "Eraldatu bidea"
 
-#: app/vectors/gimpvectors.c:551
+#: ../app/vectors/gimpvectors.c:551
 msgid "Cannot stroke empty path."
 msgstr "Ezin da bide hutsa trazatu."
 
-#: app/vectors/gimpvectors-import.c:287
+#: ../app/vectors/gimpvectors-import.c:287
 msgid "Import Paths"
 msgstr "Inportatu bideak"
 
-#: app/vectors/gimpvectors-import.c:298
+#: ../app/vectors/gimpvectors-import.c:298
 msgid "Imported Path"
 msgstr "Bidea inportatua"
 
-#: app/vectors/gimpvectors-import.c:324
+#: ../app/vectors/gimpvectors-import.c:324
 #, c-format
 msgid "No paths found in '%s'"
 msgstr "Ez da biderik topatu '%s'(e)n"
 
-#: app/vectors/gimpvectors-import.c:327
+#: ../app/vectors/gimpvectors-import.c:327
 msgid "No paths found in the buffer"
 msgstr "Ez da biderik topatu bufferrean"
 
-#: app/vectors/gimpvectors-import.c:337
+#: ../app/vectors/gimpvectors-import.c:337
 #, c-format
 msgid "Failed to import paths from '%s': %s"
 msgstr "Ezin izan da '%s'(e)tik bidea inportatu: %s"
 
-#: app/widgets/gimpactiongroup.c:803
+#: ../app/widgets/gimpactiongroup.c:803
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
-msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
+msgstr "GBUA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
-#: app/widgets/gimpactionview.c:354 app/widgets/gimpcontrollereditor.c:374
-#, fuzzy
+#: ../app/widgets/gimpactionview.c:354
+#: ../app/widgets/gimpcontrollereditor.c:374
 msgid "Action"
-msgstr "Batuketa"
+msgstr "Ekintza"
 
-#: app/widgets/gimpactionview.c:383
-#, fuzzy
+#: ../app/widgets/gimpactionview.c:383
 msgid "Shortcut"
 msgstr "Laster-teklak"
 
-#: app/widgets/gimpactionview.c:405
-#, fuzzy
+#: ../app/widgets/gimpactionview.c:405
 msgid "Name"
-msgstr "_Izena:"
+msgstr "Izena"
 
-#: app/widgets/gimpactionview.c:545 app/widgets/gimpactionview.c:738
+#: ../app/widgets/gimpactionview.c:545 ../app/widgets/gimpactionview.c:738
 msgid "Changing shortcut failed."
-msgstr ""
+msgstr "Huts egin du laster-teklak aldatzeak."
 
-#: app/widgets/gimpactionview.c:585
+#: ../app/widgets/gimpactionview.c:585
 msgid "Conflicting Shortcuts"
-msgstr ""
+msgstr "Gatazka laster-tekletan"
 
-#: app/widgets/gimpactionview.c:591
+#: ../app/widgets/gimpactionview.c:591
 msgid "_Reassign shortcut"
-msgstr ""
+msgstr "Esleitu laster-tekla _berriro"
 
-#: app/widgets/gimpactionview.c:602
+#: ../app/widgets/gimpactionview.c:602
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
-msgstr ""
+msgstr "\"%1$s\" laster-tekla jadanik \"%3$s\" taldeko \"%2$s\" elementuak dauka."
 
-#: app/widgets/gimpactionview.c:606
+#: ../app/widgets/gimpactionview.c:606
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
-msgstr ""
+msgstr "Laster-tekla berriro esleitzeak \"%s\"-(e)tik ezabatuko du."
 
-#: app/widgets/gimpactionview.c:673
+#: ../app/widgets/gimpactionview.c:673
 msgid "Removing shortcut failed."
-msgstr ""
+msgstr "Huts egin du laster-tekla kentzeak."
 
-#: app/widgets/gimpactionview.c:678
+#: ../app/widgets/gimpactionview.c:678
 msgid "Invalid shortcut."
-msgstr ""
+msgstr "Laster-tekla baliobagea."
 
-#: app/widgets/gimpbrusheditor.c:168
-#, fuzzy
+#: ../app/widgets/gimpbrusheditor.c:168
 msgid "Spikes:"
-msgstr "Tamaina:"
+msgstr "Erpinak:"
 
-#: app/widgets/gimpbrusheditor.c:181
+#: ../app/widgets/gimpbrusheditor.c:181
 msgid "Hardness:"
 msgstr "Gogortasuna:"
 
-#: app/widgets/gimpbrusheditor.c:220 app/widgets/gimpbrushfactoryview.c:114
+#: ../app/widgets/gimpbrusheditor.c:220
+#: ../app/widgets/gimpbrushfactoryview.c:114
 msgid "Spacing:"
 msgstr "Tartea:"
 
-#: app/widgets/gimpbrusheditor.c:223 app/widgets/gimpbrushfactoryview.c:117
+#: ../app/widgets/gimpbrusheditor.c:223
+#: ../app/widgets/gimpbrushfactoryview.c:117
 msgid "Percentage of width of brush"
 msgstr "Brotxaren zabaleraren ehunekoa"
 
-#: app/widgets/gimpbufferview.c:165 app/widgets/gimpbufferview.c:246
-#: app/widgets/gimpcontainergridview.c:206
-#: app/widgets/gimpcontainergridview.c:657
-#: app/widgets/gimphistogrameditor.c:147 app/widgets/gimphistogrameditor.c:359
+#: ../app/widgets/gimpbufferview.c:165 ../app/widgets/gimpbufferview.c:246
+#: ../app/widgets/gimpcontainergridview.c:206
+#: ../app/widgets/gimpcontainergridview.c:657
+#: ../app/widgets/gimphistogrameditor.c:147
+#: ../app/widgets/gimphistogrameditor.c:359
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: app/widgets/gimpcellrendereraccel.c:234
-#: app/widgets/gimpcellrendereraccel.c:459
+#: ../app/widgets/gimpcellrendereraccel.c:234
+#: ../app/widgets/gimpcellrendereraccel.c:459
 msgid "Type a new accelerator, or press Backspace to clear"
-msgstr ""
+msgstr "Sakatu azeleratzaile berria, edo sakatu Zuriune tekla garbitzeko."
 
-#: app/widgets/gimpcellrendereraccel.c:462
+#: ../app/widgets/gimpcellrendereraccel.c:462
 msgid "Type a new accelerator"
-msgstr ""
+msgstr "Sakatu azeleratzaile berria"
 
-#: app/widgets/gimpchanneltreeview.c:151
+#: ../app/widgets/gimpchanneltreeview.c:151
 msgid "Reorder Channel"
 msgstr "Ordenatu berriz kanala"
 
-#: app/widgets/gimpchanneltreeview.c:261
+#: ../app/widgets/gimpchanneltreeview.c:261
 msgid "Empty Channel"
 msgstr "Hustu kanalaren kopia"
 
-#: app/widgets/gimpclipboard.c:283
+#: ../app/widgets/gimpclipboard.c:283
 msgid "Clipboard"
-msgstr ""
+msgstr "Arbela"
 
-#: app/widgets/gimpcolordialog.c:169
+#: ../app/widgets/gimpcolordialog.c:169
 msgid "Add the current color to the color history"
 msgstr "Gehitu uneko kolorea koloreen historiari"
 
-#: app/widgets/gimpcolordisplayeditor.c:177
+#: ../app/widgets/gimpcolordisplayeditor.c:177
 msgid "Available Filters"
 msgstr "Iragazki erabilgarriak"
 
-#: app/widgets/gimpcolordisplayeditor.c:204
+#: ../app/widgets/gimpcolordisplayeditor.c:204
 msgid "Add the selected filter to the list of active filters."
 msgstr "Gehitu hautatutako iragazkia iragazki aktiboen zerrendan."
 
-#: app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:221
 msgid "Remove the selected filter from the list of active filters."
 msgstr "Kendu hautatutako iragazkia iragazki aktiboen zerrendatik."
 
-#: app/widgets/gimpcolordisplayeditor.c:235
+#: ../app/widgets/gimpcolordisplayeditor.c:235
 msgid "Move the selected filter up"
 msgstr "Eraman gora hautatutako iragazkia"
 
-#: app/widgets/gimpcolordisplayeditor.c:244
+#: ../app/widgets/gimpcolordisplayeditor.c:244
 msgid "Move the selected filter down"
 msgstr "Eraman behera hautatutako iragazkia"
 
-#: app/widgets/gimpcolordisplayeditor.c:289
+#: ../app/widgets/gimpcolordisplayeditor.c:289
 msgid "Active Filters"
 msgstr "Iragazki aktiboak"
 
-#: app/widgets/gimpcolordisplayeditor.c:322
+#: ../app/widgets/gimpcolordisplayeditor.c:322
 msgid "Reset the selected filter to default values"
 msgstr "Berrezarri hautatutako iragazkia balio lehenetsiekin"
 
-#: app/widgets/gimpcolordisplayeditor.c:543
-#, fuzzy, c-format
+#: ../app/widgets/gimpcolordisplayeditor.c:543
+#, c-format
 msgid "Configure selected filter: %s"
 msgstr "Konfiguratu hautatutako iragazkia: %s"
 
-#: app/widgets/gimpcolordisplayeditor.c:550
-#, fuzzy
+#: ../app/widgets/gimpcolordisplayeditor.c:550
 msgid "No filter selected"
 msgstr "Ez da iragazkirik hautatu"
 
-#: app/widgets/gimpcolordisplayeditor.c:554
-#, fuzzy
+#: ../app/widgets/gimpcolordisplayeditor.c:554
 msgid "Configure selected filter"
 msgstr "Konfiguratu hautatutako iragazkia"
 
-#: app/widgets/gimpcolorframe.c:240
+#: ../app/widgets/gimpcolorframe.c:240
 msgid "Index:"
 msgstr "Indizea:"
 
-#: app/widgets/gimpcolorframe.c:244 app/widgets/gimpcolorframe.c:265
+#: ../app/widgets/gimpcolorframe.c:244 ../app/widgets/gimpcolorframe.c:265
 msgid "Red:"
 msgstr "Gorria:"
 
-#: app/widgets/gimpcolorframe.c:245 app/widgets/gimpcolorframe.c:266
+#: ../app/widgets/gimpcolorframe.c:245 ../app/widgets/gimpcolorframe.c:266
 msgid "Green:"
 msgstr "Berdea:"
 
-#: app/widgets/gimpcolorframe.c:246 app/widgets/gimpcolorframe.c:267
+#: ../app/widgets/gimpcolorframe.c:246 ../app/widgets/gimpcolorframe.c:267
 msgid "Blue:"
 msgstr "Urdina:"
 
-#: app/widgets/gimpcolorframe.c:256 app/widgets/gimpcolorframe.c:287
+#: ../app/widgets/gimpcolorframe.c:256 ../app/widgets/gimpcolorframe.c:287
 msgid "Value:"
 msgstr "Balioa:"
 
-#: app/widgets/gimpcolorframe.c:275
+#: ../app/widgets/gimpcolorframe.c:275
 msgid "Hex:"
 msgstr "Hamaseitarra:"
 
-#: app/widgets/gimpcolorframe.c:285
+#: ../app/widgets/gimpcolorframe.c:285
 msgid "Hue:"
 msgstr "Ñabardura:"
 
-#: app/widgets/gimpcolorframe.c:286
+#: ../app/widgets/gimpcolorframe.c:286
 msgid "Sat.:"
 msgstr "Satur.:"
 
-#: app/widgets/gimpcolorframe.c:303
+#: ../app/widgets/gimpcolorframe.c:303
 msgid "Cyan:"
 msgstr "Cyana:"
 
-#: app/widgets/gimpcolorframe.c:304
+#: ../app/widgets/gimpcolorframe.c:304
 msgid "Magenta:"
 msgstr "Magenta:"
 
-#: app/widgets/gimpcolorframe.c:305
+#: ../app/widgets/gimpcolorframe.c:305
 msgid "Yellow:"
 msgstr "Horia:"
 
-#: app/widgets/gimpcolorframe.c:306
+#: ../app/widgets/gimpcolorframe.c:306
 msgid "Black:"
 msgstr "Beltza:"
 
-#: app/widgets/gimpcolorframe.c:320
+#: ../app/widgets/gimpcolorframe.c:320
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: app/widgets/gimpcolormapeditor.c:247
-#, fuzzy
+#: ../app/widgets/gimpcolormapeditor.c:247
 msgid "Color index:"
 msgstr "Koloreen indizea:"
 
-#: app/widgets/gimpcolormapeditor.c:258
-#, fuzzy
+#: ../app/widgets/gimpcolormapeditor.c:258
 msgid "HTML notation:"
-msgstr "Kokalekua:"
+msgstr "HTML notazioa:"
 
-#: app/widgets/gimpcontainerpopup.c:502
+#: ../app/widgets/gimpcontainerpopup.c:502
 msgid "Smaller Previews"
 msgstr "Aurrebista txikiagoak"
 
-#: app/widgets/gimpcontainerpopup.c:507
+#: ../app/widgets/gimpcontainerpopup.c:507
 msgid "Larger Previews"
 msgstr "Aurrebista handiagoak"
 
-#: app/widgets/gimpcontrollereditor.c:210
+#: ../app/widgets/gimpcontrollereditor.c:210
 msgid "Dump events from this controller"
-msgstr ""
+msgstr "Irauli kontroladorearen gertaerak"
 
-#: app/widgets/gimpcontrollereditor.c:215
+#: ../app/widgets/gimpcontrollereditor.c:215
 msgid "Enable this controller"
-msgstr ""
+msgstr "Gaitu kontroladorea"
 
-#: app/widgets/gimpcontrollereditor.c:236
-#, fuzzy
+#: ../app/widgets/gimpcontrollereditor.c:236
 msgid "Name:"
-msgstr "_Izena:"
+msgstr "Izena:"
 
-#: app/widgets/gimpcontrollereditor.c:369
-#, fuzzy
+#: ../app/widgets/gimpcontrollereditor.c:369
 msgid "Event"
-msgstr "Ingurunea"
+msgstr "Gertaera"
 
-#: app/widgets/gimpcontrollereditor.c:550
+#: ../app/widgets/gimpcontrollereditor.c:550
 msgid "Select Controller Event Action"
-msgstr ""
+msgstr "Hautatu kontroladorearen gertaera-ekintza"
 
-#: app/widgets/gimpcontrollerkeyboard.c:69
+#: ../app/widgets/gimpcontrollerkeyboard.c:69
 msgid "Key Up (Shift + Control + Alt)"
-msgstr ""
+msgstr "Gora tekla (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:72
+#: ../app/widgets/gimpcontrollerkeyboard.c:72
 msgid "Key Up (Control + Alt)"
-msgstr ""
+msgstr "Gora tekla (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:75
+#: ../app/widgets/gimpcontrollerkeyboard.c:75
 msgid "Key Up (Shift + Alt)"
-msgstr ""
+msgstr "Gora tekla (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:78
+#: ../app/widgets/gimpcontrollerkeyboard.c:78
 msgid "Key Up (Shift + Control)"
-msgstr ""
+msgstr "Gora tekla (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:81
+#: ../app/widgets/gimpcontrollerkeyboard.c:81
 msgid "Key Up (Alt)"
-msgstr ""
+msgstr "Gora tekla (Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:84
+#: ../app/widgets/gimpcontrollerkeyboard.c:84
 msgid "Key Up (Control)"
-msgstr ""
+msgstr "Gora tekla (Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:87
+#: ../app/widgets/gimpcontrollerkeyboard.c:87
 msgid "Key Up (Shift)"
-msgstr ""
+msgstr "Gora tekla (Maius)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:90
+#: ../app/widgets/gimpcontrollerkeyboard.c:90
 msgid "Key Up"
-msgstr ""
+msgstr "Gora tekla"
 
-#: app/widgets/gimpcontrollerkeyboard.c:94
+#: ../app/widgets/gimpcontrollerkeyboard.c:94
 msgid "Key Down (Shift + Control + Alt)"
-msgstr ""
+msgstr "Behera tekla (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:97
+#: ../app/widgets/gimpcontrollerkeyboard.c:97
 msgid "Key Down (Control + Alt)"
-msgstr ""
+msgstr "Behera tekla (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:100
+#: ../app/widgets/gimpcontrollerkeyboard.c:100
 msgid "Key Down (Shift + Alt)"
-msgstr ""
+msgstr "Behera tekla (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:103
+#: ../app/widgets/gimpcontrollerkeyboard.c:103
 msgid "Key Down (Shift + Control)"
-msgstr ""
+msgstr "Behera tekla (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:106
+#: ../app/widgets/gimpcontrollerkeyboard.c:106
 msgid "Key Down (Alt)"
-msgstr ""
+msgstr "Behera tekla (Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:109
+#: ../app/widgets/gimpcontrollerkeyboard.c:109
 msgid "Key Down (Control)"
-msgstr ""
+msgstr "Behera tekla (Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:112
+#: ../app/widgets/gimpcontrollerkeyboard.c:112
 msgid "Key Down (Shift)"
-msgstr ""
+msgstr "Behera tekla (Maius)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:115
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:115
 msgid "Key Down"
-msgstr "Batu beherantz"
+msgstr "Behera tekla"
 
-#: app/widgets/gimpcontrollerkeyboard.c:119
+#: ../app/widgets/gimpcontrollerkeyboard.c:119
 msgid "Key Left (Shift + Control + Alt)"
-msgstr ""
+msgstr "Ezkerrera tekla (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:122
+#: ../app/widgets/gimpcontrollerkeyboard.c:122
 msgid "Key Left (Control + Alt)"
-msgstr ""
+msgstr "Ezkerrera tekla (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:125
+#: ../app/widgets/gimpcontrollerkeyboard.c:125
 msgid "Key Left (Shift + Alt)"
-msgstr ""
+msgstr "Ezkerrera tekla (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:128
+#: ../app/widgets/gimpcontrollerkeyboard.c:128
 msgid "Key Left (Shift + Control)"
-msgstr ""
+msgstr "Ezkerrera tekla (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:131
+#: ../app/widgets/gimpcontrollerkeyboard.c:131
 msgid "Key Left (Alt)"
-msgstr ""
+msgstr "Ezkerrera tekla (Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:134
+#: ../app/widgets/gimpcontrollerkeyboard.c:134
 msgid "Key Left (Control)"
-msgstr ""
+msgstr "Ezkerrera tekla (Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:137
+#: ../app/widgets/gimpcontrollerkeyboard.c:137
 msgid "Key Left (Shift)"
-msgstr ""
+msgstr "Ezkerrera tekla (Maius)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:140
+#: ../app/widgets/gimpcontrollerkeyboard.c:140
 msgid "Key Left"
-msgstr ""
+msgstr "Ezkerrera tekla"
 
-#: app/widgets/gimpcontrollerkeyboard.c:144
+#: ../app/widgets/gimpcontrollerkeyboard.c:144
 msgid "Key Right (Shift + Control + Alt)"
-msgstr ""
+msgstr "Eskuinera tekla (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:147
+#: ../app/widgets/gimpcontrollerkeyboard.c:147
 msgid "Key Right (Control + Alt)"
-msgstr ""
+msgstr "Eskuinera tekla (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:150
+#: ../app/widgets/gimpcontrollerkeyboard.c:150
 msgid "Key Right (Shift + Alt)"
-msgstr ""
+msgstr "Eskuinera tekla (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:153
+#: ../app/widgets/gimpcontrollerkeyboard.c:153
 msgid "Key Right (Shift + Control)"
-msgstr ""
+msgstr "Eskuinera tekla (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:156
+#: ../app/widgets/gimpcontrollerkeyboard.c:156
 msgid "Key Right (Alt)"
-msgstr ""
+msgstr "Eskuinera tekla (Alt)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:159
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:159
 msgid "Key Right (Control)"
-msgstr "/G_orde eskuineko kolorea hemen"
+msgstr "Eskuinera tekla (Ktrl)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:162
+#: ../app/widgets/gimpcontrollerkeyboard.c:162
 msgid "Key Right (Shift)"
-msgstr ""
+msgstr "Eskuinera tekla (Maius)"
 
-#: app/widgets/gimpcontrollerkeyboard.c:165
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:165
 msgid "Key Right"
-msgstr "Altuera"
+msgstr "Eskuinera tekla"
 
-#: app/widgets/gimpcontrollerkeyboard.c:207
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:207
 msgid "Keyboard"
-msgstr "Laster-teklak"
+msgstr "Teklatua"
 
-#: app/widgets/gimpcontrollerkeyboard.c:230
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:230
 msgid "Keyboard Events"
-msgstr "Laster-teklak"
+msgstr "Teklatu-gertaerak"
 
-#: app/widgets/gimpcontrollerkeyboard.c:231
-#: app/widgets/gimpcontrollerwheel.c:230
-#, fuzzy
+#: ../app/widgets/gimpcontrollerkeyboard.c:231
+#: ../app/widgets/gimpcontrollerwheel.c:230
 msgid "Ready"
-msgstr "Gorria"
+msgstr "Prest"
 
-#: app/widgets/gimpcontrollerwheel.c:68
+#: ../app/widgets/gimpcontrollerwheel.c:68
 msgid "Scroll Up (Shift + Control + Alt)"
-msgstr ""
+msgstr "Korritu gora (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:71
+#: ../app/widgets/gimpcontrollerwheel.c:71
 msgid "Scroll Up (Control + Alt)"
-msgstr ""
+msgstr "Korritu gora (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:74
+#: ../app/widgets/gimpcontrollerwheel.c:74
 msgid "Scroll Up (Shift + Alt)"
-msgstr ""
+msgstr "Korritu gora (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:77
+#: ../app/widgets/gimpcontrollerwheel.c:77
 msgid "Scroll Up (Shift + Control)"
-msgstr ""
+msgstr "Korritu gora (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:80
+#: ../app/widgets/gimpcontrollerwheel.c:80
 msgid "Scroll Up (Alt)"
-msgstr ""
+msgstr "Korritu gora (Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:83
+#: ../app/widgets/gimpcontrollerwheel.c:83
 msgid "Scroll Up (Control)"
-msgstr ""
+msgstr "Korritu gora (Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:86
+#: ../app/widgets/gimpcontrollerwheel.c:86
 msgid "Scroll Up (Shift)"
-msgstr ""
+msgstr "Korritu gora (Maius)"
 
-#: app/widgets/gimpcontrollerwheel.c:89
+#: ../app/widgets/gimpcontrollerwheel.c:89
 msgid "Scroll Up"
-msgstr ""
+msgstr "Korritu gora"
 
-#: app/widgets/gimpcontrollerwheel.c:93
+#: ../app/widgets/gimpcontrollerwheel.c:93
 msgid "Scroll Down (Shift + Control + Alt)"
-msgstr ""
+msgstr "Korritu behera (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:96
+#: ../app/widgets/gimpcontrollerwheel.c:96
 msgid "Scroll Down (Control + Alt)"
-msgstr ""
+msgstr "Korritu behera (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:99
+#: ../app/widgets/gimpcontrollerwheel.c:99
 msgid "Scroll Down (Shift + Alt)"
-msgstr ""
+msgstr "Korritu behera (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:102
+#: ../app/widgets/gimpcontrollerwheel.c:102
 msgid "Scroll Down (Shift + Control)"
-msgstr ""
+msgstr "Korritu behera (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:105
+#: ../app/widgets/gimpcontrollerwheel.c:105
 msgid "Scroll Down (Alt)"
-msgstr ""
+msgstr "Korritu behera (Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:108
+#: ../app/widgets/gimpcontrollerwheel.c:108
 msgid "Scroll Down (Control)"
-msgstr ""
+msgstr "Korritu behera (Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:111
+#: ../app/widgets/gimpcontrollerwheel.c:111
 msgid "Scroll Down (Shift)"
-msgstr ""
+msgstr "Korritu behera (Maius)"
 
-#: app/widgets/gimpcontrollerwheel.c:114
+#: ../app/widgets/gimpcontrollerwheel.c:114
 msgid "Scroll Down"
-msgstr ""
+msgstr "Korritu behera"
 
-#: app/widgets/gimpcontrollerwheel.c:118
+#: ../app/widgets/gimpcontrollerwheel.c:118
 msgid "Scroll Left (Shift + Control + Alt)"
-msgstr ""
+msgstr "Korritu ezkerrera (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:121
+#: ../app/widgets/gimpcontrollerwheel.c:121
 msgid "Scroll Left (Control + Alt)"
-msgstr ""
+msgstr "Korritu ezkerrera (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:124
+#: ../app/widgets/gimpcontrollerwheel.c:124
 msgid "Scroll Left (Shift + Alt)"
-msgstr ""
+msgstr "Korritu ezkerrera (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:127
+#: ../app/widgets/gimpcontrollerwheel.c:127
 msgid "Scroll Left (Shift + Control)"
-msgstr ""
+msgstr "Korritu ezkerrera (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:130
+#: ../app/widgets/gimpcontrollerwheel.c:130
 msgid "Scroll Left (Alt)"
-msgstr ""
+msgstr "Korritu ezkerrera (Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:133
+#: ../app/widgets/gimpcontrollerwheel.c:133
 msgid "Scroll Left (Control)"
-msgstr ""
+msgstr "Korritu ezkerrera (Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:136
+#: ../app/widgets/gimpcontrollerwheel.c:136
 msgid "Scroll Left (Shift)"
-msgstr ""
+msgstr "Korritu ezkerrera (Maius)"
 
-#: app/widgets/gimpcontrollerwheel.c:139
+#: ../app/widgets/gimpcontrollerwheel.c:139
 msgid "Scroll Left"
-msgstr ""
+msgstr "Korritu ezkerrera"
 
-#: app/widgets/gimpcontrollerwheel.c:143
+#: ../app/widgets/gimpcontrollerwheel.c:143
 msgid "Scroll Right (Shift + Control + Alt)"
-msgstr ""
+msgstr "Korritu eskuinera (Maius + Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:146
+#: ../app/widgets/gimpcontrollerwheel.c:146
 msgid "Scroll Right (Control + Alt)"
-msgstr ""
+msgstr "Korritu eskuinera (Ktrl + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:149
+#: ../app/widgets/gimpcontrollerwheel.c:149
 msgid "Scroll Right (Shift + Alt)"
-msgstr ""
+msgstr "Korritu eskuinera (Maius + Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:152
+#: ../app/widgets/gimpcontrollerwheel.c:152
 msgid "Scroll Right (Shift + Control)"
-msgstr ""
+msgstr "Korritu eskuinera (Maius + Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:155
+#: ../app/widgets/gimpcontrollerwheel.c:155
 msgid "Scroll Right (Alt)"
-msgstr ""
+msgstr "Korritu eskuinera (Alt)"
 
-#: app/widgets/gimpcontrollerwheel.c:158
+#: ../app/widgets/gimpcontrollerwheel.c:158
 msgid "Scroll Right (Control)"
-msgstr ""
+msgstr "Korritu eskuinera (Ktrl)"
 
-#: app/widgets/gimpcontrollerwheel.c:161
+#: ../app/widgets/gimpcontrollerwheel.c:161
 msgid "Scroll Right (Shift)"
-msgstr ""
+msgstr "Korritu eskuinera (Maius)"
 
-#: app/widgets/gimpcontrollerwheel.c:164
-#, fuzzy
+#: ../app/widgets/gimpcontrollerwheel.c:164
 msgid "Scroll Right"
-msgstr "Argi suabea"
+msgstr "Korritu eskuinera"
 
-#: app/widgets/gimpcontrollerwheel.c:206
-#, fuzzy
+#: ../app/widgets/gimpcontrollerwheel.c:206
 msgid "Mouse Wheel"
-msgstr "Aldatu lekuz kanala "
+msgstr "Saguaren gurpila"
 
-#: app/widgets/gimpcontrollerwheel.c:229
-#, fuzzy
+#: ../app/widgets/gimpcontrollerwheel.c:229
 msgid "Mouse Wheel Events"
-msgstr "Aldatu lekuz kanala "
+msgstr "Saguaren gurpil-gertaerak"
 
-#: app/widgets/gimpdataeditor.c:205
+#: ../app/widgets/gimpdataeditor.c:205
 msgid "Save"
 msgstr "Gorde"
 
-#: app/widgets/gimpdataeditor.c:213
+#: ../app/widgets/gimpdataeditor.c:213
 msgid "Revert"
 msgstr "Leheneratu"
 
-#: app/widgets/gimpdevicestatus.c:281
+#: ../app/widgets/gimpdevicestatus.c:281
 msgid "Save device status"
 msgstr "Gorde gailuaren egoera"
 
-#: app/widgets/gimpdevicestatus.c:385
+#: ../app/widgets/gimpdevicestatus.c:385
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "Aurreko planoa: %d, %d, %d"
 
-#: app/widgets/gimpdevicestatus.c:390
+#: ../app/widgets/gimpdevicestatus.c:390
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "Atzeko planoa: %d, %d, %d"
 
-#: app/widgets/gimpdock.c:348 app/widgets/gimpdock.c:359
-#, fuzzy
+#: ../app/widgets/gimpdock.c:348 ../app/widgets/gimpdock.c:359
 msgid "Close all tabs?"
-msgstr "/_Kendu fitxa"
+msgstr "Itxi fitxa guztiak?"
 
-#: app/widgets/gimpdock.c:354
-#, fuzzy
+#: ../app/widgets/gimpdock.c:354
 msgid "Close all Tabs"
-msgstr "/_Kendu fitxa"
+msgstr "Itxi fitxa guztiak"
 
-#: app/widgets/gimpdock.c:361
+#: ../app/widgets/gimpdock.c:361
 #, c-format
 msgid ""
 "This window has %d tabs open. Closing the window will also close all its "
 "tabs."
-msgstr ""
+msgstr "Leihoak %d fitxa irekita ditu. Leihoa ixtean fitxa guztiak itxiko dira."
 
-#: app/widgets/gimpdock.c:474
+#: ../app/widgets/gimpdock.c:474
 msgid "You can drop dockable dialogs here."
 msgstr "Elkarrizketa-koadro atrakagarriak hemen utz ditzakezu."
 
-#: app/widgets/gimpdockable.c:210
+#: ../app/widgets/gimpdockable.c:210
 msgid "Close this Tab"
 msgstr "Itxi fitxa hau"
 
-#: app/widgets/gimperrorconsole.c:235 app/widgets/gimperrordialog.c:252
+#: ../app/widgets/gimperrorconsole.c:235 ../app/widgets/gimperrordialog.c:252
 #, c-format
 msgid "%s Message"
 msgstr "%s mezua"
 
-#: app/widgets/gimperrordialog.c:229
+#: ../app/widgets/gimperrordialog.c:229
 msgid "Too many error messages!"
-msgstr ""
+msgstr "Errore-mezu gehiegi"
 
-#: app/widgets/gimperrordialog.c:230
-#, fuzzy
+#: ../app/widgets/gimperrordialog.c:230
 msgid "Messages are redirected to stderr."
-msgstr "Mezua behin errepikatu da."
+msgstr "Mezuak stderr-era birbideratzen dira."
 
-#: app/widgets/gimpfiledialog.c:304
+#: ../app/widgets/gimpfiledialog.c:304
 msgid "Automatically Detected"
-msgstr ""
+msgstr "Automatikoki detektatuta"
 
-#: app/widgets/gimpfiledialog.c:310
-#, fuzzy
+#: ../app/widgets/gimpfiledialog.c:310
 msgid "By Extension"
-msgstr "/Luzapenaren arabera"
+msgstr "Luzapenaren arabera"
 
-#: app/widgets/gimpfiledialog.c:469
-#, fuzzy
+#: ../app/widgets/gimpfiledialog.c:469
 msgid "All Files"
-msgstr "Iragazki erabilgarriak"
+msgstr "Fitxategi denak"
 
-#: app/widgets/gimpfiledialog.c:608
-#, fuzzy, c-format
+#: ../app/widgets/gimpfiledialog.c:608
+#, c-format
 msgid "Select File _Type (%s)"
-msgstr "Betegarri-mota: %s"
+msgstr "Hautatu fitxategi-mota (%s)"
 
-#: app/widgets/gimpfileprocview.c:234
-#, fuzzy
+#: ../app/widgets/gimpfileprocview.c:234
 msgid "File Type"
-msgstr "Betegarri-mota"
+msgstr "Fitxategi-mota"
 
-#: app/widgets/gimpfileprocview.c:253
-#, fuzzy
+#: ../app/widgets/gimpfileprocview.c:253
 msgid "Extensions"
-msgstr "/Luzapenaren arabera"
+msgstr "Luzapenak"
 
-#: app/widgets/gimpgradienteditor.c:362
+#: ../app/widgets/gimpgradienteditor.c:362
 msgid "Instant update"
 msgstr "Berehalako eguneratzea"
 
-#: app/widgets/gimpgradienteditor.c:619
+#: ../app/widgets/gimpgradienteditor.c:619
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "Zoom-faktorea: %d:1"
 
-#: app/widgets/gimpgradienteditor.c:622
+#: ../app/widgets/gimpgradienteditor.c:622
 #, c-format
 msgid "Displaying [%0.6f, %0.6f]"
 msgstr "Bistaratzen [%0.6f, %0.6f]"
 
-#: app/widgets/gimpgradienteditor.c:814
+#: ../app/widgets/gimpgradienteditor.c:814
 #, c-format
 msgid "Position: %0.6f"
 msgstr "Kokalekua: %0.6f"
 
-#: app/widgets/gimpgradienteditor.c:816
-#, fuzzy, c-format
+#: ../app/widgets/gimpgradienteditor.c:816
+#, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
-msgstr "(%0.3f, %0.3f, %0.3f)"
+msgstr "GBU (%0.3f, %0.3f, %0.3f)"
 
-#: app/widgets/gimpgradienteditor.c:819
+#: ../app/widgets/gimpgradienteditor.c:819
 #, c-format
 msgid "HSV (%0.3f, %0.3f, %0.3f)"
-msgstr "HSV (%0.3f, %0.3f, %0.3f)"
+msgstr "ÑSB (%0.3f, %0.3f, %0.3f)"
 
-#: app/widgets/gimpgradienteditor.c:821
-#, fuzzy, c-format
+#: ../app/widgets/gimpgradienteditor.c:821
+#, c-format
 msgid "Intensity: %0.3f    Opacity: %0.3f"
-msgstr "RGB (%0.3f, %0.3f, %0.3f)    Opakutasuna: %0.3f"
+msgstr "Intentsitatea: %0.3f    Opakotasuna: %0.3f"
 
-#: app/widgets/gimpgradienteditor.c:854 app/widgets/gimpgradienteditor.c:889
+#: ../app/widgets/gimpgradienteditor.c:854
+#: ../app/widgets/gimpgradienteditor.c:889
 #, c-format
 msgid "RGB (%d, %d, %d)"
-msgstr "RGB (%d, %d, %d)"
+msgstr "GBU (%d, %d, %d)"
 
-#: app/widgets/gimpgradienteditor.c:862
+#: ../app/widgets/gimpgradienteditor.c:862
 msgid "Foreground color set to:"
 msgstr "Ezarritako aurreko planoaren kolorea:"
 
-#: app/widgets/gimpgradienteditor.c:894
+#: ../app/widgets/gimpgradienteditor.c:894
 #, c-format
 msgid "(%0.3f, %0.3f, %0.3f)"
 msgstr "(%0.3f, %0.3f, %0.3f)"
 
-#: app/widgets/gimpgradienteditor.c:898
+#: ../app/widgets/gimpgradienteditor.c:898
 msgid "Background color set to:"
 msgstr "Ezarritako atzeko planoaren kolorea:"
 
-#: app/widgets/gimpgradienteditor.c:1101 app/widgets/gimpgradienteditor.c:1167
+#: ../app/widgets/gimpgradienteditor.c:1101
+#: ../app/widgets/gimpgradienteditor.c:1167
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sArrastatu: aldatu lekuz eta konprimitu"
 
-#: app/widgets/gimpgradienteditor.c:1107
+#: ../app/widgets/gimpgradienteditor.c:1107
 msgid "Drag: move"
 msgstr "Arrastatu: aldatu lekuz"
 
-#: app/widgets/gimpgradienteditor.c:1114 app/widgets/gimpgradienteditor.c:1128
-#: app/widgets/gimpgradienteditor.c:1142 app/widgets/gimpgradienteditor.c:1164
+#: ../app/widgets/gimpgradienteditor.c:1114
+#: ../app/widgets/gimpgradienteditor.c:1128
+#: ../app/widgets/gimpgradienteditor.c:1142
+#: ../app/widgets/gimpgradienteditor.c:1164
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%sEgin klik: luzatu hautapena"
 
-#: app/widgets/gimpgradienteditor.c:1120 app/widgets/gimpgradienteditor.c:1134
+#: ../app/widgets/gimpgradienteditor.c:1120
+#: ../app/widgets/gimpgradienteditor.c:1134
 msgid "Click: select"
 msgstr "Egin klik: hautatu"
 
-#: app/widgets/gimpgradienteditor.c:1148 app/widgets/gimpgradienteditor.c:1172
+#: ../app/widgets/gimpgradienteditor.c:1148
+#: ../app/widgets/gimpgradienteditor.c:1172
 msgid "Click: select    Drag: move"
 msgstr "Egin klik: hautatu\tArrastatu: aldatu lekuz\t"
 
-#: app/widgets/gimpgradienteditor.c:1394 app/widgets/gimpgradienteditor.c:1402
+#: ../app/widgets/gimpgradienteditor.c:1394
+#: ../app/widgets/gimpgradienteditor.c:1402
 #, c-format
 msgid "Handle position: %0.6f"
 msgstr "Heldulekuaren posizioa: %0.6f"
 
-#: app/widgets/gimpgradienteditor.c:1419
+#: ../app/widgets/gimpgradienteditor.c:1419
 #, c-format
 msgid "Distance: %0.6f"
 msgstr "Distantzia: %0.6f"
 
-#: app/widgets/gimpgrideditor.c:219
+#: ../app/widgets/gimpgrideditor.c:219
 msgid "Line _Style:"
 msgstr "Lerro-esti_loa:"
 
-#: app/widgets/gimpgrideditor.c:223
-#, fuzzy
+#: ../app/widgets/gimpgrideditor.c:223
 msgid "Change grid foreground color"
 msgstr "Aldatu saretaren aurreko planoaren kolorea"
 
-#: app/widgets/gimpgrideditor.c:228
-#, fuzzy
+#: ../app/widgets/gimpgrideditor.c:228
 msgid "_Foreground color:"
 msgstr "_Aurreko planoaren kolorea:"
 
-#: app/widgets/gimpgrideditor.c:232
-#, fuzzy
+#: ../app/widgets/gimpgrideditor.c:232
 msgid "Change grid background color"
 msgstr "Aldatu saretaren atzeko planoaren kolorea"
 
-#: app/widgets/gimpgrideditor.c:237
-#, fuzzy
+#: ../app/widgets/gimpgrideditor.c:237
 msgid "_Background color:"
 msgstr "Atzeko pla_noaren kolorea:"
 
-#: app/widgets/gimpgrideditor.c:242
+#: ../app/widgets/gimpgrideditor.c:242
 msgid "Spacing"
 msgstr "Tartea"
 
-#: app/widgets/gimpgrideditor.c:263 app/widgets/gimpgrideditor.c:295
+#: ../app/widgets/gimpgrideditor.c:263 ../app/widgets/gimpgrideditor.c:295
 msgid "Width"
 msgstr "Zabalera"
 
-#: app/widgets/gimpgrideditor.c:265 app/widgets/gimpgrideditor.c:297
+#: ../app/widgets/gimpgrideditor.c:265 ../app/widgets/gimpgrideditor.c:297
 msgid "Height"
 msgstr "Altuera"
 
-#: app/widgets/gimphelp.c:187
-#, fuzzy
+#: ../app/widgets/gimphelp.c:187
 msgid "Help browser not found"
-msgstr "Erabili beharreko _laguntza-arakatzailea:"
+msgstr "laguntza-arakatzailea ez da aurkitu"
 
-#: app/widgets/gimphelp.c:188
-#, fuzzy
+#: ../app/widgets/gimphelp.c:188
 msgid "Could not find GIMP help browser."
-msgstr "Ezin izan da GIMPen laguntza-arakatzailea aurkitu"
+msgstr "Ezin izan da GIMPen laguntza-arakatzailea aurkitu."
 
-#: app/widgets/gimphelp.c:189
-msgid ""
-"The GIMP help browser plug-in appears to be missing from your installation."
-msgstr ""
+#: ../app/widgets/gimphelp.c:189
+msgid "The GIMP help browser plug-in appears to be missing from your installation."
+msgstr "GIMPeko laguntza arakatzailearen plugin-a instalazioan falta dela dirudi."
 
-#: app/widgets/gimphelp.c:213
-#, fuzzy
+#: ../app/widgets/gimphelp.c:213
 msgid "Help browser doesn't start"
-msgstr "Erabili beharreko _laguntza-arakatzailea:"
+msgstr "Laguntza-arakatzailea ez da abiatu"
 
-#: app/widgets/gimphelp.c:214
-#, fuzzy
+#: ../app/widgets/gimphelp.c:214
 msgid "Could not start the GIMP help browser plug-in."
-msgstr "Ezin izan da GIMPeko laguntza-arakatzailea abiarazi."
+msgstr "Ezin izan da GIMPeko laguntza-arakatzaileko plugin-a abiarazi."
 
-#: app/widgets/gimphelp.c:240
-#, fuzzy
+#: ../app/widgets/gimphelp.c:240
 msgid "Use _web browser instead"
-msgstr "Erabili web arakatzailea horren ordez"
+msgstr "Erabili _web arakatzailea horren ordez"
 
-#: app/widgets/gimphistogrameditor.c:134
+#: ../app/widgets/gimphistogrameditor.c:134
 msgid "Mean:"
-msgstr "Batezbestekoa:"
+msgstr "Batez bestekoa:"
 
-#: app/widgets/gimphistogrameditor.c:135
+#: ../app/widgets/gimphistogrameditor.c:135
 msgid "Std Dev:"
 msgstr "Desb est:"
 
-#: app/widgets/gimphistogrameditor.c:136
+#: ../app/widgets/gimphistogrameditor.c:136
 msgid "Median:"
 msgstr "Mediana:"
 
-#: app/widgets/gimphistogrameditor.c:137
+#: ../app/widgets/gimphistogrameditor.c:137
 msgid "Pixels:"
 msgstr "Pixelak:"
 
-#: app/widgets/gimphistogrameditor.c:138
+#: ../app/widgets/gimphistogrameditor.c:138
 msgid "Count:"
 msgstr "Zenbat:"
 
-#: app/widgets/gimphistogrameditor.c:139
+#: ../app/widgets/gimphistogrameditor.c:139
 msgid "Percentile:"
 msgstr "Pertzentila:"
 
-#: app/widgets/gimpimagedock.c:203
+#: ../app/widgets/gimpimagedock.c:203
 msgid "Auto"
 msgstr "Automatikoa"
 
-#: app/widgets/gimpimagedock.c:214
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
+#: ../app/widgets/gimpimagedock.c:214
+msgid "When enabled the dialog automatically follows the image you are working on."
 msgstr ""
+"Gaitutakoan elkarrizketa-koadroak lantzen ari zaren irudiari jarraituko dio "
+"automatikoki."
 
-#: app/widgets/gimpitemtreeview.c:996
+#: ../app/widgets/gimpitemtreeview.c:996
 msgid "Set Item Exclusive Visible"
 msgstr "Ezarri elementua esklusiboki ikusgai"
 
-#: app/widgets/gimpitemtreeview.c:1004
+#: ../app/widgets/gimpitemtreeview.c:1004
 msgid "Set Item Exclusive Linked"
 msgstr "Ezarri elementua esklusiboki ikusgai"
 
-#: app/widgets/gimplayertreeview.c:252
+#: ../app/widgets/gimplayertreeview.c:252
 msgid "Reorder Layer"
 msgstr "Ordenatu berriro geruza"
 
-#: app/widgets/gimplayertreeview.c:313
-#, fuzzy
+#: ../app/widgets/gimplayertreeview.c:313
 msgid "Keep transparency"
 msgstr "Mantendu gardentasuna"
 
-#: app/widgets/gimplayertreeview.c:848
+#: ../app/widgets/gimplayertreeview.c:848
 msgid "Empty Layer"
 msgstr "Hustu testuaren geruza"
 
-#: app/widgets/gimpmessagebox.c:460
+#: ../app/widgets/gimpmessagebox.c:462
 #, c-format
 msgid "Message repeated %d times."
 msgstr "%d aldiz errepikatutako mezua."
 
-#: app/widgets/gimpmessagebox.c:462
+#: ../app/widgets/gimpmessagebox.c:464
 msgid "Message repeated once."
 msgstr "Mezua behin errepikatu da."
 
-#: app/widgets/gimppaletteeditor.c:258 app/widgets/gimppaletteeditor.c:999
+#: ../app/widgets/gimppaletteeditor.c:258
+#: ../app/widgets/gimppaletteeditor.c:999
 msgid "Undefined"
 msgstr "Definitu gabe"
 
-#: app/widgets/gimppaletteeditor.c:266
+#: ../app/widgets/gimppaletteeditor.c:266
 msgid "Columns:"
 msgstr "Zutabeak:"
 
-#: app/widgets/gimppropwidgets.c:1537
+#: ../app/widgets/gimppropwidgets.c:1537
 #, c-format
 msgid "This text input field is limited to %d characters."
 msgstr "Testua sartzeko eremu honek %d karaktereko muga du."
 
-#: app/widgets/gimpselectiondata.c:317
+#: ../app/widgets/gimpselectiondata.c:319
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
 "\n"
 "%s"
 msgstr ""
+"'%s' fitxategia ezin da URI baliagarrian bihurtu:\n"
+"\n"
+"%s"
 
-#: app/widgets/gimpselectiondata.c:321
+#: ../app/widgets/gimpselectiondata.c:323
 msgid "Invalid UTF-8"
 msgstr "UTF-8 baliogabea"
 
-#: app/widgets/gimpsizebox.c:456
-#, fuzzy, c-format
+#: ../app/widgets/gimpsizebox.c:456
+#, c-format
 msgid "%d x %d dpi"
-msgstr "%d x %d pixel"
+msgstr "%d x %d dpi"
 
-#: app/widgets/gimpsizebox.c:458
-#, fuzzy, c-format
+#: ../app/widgets/gimpsizebox.c:458
+#, c-format
 msgid "%d dpi"
-msgstr "dpi"
+msgstr "%d dpi"
 
-#: app/widgets/gimpstrokeeditor.c:198
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:198
 msgid "Line Width:"
-msgstr "Geruza-zabalera:"
+msgstr "Lerro-zabalera:"
 
-#: app/widgets/gimpstrokeeditor.c:209
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:209
 msgid "_Line Style"
-msgstr "Lerro-esti_loa:"
+msgstr "Marra-esti_loa"
 
-#: app/widgets/gimpstrokeeditor.c:228
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:228
 msgid "_Cap style:"
-msgstr "_Maius. estiloa:"
+msgstr "_Txano estiloa:"
 
-#: app/widgets/gimpstrokeeditor.c:234
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:234
 msgid "_Join style:"
 msgstr "Elkartze-esti_loa:"
 
-#: app/widgets/gimpstrokeeditor.c:239
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:239
 msgid "_Miter limit:"
 msgstr "_Angelu-muga:"
 
-#: app/widgets/gimpstrokeeditor.c:246
-#, fuzzy
+#: ../app/widgets/gimpstrokeeditor.c:246
 msgid "Dash pattern:"
 msgstr "Marratxo-eredua:"
 
-#: app/widgets/gimpstrokeeditor.c:288
+#: ../app/widgets/gimpstrokeeditor.c:288
 msgid "Dash preset:"
-msgstr ""
+msgstr "Marratxoaren aurrezarpena:"
 
-#: app/widgets/gimpstrokeeditor.c:300
+#: ../app/widgets/gimpstrokeeditor.c:300
 msgid "_Antialiasing"
 msgstr "_Antialiasing-a"
 
-#: app/widgets/gimptemplateeditor.c:255
+#: ../app/widgets/gimptemplateeditor.c:255
 #, c-format
 msgid "%p"
-msgstr ""
+msgstr "%p"
 
-#: app/widgets/gimptemplateeditor.c:330
-#, fuzzy
+#: ../app/widgets/gimptemplateeditor.c:330
 msgid "_Advanced Options"
-msgstr "Aukerak gordeta"
+msgstr "_Aukera aurreratuak"
 
-#: app/widgets/gimptemplateeditor.c:437
-#, fuzzy
+#: ../app/widgets/gimptemplateeditor.c:437
 msgid "Color_space:"
-msgstr "Kolorea:"
+msgstr "Kolore-espazioa:"
 
-#: app/widgets/gimptemplateeditor.c:445
-#, fuzzy
+#: ../app/widgets/gimptemplateeditor.c:445
 msgid "_Fill with:"
-msgstr "Bete zuriz"
+msgstr "_Bete honekin:"
 
-#: app/widgets/gimptemplateeditor.c:455
-#, fuzzy
+#: ../app/widgets/gimptemplateeditor.c:455
 msgid "Comme_nt:"
-msgstr "Zenbat:"
+msgstr "_Iruzkina:"
 
-#: app/widgets/gimptemplateeditor.c:565
+#: ../app/widgets/gimptemplateeditor.c:565
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: app/widgets/gimptemplateeditor.c:576
+#: ../app/widgets/gimptemplateeditor.c:576
 msgid "_Icon:"
 msgstr "I_konoa:"
 
-#: app/widgets/gimptemplateeditor.c:699
-#, fuzzy, c-format
+#: ../app/widgets/gimptemplateeditor.c:699
+#, c-format
 msgid "%d x %d dpi, %s"
-msgstr "%d x %d pixel"
+msgstr "%d x %d dpi, %s"
 
-#: app/widgets/gimptemplateeditor.c:701
+#: ../app/widgets/gimptemplateeditor.c:701
 #, c-format
 msgid "%d dpi, %s"
-msgstr ""
+msgstr "%d dpi, %s"
 
-#: app/widgets/gimpthumbbox.c:337
+#: ../app/widgets/gimpthumbbox.c:337
 #, c-format
 msgid ""
 "Click to update preview\n"
@@ -11304,39 +10502,36 @@ msgstr ""
 "Egin klik %s aldiz eguneratzea bultzatzeko, baita aurrebista eguneratuta "
 "baldin badago ere"
 
-#: app/widgets/gimpthumbbox.c:407 app/widgets/gimpthumbbox.c:477
-#, fuzzy
+#: ../app/widgets/gimpthumbbox.c:407 ../app/widgets/gimpthumbbox.c:477
 msgid "No selection"
 msgstr "Ez dago hautapenik"
 
-#: app/widgets/gimpthumbbox.c:602 app/widgets/gimpthumbbox.c:626
+#: ../app/widgets/gimpthumbbox.c:602 ../app/widgets/gimpthumbbox.c:626
 #, c-format
 msgid "Thumbnail %d of %d"
-msgstr "%d/%d koadro txikia "
+msgstr "%d/%d koadro txikia"
 
-#: app/widgets/gimpthumbbox.c:730 app/widgets/gimpthumbbox.c:740
-#, fuzzy
+#: ../app/widgets/gimpthumbbox.c:733 ../app/widgets/gimpthumbbox.c:743
 msgid "Creating Preview ..."
-msgstr "Aurrebista kargatzen..."
+msgstr "Aurrebista sortzen..."
 
-#: app/widgets/gimptoolbox-color-area.c:135
+#: ../app/widgets/gimptoolbox-color-area.c:135
 msgid "Change Foreground Color"
 msgstr "Aldatu aurreko planoaren kolorea"
 
-#: app/widgets/gimptoolbox-color-area.c:140
+#: ../app/widgets/gimptoolbox-color-area.c:140
 msgid "Change Background Color"
 msgstr "Aldatu atzeko planoaren kolorea"
 
-#: app/widgets/gimptoolbox-image-area.c:90
-#, fuzzy
+#: ../app/widgets/gimptoolbox-image-area.c:90
 msgid ""
 "The active image.\n"
 "Click to open the Image Dialog."
 msgstr ""
-"Eredu aktiboa.\n"
-"Egin klik ereduen elkarrizketa-koadroa irekitzeko."
+"Irudi aktiboa.\n"
+"Egin klik irudien elkarrizketa-koadroa irekitzeko."
 
-#: app/widgets/gimptoolbox-indicator-area.c:143
+#: ../app/widgets/gimptoolbox-indicator-area.c:143
 msgid ""
 "The active brush.\n"
 "Click to open the Brush Dialog."
@@ -11344,7 +10539,7 @@ msgstr ""
 "Brotxa aktiboa.\n"
 "Egin klik brotxen elkarrizketa-koadroa irekitzeko."
 
-#: app/widgets/gimptoolbox-indicator-area.c:174
+#: ../app/widgets/gimptoolbox-indicator-area.c:174
 msgid ""
 "The active pattern.\n"
 "Click to open the Pattern Dialog."
@@ -11352,7 +10547,7 @@ msgstr ""
 "Eredu aktiboa.\n"
 "Egin klik ereduen elkarrizketa-koadroa irekitzeko."
 
-#: app/widgets/gimptoolbox-indicator-area.c:205
+#: ../app/widgets/gimptoolbox-indicator-area.c:205
 msgid ""
 "The active gradient.\n"
 "Click to open the Gradient Dialog."
@@ -11360,7 +10555,7 @@ msgstr ""
 "Gradiente aktiboa.\n"
 "Egin klik gradienteen elkarrizketa-koadroa irekitzeko."
 
-#: app/widgets/gimptoolbox.c:854
+#: ../app/widgets/gimptoolbox.c:854
 msgid ""
 "Foreground & background colors.  The black and white squares reset colors.  "
 "The arrows swap colors. Double click to open the color selection dialog."
@@ -11369,277 +10564,256 @@ msgstr ""
 "koloreak berrezartzen dituzten. Geziek koloreak trukatzen dituzte. Egin klik "
 "bikoitza koloreak hautatzeko elkarrizketa-koadroa irekitzeko."
 
-#: app/widgets/gimptooloptionseditor.c:185
+#: ../app/widgets/gimptooloptionseditor.c:185
 msgid "Save options to..."
 msgstr "Gorde aukerak..."
 
-#: app/widgets/gimptooloptionseditor.c:193
+#: ../app/widgets/gimptooloptionseditor.c:193
 msgid "Restore options from..."
 msgstr "Leheneratu aukerak hemendik..."
 
-#: app/widgets/gimptooloptionseditor.c:201
+#: ../app/widgets/gimptooloptionseditor.c:201
 msgid "Delete saved options..."
 msgstr "Ezabatu gordetako aukerak..."
 
-#: app/widgets/gimpuimanager.c:495
+#: ../app/widgets/gimpuimanager.c:495
 msgid "Your GIMP installation is incomplete:"
-msgstr ""
+msgstr "GIMPen instalazioa ez dago osatua:"
 
-#: app/widgets/gimpuimanager.c:497
+#: ../app/widgets/gimpuimanager.c:497
 msgid "Plase make sure the menu XML files are correctly installed."
-msgstr ""
+msgstr "Ziurtatu menuko XML fitxategiak ongi instalatuta daudela."
 
-#: app/widgets/gimpundoeditor.c:255
+#: ../app/widgets/gimpundoeditor.c:255
 msgid "[ Base Image ]"
 msgstr "[ Oinarri-irudia ]"
 
-#: app/widgets/gimpvectorstreeview.c:151
-#, fuzzy
+#: ../app/widgets/gimpvectorstreeview.c:151
 msgid "Reorder path"
-msgstr "Ordenatu berriro bidea"
+msgstr "Antolatu berriro bidea"
 
-#: app/widgets/gimpvectorstreeview.c:289
+#: ../app/widgets/gimpvectorstreeview.c:289
 msgid "Empty Path"
 msgstr "Hustu bidea"
 
-#: app/widgets/gimpviewablebox.c:75
+#: ../app/widgets/gimpviewablebox.c:75
 msgid "Open the brush selection dialog"
 msgstr "Ireki brotxa hautatzeko elkarrizketa-koadroa"
 
-#: app/widgets/gimpviewablebox.c:115
+#: ../app/widgets/gimpviewablebox.c:115
 msgid "Open the pattern selection dialog"
 msgstr "Ireki eredua hautatzeko elkarrizketa-koadroa"
 
-#: app/widgets/gimpviewablebox.c:155
+#: ../app/widgets/gimpviewablebox.c:155
 msgid "Open the gradient selection dialog"
 msgstr "Ireki gradientea hautatzeko elkarrizketa-koadroa"
 
-#: app/widgets/gimpviewablebox.c:167
+#: ../app/widgets/gimpviewablebox.c:167
 msgid "Reverse"
 msgstr "Alderantzikatu"
 
-#: app/widgets/gimpviewablebox.c:210
-#, fuzzy
+#: ../app/widgets/gimpviewablebox.c:210
 msgid "Open the palette selection dialog"
 msgstr "Ireki eredua hautatzeko elkarrizketa-koadroa"
 
-#: app/widgets/gimpviewablebox.c:250
+#: ../app/widgets/gimpviewablebox.c:250
 msgid "Open the font selection dialog"
 msgstr "Ireki letra-tipoa hautatzeko elkarrizketa-koadroa"
 
-#: app/widgets/gimpwidgets-constructors.c:50
-#: app/widgets/gimpwidgets-constructors.c:85
+#: ../app/widgets/gimpwidgets-constructors.c:50
+#: ../app/widgets/gimpwidgets-constructors.c:85
 msgid "Normal"
 msgstr "Normala"
 
-#: app/widgets/gimpwidgets-constructors.c:51
-#: app/widgets/gimpwidgets-constructors.c:86
+#: ../app/widgets/gimpwidgets-constructors.c:51
+#: ../app/widgets/gimpwidgets-constructors.c:86
 msgid "Dissolve"
 msgstr "Disolbatu"
 
-#: app/widgets/gimpwidgets-constructors.c:52
+#: ../app/widgets/gimpwidgets-constructors.c:52
 msgid "Behind"
 msgstr "Atzean"
 
-#: app/widgets/gimpwidgets-constructors.c:53
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:53
 msgid "Color erase"
 msgstr "Ezabatu kolorea"
 
-#: app/widgets/gimpwidgets-constructors.c:55
-#: app/widgets/gimpwidgets-constructors.c:88
+#: ../app/widgets/gimpwidgets-constructors.c:55
+#: ../app/widgets/gimpwidgets-constructors.c:88
 msgid "Multiply"
 msgstr "Biderkatu"
 
-#: app/widgets/gimpwidgets-constructors.c:56
-#: app/widgets/gimpwidgets-constructors.c:89
+#: ../app/widgets/gimpwidgets-constructors.c:56
+#: ../app/widgets/gimpwidgets-constructors.c:89
 msgid "Divide"
 msgstr "Zatitu"
 
-#: app/widgets/gimpwidgets-constructors.c:57
-#: app/widgets/gimpwidgets-constructors.c:90
+#: ../app/widgets/gimpwidgets-constructors.c:57
+#: ../app/widgets/gimpwidgets-constructors.c:90
 msgid "Screen"
 msgstr "Pantaila"
 
-#: app/widgets/gimpwidgets-constructors.c:58
-#: app/widgets/gimpwidgets-constructors.c:91
+#: ../app/widgets/gimpwidgets-constructors.c:58
+#: ../app/widgets/gimpwidgets-constructors.c:91
 msgid "Overlay"
 msgstr "Gainjarri"
 
-#: app/widgets/gimpwidgets-constructors.c:62
-#: app/widgets/gimpwidgets-constructors.c:95
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:62
+#: ../app/widgets/gimpwidgets-constructors.c:95
 msgid "Hard light"
 msgstr "Argi bizia"
 
-#: app/widgets/gimpwidgets-constructors.c:63
-#: app/widgets/gimpwidgets-constructors.c:96
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:63
+#: ../app/widgets/gimpwidgets-constructors.c:96
 msgid "Soft light"
 msgstr "Argi suabea"
 
-#: app/widgets/gimpwidgets-constructors.c:64
-#: app/widgets/gimpwidgets-constructors.c:97
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:64
+#: ../app/widgets/gimpwidgets-constructors.c:97
 msgid "Grain extract"
 msgstr "Erauzi pikortsua"
 
-#: app/widgets/gimpwidgets-constructors.c:65
-#: app/widgets/gimpwidgets-constructors.c:98
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:65
+#: ../app/widgets/gimpwidgets-constructors.c:98
 msgid "Grain merge"
 msgstr "Batu pikortsua"
 
-#: app/widgets/gimpwidgets-constructors.c:67
-#: app/widgets/gimpwidgets-constructors.c:100
+#: ../app/widgets/gimpwidgets-constructors.c:67
+#: ../app/widgets/gimpwidgets-constructors.c:100
 msgid "Difference"
 msgstr "Diferentzia"
 
-#: app/widgets/gimpwidgets-constructors.c:68
-#: app/widgets/gimpwidgets-constructors.c:101
+#: ../app/widgets/gimpwidgets-constructors.c:68
+#: ../app/widgets/gimpwidgets-constructors.c:101
 msgid "Addition"
 msgstr "Batuketa"
 
-#: app/widgets/gimpwidgets-constructors.c:70
-#: app/widgets/gimpwidgets-constructors.c:103
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:70
+#: ../app/widgets/gimpwidgets-constructors.c:103
 msgid "Darken only"
 msgstr "Ilundu bakarrik"
 
-#: app/widgets/gimpwidgets-constructors.c:71
-#: app/widgets/gimpwidgets-constructors.c:104
-#, fuzzy
+#: ../app/widgets/gimpwidgets-constructors.c:71
+#: ../app/widgets/gimpwidgets-constructors.c:104
 msgid "Lighten only"
 msgstr "Argitu bakarrik"
 
-#: app/widgets/gimpwidgets-constructors.c:73
-#: app/widgets/gimpwidgets-constructors.c:106
+#: ../app/widgets/gimpwidgets-constructors.c:73
+#: ../app/widgets/gimpwidgets-constructors.c:106
 msgid "Hue"
 msgstr "Ñabardura"
 
-#: app/widgets/gimpwidgets-constructors.c:74
-#: app/widgets/gimpwidgets-constructors.c:107
+#: ../app/widgets/gimpwidgets-constructors.c:74
+#: ../app/widgets/gimpwidgets-constructors.c:107
 msgid "Saturation"
 msgstr "Saturazioa"
 
 #. The format string which is used to display modifier names
 #. *  ,  and 
 #.
-#: app/widgets/gimpwidgets-utils.c:391
+#: ../app/widgets/gimpwidgets-utils.c:391
 #, c-format
 msgid "<%s>"
 msgstr "<%s>"
 
-#: app/widgets/gimpwidgets-utils.c:795
+#: ../app/widgets/gimpwidgets-utils.c:796
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "UTF-8 datu baliogabeak '%s' fitxategian."
 
-#: app/widgets/widgets-enums.c:23
+#: ../app/widgets/widgets-enums.c:23
 msgid "Foreground"
 msgstr "Aurreko planoa"
 
-#: app/widgets/widgets-enums.c:53
+#: ../app/widgets/widgets-enums.c:53
 msgid "Portrait"
 msgstr "Bertikala"
 
-#: app/widgets/widgets-enums.c:54
+#: ../app/widgets/widgets-enums.c:54
 msgid "Landscape"
 msgstr "Horizontala"
 
-#: app/widgets/widgets-enums.c:113
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:113
 msgid "Pixel values"
 msgstr "Pixel-balioak"
 
-#: app/widgets/widgets-enums.c:115
+#: ../app/widgets/widgets-enums.c:115
 msgid "HSV"
-msgstr "HSV"
+msgstr "ÑSB"
 
-#: app/widgets/widgets-enums.c:116
+#: ../app/widgets/widgets-enums.c:116
 msgid "CMYK"
 msgstr "CMYK"
 
-#: app/widgets/widgets-enums.c:171
+#: ../app/widgets/widgets-enums.c:171
 msgid "Black & white"
-msgstr ""
+msgstr "Zuri-beltza"
 
-#: app/widgets/widgets-enums.c:172
+#: ../app/widgets/widgets-enums.c:172
 msgid "Fancy"
-msgstr ""
+msgstr "Dotorea"
 
-#: app/widgets/widgets-enums.c:199
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:199
 msgid "GIMP help browser"
-msgstr "Laguntza-arakatzailea"
+msgstr "GIMPeko laguntza-arakatzailea"
 
-#: app/widgets/widgets-enums.c:200
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:200
 msgid "Web browser"
 msgstr "Web arakatzailea"
 
-#: app/widgets/widgets-enums.c:228
+#: ../app/widgets/widgets-enums.c:228
 msgid "Logarithmic"
 msgstr "Logaritmikoa"
 
-#: app/widgets/widgets-enums.c:261
+#: ../app/widgets/widgets-enums.c:261
 msgid "Icon"
 msgstr "Ikonoa"
 
-#: app/widgets/widgets-enums.c:262
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:262
 msgid "Current status"
 msgstr "Uneko egoera"
 
-#: app/widgets/widgets-enums.c:264
+#: ../app/widgets/widgets-enums.c:264
 msgid "Description"
 msgstr "Azalpena"
 
-#: app/widgets/widgets-enums.c:265
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:265
 msgid "Icon & text"
 msgstr "Ikonoa eta testua"
 
-#: app/widgets/widgets-enums.c:266
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:266
 msgid "Icon & desc"
 msgstr "Ikonoa eta azalpena"
 
-#: app/widgets/widgets-enums.c:267
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:267
 msgid "Status & text"
 msgstr "Egoera eta testua"
 
-#: app/widgets/widgets-enums.c:268
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:268
 msgid "Status & desc"
 msgstr "Egoera eta azalpena"
 
-#: app/widgets/widgets-enums.c:295
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:295
 msgid "View as list"
 msgstr "Ikusi zerrenda gisa"
 
-#: app/widgets/widgets-enums.c:296
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:296
 msgid "View as grid"
 msgstr "Ikusi sareta gisa"
 
-#: app/widgets/widgets-enums.c:324
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:324
 msgid "Normal window"
 msgstr "Leiho normala"
 
-#: app/widgets/widgets-enums.c:325
-#, fuzzy
+#: ../app/widgets/widgets-enums.c:325
 msgid "Utility window"
 msgstr "Utilitateen leihoa"
 
-#: app/widgets/widgets-enums.c:326
+#: ../app/widgets/widgets-enums.c:326
 msgid "Keep above"
-msgstr ""
+msgstr "Mantendu gainean"
 
-#: app/xcf/xcf-load.c:297
+#: ../app/xcf/xcf-load.c:297
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -11649,1856 +10823,41 @@ msgstr ""
 "ez ditu kolore-mapa indexatuak behar bezala gorde\n"
 "Gris-eskalako mapa ordezkatuko da."
 
-#: app/xcf/xcf-read.c:107
+#: ../app/xcf/xcf-read.c:107
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "UTF-8 kate baliogabea  XCF fitxategian."
 
-#: app/xcf/xcf-save.c:157 app/xcf/xcf-save.c:167 app/xcf/xcf-save.c:177
-#: app/xcf/xcf-save.c:187 app/xcf/xcf-save.c:211 app/xcf/xcf.c:342
+#: ../app/xcf/xcf-save.c:157 ../app/xcf/xcf-save.c:167
+#: ../app/xcf/xcf-save.c:177 ../app/xcf/xcf-save.c:187
+#: ../app/xcf/xcf-save.c:211 ../app/xcf/xcf.c:342
 #, c-format
 msgid "Error saving XCF file: %s"
 msgstr "Errorea XCF fitxategia gordetzean: %s"
 
-#: app/xcf/xcf-write.c:86
+#: ../app/xcf/xcf-write.c:86
 #, c-format
 msgid "Error writing XCF: %s"
 msgstr "Errorea XCF idaztean: %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 "Ezin  izan da XCF fitxategian bilatu: %s"
 
-#: app/xcf/xcf.c:86 app/xcf/xcf.c:143
-#, fuzzy
+#: ../app/xcf/xcf.c:86 ../app/xcf/xcf.c:143
 msgid "GIMP XCF image"
-msgstr "GIMPeko mezua"
+msgstr "GIMPeko XCF irudia"
 
-#: app/xcf/xcf.c:282
+#: ../app/xcf/xcf.c:282
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
-msgstr ""
-"XCF errorea: XCF fitxategi-motaren onartu gabeko %d bertsioa aurkitu da"
+msgstr "XCF errorea: XCF fitxategi-motaren onartu gabeko %d bertsioa aurkitu da"
 
-#: data/misc/gimp.desktop.in.in.h:1
+#: ../data/misc/gimp.desktop.in.in.h:1
 msgid "Create and edit images or photographs"
 msgstr "Sortu eta editatu irudiak edo argazkiak"
 
-#: data/misc/gimp.desktop.in.in.h:2
-#, fuzzy
+#: ../data/misc/gimp.desktop.in.in.h:2
 msgid "Image Editor"
-msgstr "Irudi-zerrenda"
+msgstr "Irudi-editorea"
 
-#, fuzzy
-#~ msgid "Keep aspect ratio"
-#~ msgstr "Aspektu-erlazio finkoa"
-
-#~ msgid "Y:"
-#~ msgstr "Y:"
-
-#~ msgid "Transformations do not work on layers that contain layer masks."
-#~ msgstr ""
-#~ "Eraldaketek ez dute funtzionatzen geruza-maskarak dituzten geruzetan."
-
-#~ msgid "Resize Error: Both width and height must be greater than zero."
-#~ msgstr ""
-#~ "Tamaina aldatzean errorea: Zabalerak eta altuerak zero baino handiagoa "
-#~ "izan behar dute."
-
-#~ msgid "Scale Error: Both width and height must be greater than zero."
-#~ msgstr ""
-#~ "Eskalatze-errorea: Zabalerak eta altuerak zero baino handiagoa izan behar "
-#~ "dute."
-
-#~ msgid "C_enter"
-#~ msgstr "_Erdia"
-
-#~ msgid "Indexed Palette Menu"
-#~ msgstr "Paleta indexatuaren menua"
-
-#, fuzzy
-#~ msgid "Inde_xed Palette"
-#~ msgstr "Paleta indexatua"
-
-#, fuzzy
-#~ msgid "_Undo History"
-#~ msgstr "Desegin historia"
-
-#, fuzzy
-#~ msgid "Brus_hes"
-#~ msgstr "Brotxak"
-
-#, fuzzy
-#~ msgid "Show Image _Menu"
-#~ msgstr "/Erakutsi irudiaren _menua"
-
-#, fuzzy
-#~ msgid "Buffer"
-#~ msgstr "Bufferrak"
-
-#~ msgid "Layer _Name"
-#~ msgstr "Geruzaren i_zena"
-
-#~ msgid "Set Indexed Palette"
-#~ msgstr "Ezarri paleta indexatua"
-
-#~ msgid "Change Indexed Palette Entry"
-#~ msgstr "Aldatu paleta indexatuaren sarrera"
-
-#~ msgid "Add Color to Indexed Palette"
-#~ msgstr "Gehitu kolorea paleta indexatuari"
-
-#~ msgid "No preview available"
-#~ msgstr "Ez dago aurrebistarik erabilgarri"
-
-#~ msgid "Indexed Palette"
-#~ msgstr "Paleta indexatua"
-
-#~ msgid "Scale Layer Options"
-#~ msgstr "Geruzak eskalatzeko aukerak"
-
-#~ msgid "Scale Image Options"
-#~ msgstr "Irudiak eskalatzeko aukerak"
-
-#~ msgid "Pixel Dimensions"
-#~ msgstr "Neurriak pixeletan"
-
-#~ msgid "Layer Boundary Size"
-#~ msgstr "Geruzaren mugaren tamaina"
-
-#, fuzzy
-#~ msgid "New width:"
-#~ msgstr "Zabalera berria:"
-
-#, fuzzy
-#~ msgid "New height:"
-#~ msgstr "Altuera:"
-
-#, fuzzy
-#~ msgid "X ratio:"
-#~ msgstr "Xen erlazioa:"
-
-#, fuzzy
-#~ msgid "Y ratio:"
-#~ msgstr "Xen erlazioa:"
-
-#~ msgid "Constrain aspect ratio"
-#~ msgstr "Murriztu aspektu-erlazioa"
-
-#~ msgid "Print Size & Display Unit"
-#~ msgstr "Inprimatze-tamaina eta bistaratze-unitatea"
-
-#, fuzzy
-#~ msgid "X resolution:"
-#~ msgstr "Bereizmena:"
-
-#, fuzzy
-#~ msgid "Y resolution:"
-#~ msgstr "Bereizmena:"
-
-#~ msgid "Stroke Options"
-#~ msgstr "Trazatze-aukerak"
-
-#~ msgid "_Font:"
-#~ msgstr "_Letra-tipoa:"
-
-#~ msgid "_Size:"
-#~ msgstr "Ta_maina:"
-
-#~ msgid ""
-#~ "New Channel\n"
-#~ "%s New Channel Dialog"
-#~ msgstr ""
-#~ "Kanal berria\n"
-#~ "%s kanal berriaren elkarrizketa-koadroa"
-
-#~ msgid "Delete Channel"
-#~ msgstr "Ezabatu kanala"
-
-#, fuzzy
-#~ msgid ""
-#~ "Channel to selection\n"
-#~ "%s  Add\n"
-#~ "%s  Subtract\n"
-#~ "%s  Intersect"
-#~ msgstr ""
-#~ "Kanala hautapenera\n"
-#~ "%s  Gehitu\n"
-#~ "%s  Kendu\n"
-#~ "%s%s%s  Gurutzatu"
-
-#, fuzzy
-#~ msgid "He_x triplet:"
-#~ msgstr "_Hirukote hamaseitarra:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Add color from FG\n"
-#~ "%s  from BG"
-#~ msgstr "/_Gehitu kolorea AtzPl-tik"
-
-#~ msgid "Edit Indexed Color"
-#~ msgstr "Editatu kolore indexatua"
-
-#, fuzzy
-#~ msgid "Edit indexed image palette color"
-#~ msgstr "Editatu irudi indexatuaren kolore-paleta"
-
-#~ msgid ""
-#~ "Open the selected entry\n"
-#~ "%s  Raise window if already open\n"
-#~ "%s  Open image dialog"
-#~ msgstr ""
-#~ "Ireki hautatutako sarrera\n"
-#~ "%s  Igo leihoa dagoeneko irekita badago\n"
-#~ "%s  Ireki irudiaren elkarrizketa-koadroa"
-
-#~ msgid ""
-#~ "Recreate preview\n"
-#~ "%s  Reload all previews\n"
-#~ "%s  Remove Dangling Entries"
-#~ msgstr ""
-#~ "Sortu berriro aurrebista\n"
-#~ "%s  Birkargatu aurrebista guztiak\n"
-#~ "%s  Kendu zintzilik dauden sarrerak"
-
-#, fuzzy
-#~ msgid ""
-#~ "Save all errors\n"
-#~ "%s  Save selection"
-#~ msgstr ""
-#~ "Gorde errore guztiak\n"
-#~ "%s  Gorde hautapena"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s  To Top"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s  gora"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s  To Bottom"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s  behera"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Ezabatu geruza"
-
-#, fuzzy
-#~ msgid ""
-#~ "New color from FG\n"
-#~ "%s  from BG"
-#~ msgstr "/Kolore berria A_tzPl-tik"
-
-#, fuzzy
-#~ msgid ""
-#~ "Selection to path\n"
-#~ "%s  Advanced options"
-#~ msgstr ""
-#~ "Hautapena bidera\n"
-#~ "%s  Aukera aurreratuak"
-
-#~ msgid ""
-#~ "Selection to Path\n"
-#~ "%s  Advanced Options"
-#~ msgstr ""
-#~ "Hautapena bidera\n"
-#~ "%s  Aukera aurreratuak"
-
-#~ msgid ""
-#~ "You are trying to create an image with a size of %s.\n"
-#~ "\n"
-#~ "Choose OK to create this image anyway.\n"
-#~ "Choose Cancel if you did not intend to create such a large image.\n"
-#~ "\n"
-#~ "To prevent this dialog from appearing, increase the \"Maximum Image Size"
-#~ "\" setting (currently %s) in the Preferences dialog."
-#~ msgstr ""
-#~ "Hasierako tamaina %s duen irudia sortzen saiatzen ari zara.\n"
-#~ "\n"
-#~ "Aukeratu Ados hala ere irudia sortu nahi baduzu.\n"
-#~ "Aukeratu Utzi hain irudi handia\n"
-#~ "sortu nahi ez baduzu.\n"
-#~ "\n"
-#~ "Elkarrizketa-koadro hau ager ez dadin,\n"
-#~ "handitu \"Gehienezko irudi-tamaina\"\n"
-#~ "ezarpena (unean %s)\n"
-#~ "'Hobespenak' elkarrizketa-koadroan."
-
-#~ msgid "Layer Too Small"
-#~ msgstr "Geruza txikiegia da"
-
-#, fuzzy
-#~ msgid "Positioned color dithering"
-#~ msgstr "Kolore-bilbe kokatua"
-
-#~ msgid "General Palette Options"
-#~ msgstr "Paleta-aukera orokorrak"
-
-#~ msgid "Dithering Options"
-#~ msgstr "Bilbe-aukerak"
-
-#~ msgid "[ Warning ]"
-#~ msgstr "[ Abisua ]"
-
-#~ msgid ""
-#~ "You are attempting to convert an image with an alpha channel to indexed "
-#~ "colors.\n"
-#~ "Do not generate a palette of more than 255 colors if you intend to create "
-#~ "a transparent or animated GIF file."
-#~ msgstr ""
-#~ "Alfa kanala duen irudia kolore indexatura bihurtzen saiatzen ari zara .\n"
-#~ "Ez sortu 255 kolore baino gehiagoko paleta zure asmoa GIF fitxategi "
-#~ "gardena edo animatua sortzea bada."
-
-#~ msgid ""
-#~ "You are trying to create an image with an initial size of %s.\n"
-#~ "\n"
-#~ "Choose OK to create this image anyway.\n"
-#~ "Choose Cancel if you did not intend to create such a large image.\n"
-#~ "\n"
-#~ "To prevent this dialog from appearing, increase the \"Maximum Image Size"
-#~ "\" setting (currently %s) in the Preferences dialog."
-#~ msgstr ""
-#~ "Hasierako tamaina %s duen irudia sortzen saiatzen ari zara.\n"
-#~ "\n"
-#~ "Aukeratu Ados hala ere irudia sortu nahi baduzu.\n"
-#~ "Aukeratu Utzi hain irudi handia\n"
-#~ "sortu nahi ez baduzu.\n"
-#~ "\n"
-#~ "Elkarrizketa-koadro hau ager ez dadin,\n"
-#~ "handitu \"Gehienezko irudi-tamaina\"\n"
-#~ "ezarpena (unean %s)\n"
-#~ "'Hobespenak' elkarrizketa-koadroan."
-
-#~ msgid "Extended"
-#~ msgstr "Hedatua"
-
-#~ msgid "File Saving"
-#~ msgstr "Fitxategiak gorde"
-
-#~ msgid "Pattern:"
-#~ msgstr "Eredua:"
-
-#~ msgid "Density:"
-#~ msgstr "Dentsitatea:"
-
-#~ msgid ""
-#~ "Could not find the GIMP Help Browser procedure. It probably was not "
-#~ "compiled because you don't have GtkHtml2 installed."
-#~ msgstr ""
-#~ "Ezin izan da GIMPeko laguntza-arakatzailearen prozedura aurkitu. "
-#~ "Beharbada ez da konpilatuta egongo, GtkXmHTML ez baituzu instalatuta."
-
-#~ msgid "Could not start GIMP Help Browser"
-#~ msgstr "Ezin izan da GIMPeko laguntza-arakatzailea abiarazi"
-
-#~ msgid "Internal"
-#~ msgstr "Barnekoa"
-
-#~ msgid "Black"
-#~ msgstr "Beltza"
-
-#~ msgid "Move Floating Layer"
-#~ msgstr "Lekuz aldatu geruza mugikorra"
-
-#~ msgid "Changes were made to '%s'."
-#~ msgstr "%s(e)n aldaketak egin dira."
-
-#~ msgid "Select Custom Palette"
-#~ msgstr "Hautatu paleta pertsonalizatua"
-
-#~ msgid "Light Checks"
-#~ msgstr "Lauki argiak"
-
-#~ msgid "Mid-Tone Checks"
-#~ msgstr "Tarteko tonuko laukiak"
-
-#~ msgid "Dark Checks"
-#~ msgstr "Lauki ilunak"
-
-#~ msgid "White Only"
-#~ msgstr "Zuria bakarrik"
-
-#~ msgid "Gray Only"
-#~ msgstr "Grisa bakarrik"
-
-#~ msgid "Black Only"
-#~ msgstr "Beltza bakarrik"
-
-#~ msgid "Configure input devices"
-#~ msgstr "Konfiguratu sarrerako gailuak"
-
-#~ msgid ""
-#~ "WARNING:\n"
-#~ "Too many open message dialogs.\n"
-#~ "Messages are redirected to stderr."
-#~ msgstr ""
-#~ "ABISUA:\n"
-#~ "Mezuen elkarrizketa-koadro gehiegi daude irekita.\n"
-#~ "Mezuak stderr-era birbideratzen dira."
-
-#, fuzzy
-#~ msgid "RGB color"
-#~ msgstr "RGB kolorea"
-
-#, fuzzy
-#~ msgid "Indexed color"
-#~ msgstr "Kolore indexatua"
-
-#, fuzzy
-#~ msgid "RGB-alpha"
-#~ msgstr "RGB-Alfa"
-
-#, fuzzy
-#~ msgid "Grayscale-alpha"
-#~ msgstr "Gris-eskala alfa"
-
-#, fuzzy
-#~ msgid "Indexed-alpha"
-#~ msgstr "Indexatua-Alfa"
-
-#, fuzzy
-#~ msgid "Clear Saved Keyboard Shortcuts Now"
-#~ msgstr "Garbitu orain gordetako laster-teklak "
-
-#~ msgid "Clear Saved Window Positions Now"
-#~ msgstr "Gorde orain gordetako leihoen kokalekuak"
-
-#, fuzzy
-#~ msgid "Automatic"
-#~ msgstr "/Automatikoa"
-
-#, fuzzy
-#~ msgid "File Open Menu"
-#~ msgstr "Ireki menua"
-
-#, fuzzy
-#~ msgid "File Save Menu"
-#~ msgstr "Gorde menua"
-
-#, fuzzy
-#~ msgid "Foreground Color"
-#~ msgstr "_Aurreko planoaren kolorea:"
-
-#~ msgid ""
-#~ "File '%s' exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "'%s' fitxategia badago.\n"
-#~ "Gainidatzi egin nahi duzu?"
-
-#~ msgid ""
-#~ "Unable to run font callback. The corresponding plug-in may have crashed."
-#~ msgstr ""
-#~ "Ezin da letra-tipoaren atzeradeia exekutatu. Beharbada dagokion plugin-ak "
-#~ "huts egingo zuen."
-
-#~ msgid ""
-#~ "Unable to run gradient callback. The corresponding plug-in may have "
-#~ "crashed."
-#~ msgstr ""
-#~ "Ezin da gradientearen atzeradeia exekutatu. Beharbada dagokion plugin-ak "
-#~ "huts egingo zuen."
-
-#, fuzzy
-#~ msgid ""
-#~ "Some images have unsaved changes.\n"
-#~ "\n"
-#~ "Really quit The GIMP?"
-#~ msgstr ""
-#~ "Fitxategi batzuk ez dira gorde.\n"
-#~ "\n"
-#~ "Benetan GIMPetik irten nahi duzu?"
-
-#~ msgid ""
-#~ "Unable to run palette callback. The corresponding plug-in may have "
-#~ "crashed."
-#~ msgstr ""
-#~ "Ezin da paletaren atzeradeia exekutatu. Beharbada dagokion plugin-ak huts "
-#~ "egin du."
-
-#~ msgid ""
-#~ "Unable to run pattern callback. The corresponding plug-in may have "
-#~ "crashed."
-#~ msgstr ""
-#~ "Ezin da ereduaren atzeradeia exekutatu. Beharbada dagokion plugin-ak huts "
-#~ "egin du."
-
-#~ msgid "Pointer Movement Feedback"
-#~ msgstr "Erakuslearen mugimenduaren berrelikadura"
-
-#~ msgid "Select Temp Dir"
-#~ msgstr "Hautatu aldi baterako direktorioa"
-
-#, fuzzy
-#~ msgid "Swap dir:"
-#~ msgstr "Swap direktorioa:"
-
-#~ msgid "Select Swap Dir"
-#~ msgstr "Hautatu swap direktorioa"
-
-#, fuzzy
-#~ msgid "Don't show grid"
-#~ msgstr "Ez erakutsi sareta"
-
-#~ msgid "Determine File _Type:"
-#~ msgstr "Zehaztu fitxategi-mo_ta:"
-
-#, fuzzy
-#~ msgid "Zoom to _Fit Window"
-#~ msgstr "Doitu zooma leihora"
-
-#~ msgid "Trying legacy loader on file '%s' with unknown extension."
-#~ msgstr ""
-#~ "Aurreko kargadorea probatzen luzapen ezezaguna duen '%s' fitxategian."
-
-#~ msgid "Set canvas padding color"
-#~ msgstr "Ezarri oihalaren kolore betegarria"
-
-#~ msgid "Zoom to fit window"
-#~ msgstr "Doitu zooma leihora"
-
-#~ msgid "Show S_election"
-#~ msgstr "Erakutsi _hautapena"
-
-#~ msgid "_Undo History Preview Size:"
-#~ msgstr "_Desegin historiako aurrebistaren tamaina:"
-
-#~ msgid "Dialog Behavior"
-#~ msgstr "Elkarrizketa-koadroaren portaera"
-
-#~ msgid "_Info Window Per Display"
-#~ msgstr "_Informazio-leihoa pantailako"
-
-#~ msgid "Menus"
-#~ msgstr "Menuak"
-
-#~ msgid "Enable _Tearoff Menus"
-#~ msgstr "Gaitu _menu askagarriak"
-
-#~ msgid "Open _Recent Menu Size:"
-#~ msgstr "Dokumentu ireki berrien _menuaren tamaina:"
-
-#~ msgid "Context Sensitive _Help with \"F1\""
-#~ msgstr "Testuinguruaren laguntza sentikorra \"F1\" sakatuz"
-
-#~ msgid "Perfect-but-Slow _Pointer Tracking"
-#~ msgstr "Erakuslearen _segimendu ezin hobea baina motela"
-
-#~ msgid "Enable Cursor _Updating"
-#~ msgstr "Gaitu _kurtsorearen eguneratzea"
-
-#~ msgid "8-Bit Displays"
-#~ msgstr "8-biteko pantailak"
-
-#~ msgid "Minimum Number of Colors:"
-#~ msgstr "Gutxieneko kolore-kopurua:"
-
-#~ msgid "Install Colormap"
-#~ msgstr "Instalatu kolore-mapa"
-
-#~ msgid "Monitor Resolution"
-#~ msgstr "Monitorearen bereizmena"
-
-#~ msgid "Monitor"
-#~ msgstr "Monitorea"
-
-#~ msgid "(Currently %d x %d dpi)"
-#~ msgstr "(unean %d x %d dpi)"
-
-#~ msgid "From _Windowing System"
-#~ msgstr "Leihoen _sistematik"
-
-#~ msgid "Conservative Memory Usage"
-#~ msgstr "Memoria-erabilera zuhurra"
-
-#~ msgid "Only when Modified"
-#~ msgstr "Aldatutakoan bakarrik"
-
-#~ msgid "Always"
-#~ msgstr "Beti"
-
-#~ msgid "\"File -> Save\" Saves the Image:"
-#~ msgstr "\"Fitxategia -> Gorde\" aukerak irudia gordetzen du:"
-
-#~ msgid "Session"
-#~ msgstr "Saioa"
-
-#~ msgid "Click \"Continue\" to start The GIMP."
-#~ msgstr "Sakatu \"Jarraitu\" GIMP abiarazteko."
-
-#~ msgid ""
-#~ "To display images in their natural size, GIMP needs to know your "
-#~ "monitor resolution."
-#~ msgstr ""
-#~ "Irudiak beren tamaina naturalean bistaratzeko, GIMPek zure "
-#~ "monitorearen bereizmena jakin behar du."
-
-#~ msgid ""
-#~ "GIMP can obtain this information from the windowing system.  However, "
-#~ "usually this does not give useful values."
-#~ msgstr ""
-#~ "GIMPek informazio hori leiho-sistematik eskura dezake. Baina, horrek "
-#~ "eskuarki ez ditu balio erabilgarriak ematen."
-
-#~ msgid "Alternatively, you can set the monitor resolution manually."
-#~ msgstr "Bestela, monitorearen bereizmena eskuz ezar dezakezu."
-
-#~ msgid ""
-#~ "You can also press the \"Calibrate\" button to open a window which lets "
-#~ "you determine your monitor resolution interactively."
-#~ msgstr ""
-#~ "\"Kalibratu\" botoia ere saka dezakezu monitorearen bereizmena "
-#~ "interaktiboki zehazteko aukera ematen dizun leihoa irekitzeko."
-
-#~ msgid "Calibrate"
-#~ msgstr "Kalibratu"
-
-#~ msgid "/Tools/Selection Tools/Fu_zzy Select"
-#~ msgstr "/Tresnak/Hautapen-tresnak/Hurbilketazko hauta_pena"
-
-#~ msgid "Threshold Range:"
-#~ msgstr "Muga-barrutia:"
-
-#~ msgid ""
-#~ "Activate both the \"Keep Height\" and\n"
-#~ "\"Keep Width\" toggles to constrain\n"
-#~ "the aspect ratio"
-#~ msgstr ""
-#~ "Aktibatu \"Mantendu altuera\" eta\n"
-#~ "\"Mantendu zabalera\" aukerak\n"
-#~ "aspektu-erlazioa murrizteko"
-
-#~ msgid "Intensity Range:"
-#~ msgstr "Intentsitate-barrutia:"
-
-#~ msgid "Transparent"
-#~ msgstr "Gardena"
-
-#~ msgid "Spiral (anticlockwise)"
-#~ msgstr "Espirala (erlojuaren noranzkoaren kontrakoa)"
-
-#~ msgid "/Add Tab/Tool _Options"
-#~ msgstr "/Gehitu fitxa/Tresna _Aukerak"
-
-#~ msgid "/Add Tab/_Device Status"
-#~ msgstr "/Gehitu fitxa/Gai_luaren egoera"
-
-#~ msgid "/Add Tab/_Layers"
-#~ msgstr "/Gehitu fitxa/G_eruzak"
-
-#~ msgid "/Add Tab/_Channels"
-#~ msgstr "/Gehitu fitxa/_Kanalak"
-
-#~ msgid "/Add Tab/_Paths"
-#~ msgstr "/Gehitu fitxa/_Bideak"
-
-#~ msgid "/Add Tab/Inde_xed Palette"
-#~ msgstr "/Gehitu fitxa/Paleta inde_xatua"
-
-#~ msgid "/Add Tab/Histogra_m"
-#~ msgstr "/Gehitu fitxa/_Histograma"
-
-#~ msgid "/Add Tab/_Selection Editor"
-#~ msgstr "/Gehitu fitxa/_Hautapenaren editorea"
-
-#~ msgid "/Add Tab/Na_vigation"
-#~ msgstr "/Gehitu fitxa/Nabiga_zioa"
-
-#~ msgid "/Add Tab/_Undo History"
-#~ msgstr "/Gehitu fitxa/_Desegin historia"
-
-#~ msgid "/Add Tab/Colo_rs"
-#~ msgstr "/Gehitu fitxa/K_oloreak"
-
-#~ msgid "/Add Tab/Brus_hes"
-#~ msgstr "/Gehitu fitxa/Bro_txak"
-
-#~ msgid "/Add Tab/P_atterns"
-#~ msgstr "/Gehitu fitxa/E_reduak"
-
-#~ msgid "/Add Tab/_Gradients"
-#~ msgstr "/Gehitu fitxa/_Gradienteak"
-
-#~ msgid "/Add Tab/Pal_ettes"
-#~ msgstr "/Gehitu fitxa/_Paletak"
-
-#~ msgid "/Add Tab/_Fonts"
-#~ msgstr "/Gehitu fitxa/Letra-t_ipoak"
-
-#~ msgid "/Add Tab/_Buffers"
-#~ msgstr "/Gehitu fitxa/Bu_fferrak"
-
-#~ msgid "/Add Tab/_Images"
-#~ msgstr "/Gehitu fitxa/Ir_udiak"
-
-#~ msgid "/Add Tab/Document Histor_y"
-#~ msgstr "/Gehitu fitxa/Doku_mentuaren historia"
-
-#~ msgid "/Add Tab/_Templates"
-#~ msgstr "/Gehitu fitxa/Txa_ntiloiak"
-
-#~ msgid "/Add Tab/T_ools"
-#~ msgstr "/Gehitu fitxa/_Tresnak"
-
-#~ msgid "/Add Tab/Error Co_nsole"
-#~ msgstr "/Gehitu fitxa/Errore-kont_sola"
-
-#~ msgid "/Preview Size/_Tiny"
-#~ msgstr "/Aurrebistaren tamaina/Oso _txikia"
-
-#~ msgid "/Preview Size/E_xtra Small"
-#~ msgstr "/Aurrebistaren tamaina/O_so-oso txikia"
-
-#~ msgid "/Preview Size/_Small"
-#~ msgstr "/Aurrebistaren tamaina/T_xikia"
-
-#~ msgid "/Preview Size/_Medium"
-#~ msgstr "/Aurrebistaren tamaina/T_artekoa"
-
-#~ msgid "/Preview Size/_Large"
-#~ msgstr "/Aurrebistaren tamaina/_Handia"
-
-#~ msgid "/Preview Size/Ex_tra Large"
-#~ msgstr "/Aurrebistaren tamaina/_Oso-oso handia"
-
-#~ msgid "/Preview Size/_Huge"
-#~ msgstr "/Aurrebistaren tamaina/_Itzela"
-
-#~ msgid "/Preview Size/_Enormous"
-#~ msgstr "/Aurrebistaren tamaina/I_karagarria"
-
-#~ msgid "/Preview Size/_Gigantic"
-#~ msgstr "/Aurrebistaren tamaina/_Erraldoia"
-
-#~ msgid "/Tab Style/_Icon"
-#~ msgstr "/Fitxa-estiloa/_Ikonoa"
-
-#~ msgid "/Tab Style/Current _Status"
-#~ msgstr "/Fitxa-estiloa/Uneko _egoera"
-
-#~ msgid "/Tab Style/_Text"
-#~ msgstr "/Fitxa-estiloa/_Testua"
-
-#~ msgid "/Tab Style/I_con & Text"
-#~ msgstr "/Fitxa-estiloa/I_konoa eta testua"
-
-#~ msgid "/Tab Style/St_atus & Text"
-#~ msgstr "/Fitxa-estiloa/Eg_oera eta testua"
-
-#~ msgid "From _Template:"
-#~ msgstr "Txa_ntiloitik:"
-
-#~ msgid "/Load Left Color From/_Right Endpoint"
-#~ msgstr "/Kargatu ezkerreko kolorea hemendik/Esku_ineko amaiera-puntua"
-
-#~ msgid "/Load Left Color From/_FG Color"
-#~ msgstr "/Kargatu ezkerreko kolorea hemendik/_Aurreko planoaren kolorea"
-
-#~ msgid "/Load Left Color From/_BG Color"
-#~ msgstr "/Kargatu ezkerreko kolorea hemendik/A_tzeko planoaren kolorea"
-
-#~ msgid "/Load Right Color From/_Left Endpoint"
-#~ msgstr "/Kargatu eskuineko kolorea hemendik/E_zkerreko amaiera-puntua"
-
-#~ msgid "/Load Right Color From/_FG Color"
-#~ msgstr "/Kargatu eskuineko kolorea hemendik/_Aurreko planoren kolorea"
-
-#~ msgid "/Load Right Color From/_BG Color"
-#~ msgstr "/Kargatu eskuineko kolorea hemendik/A_tzeko planoaren kolorea"
-
-#~ msgid "/blendingfunction/_Linear"
-#~ msgstr "/nahaste-funtzioa/_Lineala"
-
-#~ msgid "/blendingfunction/_Curved"
-#~ msgstr "/nahaste-funtzioa/_Kurbaduna"
-
-#~ msgid "/blendingfunction/_Sinusodial"
-#~ msgstr "/nahaste-funtzioa/_Sinusoidala"
-
-#~ msgid "/blendingfunction/(Varies)"
-#~ msgstr "/nahaste-funtzioa/(aldatu egiten da)"
-
-#~ msgid "/coloringtype/_RGB"
-#~ msgstr "/koloreztatze-mota/_RGB"
-
-#~ msgid "/coloringtype/HSV (clockwise _hue)"
-#~ msgstr "/koloreztatze-mota/HSV (ñabardura erloj_uaren noranzkoan)"
-
-#~ msgid "/coloringtype/(Varies)"
-#~ msgstr "/koloreztatze-mota/(aldatu egiten da)"
-
-#~ msgid "Final, Anchored Layer should be:"
-#~ msgstr "Ainguratutako azken geruzak hau izan behar du:"
-
-#~ msgid "/File/_New..."
-#~ msgstr "/Fitxategia/_Berria..."
-
-#~ msgid "/File/Open Recent/(None)"
-#~ msgstr "/Fitxategia/Ireki erabili berria/(Bat ere ez)"
-
-#~ msgid "/File/Open Recent/Document _History"
-#~ msgstr "/Fitxategia/Ireki erabili berria/Dokumentuaren _historia..."
-
-#~ msgid "/File/_Save"
-#~ msgstr "/Fitxategia/_Gorde"
-
-#~ msgid "/File/Re_vert"
-#~ msgstr "/Fitxategia/Le_heneratu"
-
-#~ msgid "/File/_Close"
-#~ msgstr "/Fitxategia/It_xi"
-
-#~ msgid "/Edit/_Undo"
-#~ msgstr "/Editatu/_Desegin"
-
-#~ msgid "/Edit/_Redo"
-#~ msgstr "/Editatu/_Berregin"
-
-#~ msgid "/Edit/Undo _History"
-#~ msgstr "/Editatu/Desegin _historia"
-
-#~ msgid "/Edit/Cu_t"
-#~ msgstr "/Editatu/Eb_aki"
-
-#~ msgid "/Edit/_Copy"
-#~ msgstr "/Editatu/_Kopiatu"
-
-#~ msgid "/Edit/_Paste"
-#~ msgstr "/Editatu/It_satsi"
-
-#~ msgid "/Edit/Paste _Into"
-#~ msgstr "/Editatu/Itsatsi he_men"
-
-#~ msgid "/Edit/Paste as _New"
-#~ msgstr "/Editatu/Itsatsi be_rri gisa"
-
-#~ msgid "/Edit/_Buffer"
-#~ msgstr "/Editatu/_Bufferra"
-
-#~ msgid "/Edit/Buffer/Cu_t Named..."
-#~ msgstr "/Editatu/Bufferra/Ebaki ize_nduna..."
-
-#~ msgid "/Edit/Buffer/_Copy Named..."
-#~ msgstr "/Editatu/Bufferra/Ko_piatu izenduna..."
-
-#~ msgid "/Edit/Cl_ear"
-#~ msgstr "/Edit/_Garbitu"
-
-#~ msgid "/Edit/Fill with _FG Color"
-#~ msgstr "/Editatu/B_ete aurreko planoaren koloreaz"
-
-#~ msgid "/Edit/Fill with B_G Color"
-#~ msgstr "/Editatu/B_ete atzeko planoaren koloreaz"
-
-#~ msgid "/Edit/Fill with P_attern"
-#~ msgstr "/Editatu/Bete ere_duarekin"
-
-#~ msgid "/Edit/_Stroke Selection..."
-#~ msgstr "/Editatu/_Marraztu hautapena..."
-
-#~ msgid "/Edit/St_roke Path..."
-#~ msgstr "/Editatu/Ma_rraztu bidea..."
-
-#~ msgid "/Select/_All"
-#~ msgstr "/Hautatu/_Guztiak"
-
-#~ msgid "/Select/_None"
-#~ msgstr "/Hautatu/_Bat ere ez"
-
-#~ msgid "/Select/_Invert"
-#~ msgstr "/Hautatu/_Alderantzikatu"
-
-#~ msgid "/Select/_Float"
-#~ msgstr "/Hautatu/_Mugikorra"
-
-#~ msgid "/Select/_By Color"
-#~ msgstr "/Hautatu/_Kolorearen arabera"
-
-#~ msgid "/Select/_Sharpen"
-#~ msgstr "/Hautatu/En_fokatu"
-
-#~ msgid "/Select/S_hrink..."
-#~ msgstr "/Hautatu/T_xikitu..."
-
-#~ msgid "/Select/Toggle _QuickMask"
-#~ msgstr "/Hautatu/Ma_skara bizkorra bai/ez"
-
-#~ msgid "/Select/To _Path"
-#~ msgstr "/Hautatu/Bi_dera"
-
-#~ msgid "/View/_New View"
-#~ msgstr "/Ikusi/Ikus_pegi berria"
-
-#~ msgid "/View/_Zoom"
-#~ msgstr "/Ikusi/_Zooma"
-
-#~ msgid "/View/Zoom/Zoom _Out"
-#~ msgstr "/Ikusi/Zooma/Txikia_gotu"
-
-#~ msgid "/View/Zoom/Zoom _In"
-#~ msgstr "/Ikusi/Zooma/Ha_ndiagotu"
-
-#~ msgid "/View/Zoom/Zoom to _Fit Window"
-#~ msgstr "/Ikusi/Zooma/Handiagotu _leihora doitu arte"
-
-#~ msgid "/View/_Info Window"
-#~ msgstr "/Ikusi/_Informazio-leihoa"
-
-#~ msgid "/View/Show _Selection"
-#~ msgstr "/Ikusi/Erakutsi hau_tapena"
-
-#~ msgid "/View/Show _Layer Boundary"
-#~ msgstr "/Ikusi/Erakutsi _geruzaren muga"
-
-#~ msgid "/View/Show _Guides"
-#~ msgstr "/Ikusi/Erakutsi _gidak"
-
-#~ msgid "/View/S_how Grid"
-#~ msgstr "/Ikusi/Erakuts_i sareta"
-
-#~ msgid "/View/Show _Menubar"
-#~ msgstr "/Ikusi/Erakutsi _menu-barra"
-
-#~ msgid "/View/Show R_ulers"
-#~ msgstr "/Ikusi/Erakutsi errege_lak"
-
-#~ msgid "/View/Show Scroll_bars"
-#~ msgstr "/Ikusi/Erakutsi korritze-_barrak"
-
-#~ msgid "/View/Show S_tatusbar"
-#~ msgstr "/Ikusi/Erakutsi _egoera-barra"
-
-#~ msgid "/View/Shrink _Wrap"
-#~ msgstr "/Ikusi/Uzkurtu _doitzea"
-
-#~ msgid "/Image/_Mode"
-#~ msgstr "/Irudia/_Modua"
-
-#~ msgid "/Image/Mode/_RGB"
-#~ msgstr "/Irudia/Modua/_RGB"
-
-#~ msgid "/Image/Mode/_Grayscale"
-#~ msgstr "/Irudia/Modua/_Gris-eskala"
-
-#~ msgid "/Image/Mode/_Indexed..."
-#~ msgstr "/Irudia/Modua/_Indexatua"
-
-#~ msgid "/Image/_Transform"
-#~ msgstr "/Irudia/_Eraldatu"
-
-#~ msgid "/Image/Transform/Flip _Horizontally"
-#~ msgstr "/Irudia/Eraldatu/Irauli _horizontalki"
-
-#~ msgid "/Image/Transform/Flip _Vertically"
-#~ msgstr "/Irudia/Eraldatu/Irauli _bertikalki"
-
-#~ msgid "/Image/Transform/Rotate 90 degrees _CW"
-#~ msgstr "/Irudia/Eraldatu/Bira_tu 90 gradu erlojuaren noranzkoan"
-
-#~ msgid "/Image/Can_vas Size..."
-#~ msgstr "/Irudia/Mi_hisearen tamaina..."
-
-#~ msgid "/Image/_Scale Image..."
-#~ msgstr "/Irudia/_Eskalatu irudia..."
-
-#~ msgid "/Image/_Crop Image"
-#~ msgstr "/Irudia/E_baki irudia"
-
-#~ msgid "/Image/_Duplicate"
-#~ msgstr "/Irudia/_Bikoiztu"
-
-#~ msgid "/Image/Merge Visible _Layers..."
-#~ msgstr "/Irudia/Batu ikus_gai dauden geruzak..."
-
-#~ msgid "/Image/_Flatten Image"
-#~ msgstr "/Irudia/Be_rdindu irudia"
-
-#~ msgid "/Image/Configure G_rid..."
-#~ msgstr "/Irudia/Kon_figuratu sareta..."
-
-#~ msgid "/Layer/_New Layer..."
-#~ msgstr "/Geruza/Geruz_a berria..."
-
-#~ msgid "/Layer/Du_plicate Layer"
-#~ msgstr "/Geruza/Bikoiz_tu geruza"
-
-#~ msgid "/Layer/Anchor _Layer"
-#~ msgstr "/Geruza/Ainguratu _geruza"
-
-#~ msgid "/Layer/Me_rge Down"
-#~ msgstr "/Geruza/Batu be_herantz"
-
-#~ msgid "/Layer/_Delete Layer"
-#~ msgstr "/Geruza/_Ezabatu geruza"
-
-#~ msgid "/Layer/Stack/_Raise Layer"
-#~ msgstr "/Geruza/Pila/Igo _geruza"
-
-#~ msgid "/Layer/Stack/_Lower Layer"
-#~ msgstr "/Geruza/Pila/Jaitsi g_eruza"
-
-#~ msgid "/Layer/Stack/Layer to T_op"
-#~ msgstr "/Geruza/Pila/Geruza g_ora"
-
-#~ msgid "/Layer/Stack/Layer to Botto_m"
-#~ msgstr "/Geruza/Pila/Geruza be_hera"
-
-#~ msgid "/Layer/_Colors"
-#~ msgstr "/Geruza/_Koloreak"
-
-#~ msgid "/Layer/Colors/Color _Balance..."
-#~ msgstr "/Geruza/Koloreak/Kolore-balantzea..."
-
-#~ msgid "/Layer/Colors/Hue-_Saturation..."
-#~ msgstr "/Geruza/Koloreak/Ñabardura -_Saturazioa..."
-
-#~ msgid "/Layer/Colors/Colori_ze..."
-#~ msgstr "/Geruza/Koloreak/Kolore_ztatu..."
-
-#~ msgid "/Layer/Colors/B_rightness-Contrast..."
-#~ msgstr "/Geruza/Koloreak/Disti_ra - Kontrastea..."
-
-#~ msgid "/Layer/Colors/_Threshold..."
-#~ msgstr "/Geruza/Koloreak/_Muga..."
-
-#~ msgid "/Layer/Colors/_Levels..."
-#~ msgstr "/Geruza/Koloreak/Mai_lak..."
-
-#~ msgid "/Layer/Colors/_Curves..."
-#~ msgstr "/Geruza/Koloreak/_Kurbak..."
-
-#~ msgid "/Layer/Colors/_Posterize..."
-#~ msgstr "/Geruza/Koloreak/_Posterizatu..."
-
-#~ msgid "/Layer/Colors/_Desaturate"
-#~ msgstr "/Geruza/Koloreak/_Desasetu"
-
-#~ msgid "/Layer/Colors/In_vert"
-#~ msgstr "/Geruza/Koloreak/Al_derantzikatu"
-
-#~ msgid "/Layer/Colors/_Auto"
-#~ msgstr "/Geruza/Koloreak/_Automatikoa"
-
-#~ msgid "/Layer/Colors/Auto/_Equalize"
-#~ msgstr "/Geruza/Koloreak/Automatikoa/_Ekualizatu"
-
-#~ msgid "/Layer/Colors/_Histogram"
-#~ msgstr "/Geruza/Koloreak/_Histograma"
-
-#~ msgid "/Layer/_Mask"
-#~ msgstr "/Geruza/_Maskara"
-
-#~ msgid "/Layer/Mask/_Add Layer Mask..."
-#~ msgstr "/Geruza/Maskara/_Gehitu geruza-maskara..."
-
-#~ msgid "/Layer/Mask/A_pply Layer Mask"
-#~ msgstr "/Geruza/Maskara/A_plikatu geruza-maskara"
-
-#~ msgid "/Layer/Mask/_Delete Layer Mask"
-#~ msgstr "/Geruza/Maskara/_Ezabatu geruza-maskara"
-
-#~ msgid "/Layer/Mask/_Mask to Selection"
-#~ msgstr "/Geruza/Maskara/_Maskara hautapenera"
-
-#~ msgid "/Layer/Mask/_Add to Selection"
-#~ msgstr "/Geruza/Maskara/_Gehitu hautapenari"
-
-#~ msgid "/Layer/Mask/_Subtract from Selection"
-#~ msgstr "/Geruza/Maskara/_Kendu hautapenetik"
-
-#~ msgid "/Layer/Mask/_Intersect with Selection"
-#~ msgstr "/Geruza/Maskara/Guru_tzatu hautapenarekin"
-
-#~ msgid "/Layer/Tr_ansparency"
-#~ msgstr "/Geruza/Gar_dentasuna"
-
-#~ msgid "/Layer/Transparency/_Add Alpha Channel"
-#~ msgstr "/Geruza/Gardentasuna/_Gehitu alfa kanala"
-
-#~ msgid "/Layer/Transparency/Al_pha to Selection"
-#~ msgstr "/Geruza/Gardentasuna/Alfa hauta_penera"
-
-#~ msgid "/Layer/Transparency/A_dd to Selection"
-#~ msgstr "/Geruza/Gardentasuna/Gehitu _hautapenari"
-
-#~ msgid "/Layer/Transparency/_Subtract from Selection"
-#~ msgstr "/Geruza/Gardentasuna/Kend_u hautapenetik"
-
-#~ msgid "/Layer/Transparency/_Intersect with Selection"
-#~ msgstr "/Geruza/Gardentasuna/Gurut_zatu hautapenarekin"
-
-#~ msgid "/Layer/_Transform"
-#~ msgstr "/Geruza/_Eraldatu"
-
-#~ msgid "/Layer/Transform/Flip _Horizontally"
-#~ msgstr "/Geruza/Eraldatu/Irauli _horizontalki"
-
-#~ msgid "/Layer/Transform/Flip _Vertically"
-#~ msgstr "/Geruza/Eraldatu/Irauli _bertikalki"
-
-#~ msgid "/Layer/Transform/Rotate 90 degrees CC_W"
-#~ msgstr "/Geruza/Eraldatu/Bira_tu 90 gradu erlojuaren kontrako noranzkoan"
-
-#~ msgid "/Layer/Transform/Rotate _180 degrees"
-#~ msgstr "/Geruza/Eraldatu/Bi_ratu 180 gradu"
-
-#~ msgid "/Layer/Transform/_Offset..."
-#~ msgstr "/Geruza/Eraldatu/_Desplazamendua..."
-
-#~ msgid "/Layer/Layer _Boundary Size..."
-#~ msgstr "/Geruza/Geruzaren _mugaren tamaina..."
-
-#~ msgid "/Layer/Layer to _Image Size"
-#~ msgstr "/Geruza/_Geruza irudi-tamainara"
-
-#~ msgid "/Layer/_Scale Layer..."
-#~ msgstr "/Geruza/_Eskalatu geruza..."
-
-#~ msgid "/Layer/Cr_op Layer"
-#~ msgstr "/Geruza/Eba_ki geruza"
-
-#~ msgid "/Tools/_Paint Tools"
-#~ msgstr "/Tresnak/_Margotzeko tresnak"
-
-#~ msgid "/Dialogs/Create New Dock/_Misc. Stuff"
-#~ msgstr "/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/As_kotarikoak"
-
-#~ msgid "/Dialogs/Tool _Options"
-#~ msgstr "/Elkarrizketa-koadroak/_Tresna-aukerak"
-
-#~ msgid "/Dialogs/_Device Status"
-#~ msgstr "/Elkarrizketa-koadroak/_Gailuaren egoera"
-
-#~ msgid "/Dialogs/_Layers"
-#~ msgstr "/Elkarrizketa-koadroak/Geru_zak"
-
-#~ msgid "/Dialogs/_Channels"
-#~ msgstr "/Elkarrizketa-koadroak/_Kanalak"
-
-#~ msgid "/Dialogs/_Paths"
-#~ msgstr "/Elkarrizketa-koadroak/_Bideak..."
-
-#~ msgid "/Dialogs/Inde_xed Palette"
-#~ msgstr "/Elkarrizketa-koadroak/_Paleta indexatua"
-
-#~ msgid "/Dialogs/Histogra_m"
-#~ msgstr "/Elkarrizketa-koadroak/Historiagra_ma"
-
-#~ msgid "/Dialogs/_Selection Editor"
-#~ msgstr "/Elkarrizketa-koadroak/_Hautapenaren editorea"
-
-#~ msgid "/Dialogs/Na_vigation"
-#~ msgstr "/Elkarrizketa-koadroak/_Nabigazioa"
-
-#~ msgid "/Dialogs/_Undo History"
-#~ msgstr "/Elkarrizketa-koadroak/_Desegin historia"
-
-#~ msgid "/Dialogs/Colo_rs"
-#~ msgstr "/Elkarrizketa-koadroak/Ko_loreak"
-
-#~ msgid "/Dialogs/Brus_hes"
-#~ msgstr "/Elkarrizketa-koadroak/Brot_xak"
-
-#~ msgid "/Dialogs/P_atterns"
-#~ msgstr "/Elkarrizketa-koadroak/E_reduak"
-
-#~ msgid "/Dialogs/_Gradients"
-#~ msgstr "/Elkarrizketa-koadroak/_Gradienteak"
-
-#~ msgid "/Dialogs/Pal_ettes"
-#~ msgstr "/Elkarrizketa-koadroak/_Paletak"
-
-#~ msgid "/Dialogs/_Fonts"
-#~ msgstr "/Elkarrizketa-koadroak/_Letra-tipoak"
-
-#~ msgid "/Dialogs/_Buffers"
-#~ msgstr "/Elkarrizketa-koadroak/_Bufferrak"
-
-#~ msgid "/Dialogs/_Images"
-#~ msgstr "/Elkarrizketa-koadroak/I_rudiak"
-
-#~ msgid "/Dialogs/Document Histor_y"
-#~ msgstr "/Elkarrizketa-koadroak/Dokumentuaren _historia"
-
-#~ msgid "/Dialogs/_Templates"
-#~ msgstr "/Elkarrizketa-koadroak/T_xantiloiak"
-
-#~ msgid "/Dialogs/T_ools"
-#~ msgstr "/Elkarrizketa-koadroak/_Tresnak"
-
-#~ msgid "/Dialogs/Error Co_nsole"
-#~ msgstr "/Elkarrizketa-koadroak/_Errore-kontsola"
-
-#~ msgid "/Filters/Repeat Last"
-#~ msgstr "/Iragazkiak/Errepikatu azkena"
-
-#~ msgid "/Filters/Re-Show Last"
-#~ msgstr "/Iragazkiak/Berriro erakutsi azkena"
-
-#~ msgid "/Filters/_Blur"
-#~ msgstr "/Iragazkiak/_Lausotu"
-
-#~ msgid "/Filters/_Colors"
-#~ msgstr "/Iragazkiak/_Koloreak"
-
-#~ msgid "/Filters/Colors/Ma_p"
-#~ msgstr "/Iragazkiak/Koloreak/Ma_pa"
-
-#~ msgid "/Filters/_Noise"
-#~ msgstr "/Iragazkiak/_Zarata"
-
-#~ msgid "/Filters/_Generic"
-#~ msgstr "/Iragazkiak/_Generikoa"
-
-#~ msgid "/Filters/_Map"
-#~ msgstr "/Iragazkiak/_Mapa"
-
-#~ msgid "/Filters/_Render"
-#~ msgstr "/Iragazkiak/_Errendatuak"
-
-#~ msgid "/Filters/Render/_Clouds"
-#~ msgstr "/Iragazkiak/Errendatuak/_Hodeiak"
-
-#~ msgid "/Filters/Render/_Nature"
-#~ msgstr "/Iragazkiak/Errendatuak/_Natura"
-
-#~ msgid "/Filters/Render/_Pattern"
-#~ msgstr "/Iragazkiak/Errendatuak/_Eredua"
-
-#~ msgid "/Filters/_Web"
-#~ msgstr "/Iragazkiak/_Web-a"
-
-#~ msgid "/Filters/To_ys"
-#~ msgstr "/Iragazkiak/_Jostagarriak"
-
-#~ msgid "Offset _X:"
-#~ msgstr "Desplazatu _X:"
-
-#~ msgid "_Wrap"
-#~ msgstr "_Doitu"
-
-#~ msgid "Show reversed zoom ratio"
-#~ msgstr "Erakutsi zoomaren erlazio alderantzikatua"
-
-#~ msgid "Qmask Attributes"
-#~ msgstr "Maskara azkarraren atributuak"
-
-#~ msgid "Resolution X:"
-#~ msgstr "X bereizmena:"
-
-#~ msgid "Stroke"
-#~ msgstr "Trazatu"
-
-#~ msgid "/File/_Preferences"
-#~ msgstr "/Fitxategia/_Hobespenak"
-
-#~ msgid "/File/_Dialogs"
-#~ msgstr "/Fitxategia/_Elkarrizketa-koadroak"
-
-#~ msgid "/File/Dialogs/Create New Doc_k"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/Sortu leiho atrakagarri be_rria"
-
-#~ msgid "/File/Dialogs/Create New Dock/_Layers, Channels & Paths"
-#~ msgstr ""
-#~ "/Fitxategia/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/"
-#~ "_Geruzak, kanalak eta bideak"
-
-#~ msgid "/File/Dialogs/Create New Dock/_Brushes, Patterns & Gradients"
-#~ msgstr ""
-#~ "/Fitxategia/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/"
-#~ "_Brotxak, ereduak eta gradienteak"
-
-#~ msgid "/File/Dialogs/Create New Dock/_Misc. Stuff"
-#~ msgstr ""
-#~ "/Fitxategia/Elkarrizketa-koadroak/Sortu leiho atrakagarri berria/"
-#~ "As_kotarikoak"
-
-#~ msgid "/File/Dialogs/Tool _Options"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Tresna-aukerak"
-
-#~ msgid "/File/Dialogs/_Device Status"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Gailuaren egoera"
-
-#~ msgid "/File/Dialogs/_Layers"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/Geru_zak"
-
-#~ msgid "/File/Dialogs/_Channels"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Kanalak"
-
-#~ msgid "/File/Dialogs/_Paths"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Bideak"
-
-#~ msgid "/File/Dialogs/Inde_xed Palette"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Paleta indexatua"
-
-#~ msgid "/File/Dialogs/Histogra_m"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/Histogra_ma"
-
-#~ msgid "/File/Dialogs/_Selection Editor"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Hautapenaren editorea"
-
-#~ msgid "/File/Dialogs/Na_vigation"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Nabigazioa"
-
-#~ msgid "/File/Dialogs/_Undo History"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Desegin historia"
-
-#~ msgid "/File/Dialogs/Colo_rs"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Koloreak"
-
-#~ msgid "/File/Dialogs/Brus_hes"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/Brot_xak"
-
-#~ msgid "/File/Dialogs/P_atterns"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Ereduak"
-
-#~ msgid "/File/Dialogs/_Gradients"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Gradienteak"
-
-#~ msgid "/File/Dialogs/Pal_ettes"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Paletak"
-
-#~ msgid "/File/Dialogs/_Fonts"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Letra-tipoak"
-
-#~ msgid "/File/Dialogs/_Buffers"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Bufferrak"
-
-#~ msgid "/File/Dialogs/_Images"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Irudiak"
-
-#~ msgid "/File/Dialogs/Document Histor_y"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/Dokumentuaren _historia"
-
-#~ msgid "/File/Dialogs/_Templates"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Txantiloiak"
-
-#~ msgid "/File/Dialogs/T_ools"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Letra-tipoak"
-
-#~ msgid "/File/Dialogs/Error Co_nsole"
-#~ msgstr "/Fitxategia/Elkarrizketa-koadroak/_Errore-kontsola"
-
-#~ msgid "/File/D_ebug"
-#~ msgstr "/Fitxategia/_Araztu"
-
-#~ msgid "/Xtns/_Module Manager"
-#~ msgstr "/Luzp/_Modulu-kudeatzailea"
-
-#~ msgid "/Help/_Help"
-#~ msgstr "/Laguntza/_Laguntza"
-
-#~ msgid "/Help/_About"
-#~ msgstr "/Laguntza/H_oni buruz"
-
-#~ msgid "Aborting Installation..."
-#~ msgstr "Instalazioa abortatzen..."
-
-#~ msgid "/Tools/Paint Tools/_Airbrush"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Aerografoa"
-
-#~ msgid "/Tools/Paint Tools/Blen_d"
-#~ msgstr "/Tresnak/Margotzeko tresnak/Na_hastu"
-
-#~ msgid "/Tools/Color Tools/B_rightness-Contrast..."
-#~ msgstr "/Tresnak/Kolore-tresnak/Disti_ra/Kontrastea..."
-
-#~ msgid "/Tools/Paint Tools/_Bucket Fill"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Gelaxka-betegarria"
-
-#~ msgid "/Tools/Selection Tools/_By Color Select"
-#~ msgstr "/Tresnak/Hautapen-tresnak/_Hautatu kolorearen arabera"
-
-#~ msgid "/Tools/Paint Tools/_Clone"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Klonatu"
-
-#~ msgid "/Tools/Color Tools/Color _Balance..."
-#~ msgstr "/Tresnak/Kolore-tresnak/Kolore-_balantzea..."
-
-#~ msgid "/Tools/Color Tools/Colori_ze..."
-#~ msgstr "/Tresnak/Kolore-tresnak/Ko_loreztatu..."
-
-#~ msgid "/Tools/C_olor Picker"
-#~ msgstr "/Tresnak/_Kolore-hautatzailea"
-
-#~ msgid "/Tools/Paint Tools/Con_volve"
-#~ msgstr "/Tresnak/Margotzeko tresnak/Ko_nboluzioa"
-
-#~ msgid "/Tools/Transform Tools/_Crop & Resize"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Ebaki eta aldatu tamainaz"
-
-#~ msgid "/Tools/Color Tools/_Curves..."
-#~ msgstr "/Tresnak/Kolore-tresnak/_Kurbak..."
-
-#~ msgid "/Tools/Paint Tools/Dod_geBurn"
-#~ msgstr "/Tresnak/Margotzeko tresnak/Zurit_u-Belztu"
-
-#~ msgid "/Tools/Selection Tools/_Ellipse Select"
-#~ msgstr "/Tresnak/Hautapen-tresnak/_Hautapen eliptikoa"
-
-#~ msgid "/Tools/Paint Tools/_Eraser"
-#~ msgstr "/Tresnak/Margotzeko tresnak/E_zabatu"
-
-#~ msgid "/Tools/Transform Tools/_Flip"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Irauli"
-
-#~ msgid "/Tools/Selection Tools/_Free Select"
-#~ msgstr "/Tresnak/Hautapen-tresnak/Hau_tapen librea"
-
-#~ msgid "/Tools/Color Tools/Hue-_Saturation..."
-#~ msgstr "/Tresnak/Kolore-tresnak/Ñabardura -_Saturazioa..."
-
-#~ msgid "/Tools/Paint Tools/In_k"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Tinta"
-
-#~ msgid "/Tools/Color Tools/_Levels..."
-#~ msgstr "/Tresnak/Kolore-tresnak/Mai_lak..."
-
-#~ msgid "Allow Window Resizing"
-#~ msgstr "Baimendu leihoen tamaina aldatzea"
-
-#~ msgid "/Tools/M_agnify"
-#~ msgstr "/Tresnak/Han_ditu"
-
-#~ msgid "/Tools/_Measure"
-#~ msgstr "/Tresnak/_Neurtu"
-
-#~ msgid "/Tools/Transform Tools/_Move"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Aldatu lekuz"
-
-#~ msgid "/Tools/Paint Tools/_Paintbrush"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Pintzela"
-
-#~ msgid "/Tools/Paint Tools/Pe_ncil"
-#~ msgstr "/Tresnak/Margotzeko tresnak/A_rkatza"
-
-#~ msgid "/Tools/Transform Tools/_Perspective"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Perspektiba"
-
-#~ msgid "/Tools/Color Tools/_Posterize..."
-#~ msgstr "/Tresnak/Kolore-tresnak/_Posterizatu..."
-
-#~ msgid "/Tools/Selection Tools/_Rect Select"
-#~ msgstr "/Tresnak/Hautapen-tresnak/Hau_tapen laukizuzena"
-
-#~ msgid "/Tools/Transform Tools/_Rotate"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Biratu"
-
-#~ msgid "/Tools/Transform Tools/_Scale"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Eskalatu"
-
-#~ msgid "/Tools/Transform Tools/S_hear"
-#~ msgstr "/Tresnak/Eraldatze-tresnak/_Zizailamendua"
-
-#~ msgid "/Tools/Paint Tools/_Smudge"
-#~ msgstr "/Tresnak/Margotzeko tresnak/_Zirriborratu"
-
-#~ msgid "/Tools/Te_xt"
-#~ msgstr "/Tresnak/Te_stua"
-
-#~ msgid "/Tools/Color Tools/_Threshold..."
-#~ msgstr "/Tresnak/Kolore-tresnak/_Muga..."
-
-#~ msgid "/Tools/_Paths"
-#~ msgstr "/Tresnak/_Bideak"
-
-#~ msgid "Delete"
-#~ msgstr "Ezabatu"
-
-#~ msgid "FG"
-#~ msgstr "AurrPl"
-
-#~ msgid "BG"
-#~ msgstr "AtzPl"
-
-#~ msgid "Edit Foreground Color"
-#~ msgstr "Editatu aurreko planoaren kolorea"
-
-#~ msgid "New"
-#~ msgstr "Berria"
-
-#~ msgid "Refresh"
-#~ msgstr "Freskatu"
-
-#~ msgid "Stroke _Width:"
-#~ msgstr "Trazuaren zabalera:"
-
-#~ msgid "Style"
-#~ msgstr "Estiloa"
-
-#~ msgid "Image Comment"
-#~ msgstr "Irudiaren iruzkina"
-
-#~ msgid "%s Options"
-#~ msgstr "%s aukerak"
-
-#~ msgid "  -r, --restore-session    Try to restore saved session.\n"
-#~ msgstr "  -r, --restore-session    Saiatu gordetako saioa leheneratzen.\n"
-
-#~ msgid ""
-#~ "  -S, --no-splash-image    Do not add an image to the startup window.\n"
-#~ msgstr "  -S, --no-splash-image    Ez gehitu irudi bat abioko leihoari.\n"
-
-#~ msgid "Failed to open '%s' for writing: %s"
-#~ msgstr "Ezin izan da `%s' ireki idazteko: %s"
-
-#~ msgid ""
-#~ "Specifies how the area around the image should be drawn when in "
-#~ "fullscreen mode."
-#~ msgstr ""
-#~ "Irudiaren inguruko area nola marraztu behar den zehazten du pantaila "
-#~ "osoaren moduan dagoenean."
-
-#~ msgid ""
-#~ "Sets the canvas padding color used when in fullscreen mode and the "
-#~ "padding mode is set to custom color."
-#~ msgstr ""
-#~ "Pantaila osoaren moduan oihalak izango duen kolore betegarria ezartzen "
-#~ "du, kolore pertsonalizatua erabiliko bada."
-
-#~ msgid ""
-#~ "Specify that marching ants for selected regions will be drawn with "
-#~ "colormap cycling as opposed to be drawn as animated lines.  This color "
-#~ "cycling option works only with 8-bit displays."
-#~ msgstr ""
-#~ "Hautatutako eskualdeetan inurriak kolore-mapa ziklikoaren bidez "
-#~ "marraztuko direla zehazten du, lerro animatu gisa marraztu beharrean. "
-#~ "Kolore-zikloaren aukera hori 8 biteko pantailekin bakarrik erabil daiteke."
-
-#~ msgid ""
-#~ "When enabled, the menubar is visible by default in fullscreen mode. This "
-#~ "can also be toggled with the \"View->Show Menubar\" command."
-#~ msgstr ""
-#~ "Gaituta dagoenean, menu-barra ikusgai dago lehenespenez pantaila osoaren "
-#~ "moduan. Hori \"Ikuspegia->Erakutsi menu-barra\" komandoaren bidez ere "
-#~ "aktiba daiteke."
-
-#~ msgid ""
-#~ "When enabled, the rulers are visible by default in fullscreen mode. This "
-#~ "can also be toggled with the \"View->Show Rulers\" command."
-#~ msgstr ""
-#~ "Gaituta dagoenean, erregelak ikusgai daude lehenespenez pantaila osoaren "
-#~ "moduan. Hori \"Ikuspegia->Erakutsi erregelak\" komandoaren bidez ere "
-#~ "aktiba daiteke."
-
-#~ msgid ""
-#~ "When enabled, the scrollbars are visible by default in fullscreen mode. "
-#~ "This can also be toggled with the \"View->Show Scrollbars\" command."
-#~ msgstr ""
-#~ "Gaituta dagoenean, korritze-barrak ikusgai daude lehenespenez pantaila "
-#~ "osoaren moduan. Hori \"Ikuspegia->Erakutsi korritze-barrak\" komandoaren "
-#~ "bidez ere aktiba daiteke."
-
-#~ msgid ""
-#~ "When enabled, the statusbar is visible by default in fullscreen mode. "
-#~ "This can also be toggled with the \"View->Show Statusbar\" command."
-#~ msgstr ""
-#~ "Gaituta dagoenean, egoera-barra ikusgai dago lehenespenez pantaila "
-#~ "osoaren moduan. Hori \"Ikuspegia->Erakutsi egoera-barrak\" komandoaren "
-#~ "bidez ere aktiba daiteke."
-
-#~ msgid "Failed to open file: '%s': %s"
-#~ msgstr "Ezin izan da '%s' fitxategia ireki: %s "
-
-#~ msgid "Image Mod"
-#~ msgstr "Irudi-aldaketa"
-
-#~ msgid "Channel Mod"
-#~ msgstr "Kanal-aldaketa"
-
-#~ msgid ""
-#~ "Fatal parsing error (unknown version %d):\n"
-#~ "Brush file '%s'"
-#~ msgstr ""
-#~ "Analisi-errore larria (%d bertsio ezezaguna):\n"
-#~ "'%s' brotxa-fitxategia"
-
-#~ msgid "Paste Transform"
-#~ msgstr "Itsatsi eraldatzea"
-
-#~ msgid "Failed to write thumbnail for '%s' as '%s': %s"
-#~ msgstr "Ezin izan da koadro txikirik idatzi '%s'(r)entzat '%s' gisa: %s"
-
-#~ msgid "Failed to set permissions of thumbnail '%s': %s"
-#~ msgstr "Ezin izan dira `%s' koadro txikiaren baimenak ezarri: %s"
-
-#~ msgid "Failed to open"
-#~ msgstr "Ezin izan da ireki"
-
-#~ msgid "Failed to create thumbnail folder '%s'."
-#~ msgstr "Ezin izan da koadro txikien %s karpeta sortu."
-
-#~ msgid ""
-#~ "Loading palette '%s':\n"
-#~ "Corrupt palette: missing magic header"
-#~ msgstr ""
-#~ "'%s' paleta kargatzen:\n"
-#~ "Paleta okerra: goiburu magikoa falta da"
-
-#~ msgid "Unknown pattern format version %d in '%s'."
-#~ msgstr "Eredu formatuaren %d bertsio ezezaguna '%s'(e)n."
-
-#~ msgid "Error in GIMP pattern file '%s'."
-#~ msgstr "Errorea GIMPen '%s' eredu-fitxategian."
-
-#~ msgid "Visit http://www.gimp.org/ for more information"
-#~ msgstr "Informazio gehiago nahi izanez gero, bisitatu http://www.gimp.org/ "
-
-#~ msgid "Current:"
-#~ msgstr "Unekoa:"
-
-#~ msgid "Old:"
-#~ msgstr "Zaharra:"
-
-#~ msgid "Revert to old color"
-#~ msgstr "Itzuli kolore zaharrera"
-
-#~ msgid "Brush List"
-#~ msgstr "Brotxa-zerrenda"
-
-#~ msgid "Pattern List"
-#~ msgstr "Eredu-zerrenda"
-
-#~ msgid "Gradient List"
-#~ msgstr "Gradiente-zerrenda"
-
-#~ msgid "Palette List"
-#~ msgstr "Paleta-zerrenda"
-
-#~ msgid "Font List"
-#~ msgstr "Letra-tipoen zerrenda"
-
-#~ msgid "Tool List"
-#~ msgstr "Tresna-zerrenda"
-
-#~ msgid "Buffer List"
-#~ msgstr "Buffer-zerrenda"
-
-#~ msgid "List of Templates"
-#~ msgstr "Txantiloi-zerrenda"
-
-#~ msgid "Brush Grid"
-#~ msgstr "Brotxaren sareta"
-
-#~ msgid "Pattern Grid"
-#~ msgstr "Ereduaren sareta"
-
-#~ msgid "Gradient Grid"
-#~ msgstr "Gradientearen sareta"
-
-#~ msgid "Font Grid"
-#~ msgstr "Letra-tipoaren sareta"
-
-#~ msgid "Tool Grid"
-#~ msgstr "Tresnaren sareta"
-
-#~ msgid "Buffer Grid"
-#~ msgstr "Bufferraren sareta"
-
-#~ msgid "Document History Grid"
-#~ msgstr "Dokumentuaren historiaren sareta"
-
-#~ msgid "Layer List"
-#~ msgstr "Geruza-zerrenda"
-
-#~ msgid "Channel List"
-#~ msgstr "Kanal-zerrenda"
-
-#~ msgid "Path List"
-#~ msgstr "Bide-izenen zerrenda"
-
-#~ msgid "Remove Grid"
-#~ msgstr "Kendu sareta"
-
-#~ msgid "/View/Zoom/1:4"
-#~ msgstr "/Ikusi/Zooma/1:4"
-
-#~ msgid "/View/Zoom/1:8"
-#~ msgstr "/Ikusi/Zooma/1:8"
-
-#~ msgid "N/A"
-#~ msgstr "E/E"
-
-#~ msgid "R:"
-#~ msgstr "G:"
-
-#~ msgid "G:"
-#~ msgstr "B:"
-
-#~ msgid "B:"
-#~ msgstr "U:"
-
-#~ msgid "H:"
-#~ msgstr "T:"
-
-#~ msgid "S:"
-#~ msgstr "S:"
-
-#~ msgid "V:"
-#~ msgstr "B:"
-
-#~ msgid "C:"
-#~ msgstr "C:"
-
-#~ msgid "M:"
-#~ msgstr "M:"
-
-#~ msgid "K:"
-#~ msgstr "K:"
-
-#~ msgid "A:"
-#~ msgstr "A:"
-
-#~ msgid "Dimensions (W x H):"
-#~ msgstr "Neurriak (zabalera x altuera):"
-
-#~ msgid "Empty Layer Copy"
-#~ msgstr "Geruza-kopia hutsa"
-
-#~ msgid "/Layer to _Imagesize"
-#~ msgstr "/_Geruza irudi-tamainara"
-
-#~ msgid "/_New Color"
-#~ msgstr "/_Kolore berria"
-
-#~ msgid "Default Image Size and Unit"
-#~ msgstr "Irudi-tamaina eta -unitate lehenetsiak"
-
-#~ msgid "Default Image Resolution and Resolution Unit"
-#~ msgstr "Irudi-bereizmen eta bereizmen-unitate lehenetsiak"
-
-#~ msgid "Comment Used for New Images"
-#~ msgstr "Irudi berrietan erabiltzeko iruzkina"
-
-#~ msgid "/_Delete Template..."
-#~ msgstr "/E_zabatu txantiloia..."
-
-#~ msgid "Save current settings as default values"
-#~ msgstr "Gorde uneko ezarpenak balio lehenetsi gisa"
-
-#~ msgid "Reset to factory defaults"
-#~ msgstr "Berrezarri fabrikatzaileak lehenetsitakoak"
-
-#~ msgid "Cannot open '%s' for reading: %s"
-#~ msgstr "Ezin da '%s' ireki irakurtzeko: %s"
-
-#~ msgid "Cannot open '%s' for writing: %s"
-#~ msgstr "Ezin da '%s' ireki idazteko: %s"
-
-#~ msgid "Cannot create folder: %s"
-#~ msgstr "Ezin da karpeta hau sortu: %s"
-
-#~ msgid "Empty Vectors Copy"
-#~ msgstr "Bektore hutsen kopia"
-
-#~ msgid "Misc Tool procedures"
-#~ msgstr "Hainbat tresna-prozedura"
-
-#~ msgid "writing \"%s\"\n"
-#~ msgstr "\"%s\" idazten\n"
-
-#~ msgid "How many pixels the first line should be shorter"
-#~ msgstr "Lehenengo lerroak zenbat pixel gutxiago izan behar dituen"
-
-#~ msgid "Additional line spacing (in pixels)"
-#~ msgstr "Lerro arteko tarte osagarria (pixeletan)"
-
-#~ msgid "Transform Active Layer"
-#~ msgstr "Eraldatu geruza aktiboa"
-
-#~ msgid "Transform Active Path"
-#~ msgstr "Eraldatu bide-izen aktiboa"
-
-#~ msgid "Extend Stroke/Move Nodes"
-#~ msgstr "Hedatu trazua/Mugitu nodoak"
-
-#~ msgid "Insert/Delete Nodes"
-#~ msgstr "Txertatu/Ezabatu nodoak"
-
-#~ msgid "Move Stroke/Path"
-#~ msgstr "Mugitu trazua/Bide-izena"
-
-#~ msgid "Update Active Color"
-#~ msgstr "Eguneratu kolore aktiboa"
-
-#~ msgid "Intensity:"
-#~ msgstr "Intentsitatea:"
-
-#~ msgid "Modify Curves for Channel:"
-#~ msgstr "Aldatu kurbak kanalerako:"
-
-#~ msgid "View image histogram"
-#~ msgstr "Ikusi irudiaren histograma"
-
-#~ msgid "/Tools/Color Tools/_Histogram..."
-#~ msgstr "/Tresnak/Kolore-tresnak/_Histograma..."
-
-#~ msgid "Histogram does not operate on indexed drawables."
-#~ msgstr "Histogramak ez du marrazgai indexatuetan funtzionatzen."
-
-#~ msgid "View Image Histogram"
-#~ msgstr "Ikusi irudiaren histograma"
-
-#~ msgid "Information on Channel:"
-#~ msgstr "Kanalari buruzko informazioa:"
-
-#~ msgid "Modify Levels for Channel:"
-#~ msgstr "Aldatu mailak kanalerako:"
-
-#~ msgid "Measure angles and lengths"
-#~ msgstr "Neurtu angeluak eta luzerak"
-
-#~ msgid "degrees"
-#~ msgstr "gradu"
-
-#~ msgid "Move Selection Outline"
-#~ msgstr "Aldatu lekuz hautapen-eskema"
-
-#~ msgid "Move Pixels"
-#~ msgstr "Aldatu lekuz pixelak"
-
-#~ msgid "Netscape"
-#~ msgstr "Netscape"
-
-#~ msgid "Click to open the Font Selection Dialog"
-#~ msgstr "Egin klik letra hautatzeko elkarrizketa-koadroa irekitzeko"
-
-#~ msgid "GIMP Font Selection"
-#~ msgstr "GIMPeko letra-tipoen hautapena"
-
-#~ msgid "_Family:"
-#~ msgstr "_Familia:"
-
-#~ msgid "Pack my box with five dozen liquor jugs."
-#~ msgstr "Gure etxe berrian ez da urik sartzen ateri dagoenean."
-
-#~ msgid "New Color"
-#~ msgstr "Kolore berria"
-
-#~ msgid "Too large!"
-#~ msgstr "Handiegia da!"
-
-#~ msgid ""
-#~ "Are you sure you want to delete\n"
-#~ "template \"%s\" from the list?"
-#~ msgstr ""
-#~ "Ziur zaude \"%s\" txantiloia\n"
-#~ "zerrendatik ezabatu nahi duzula?"
-
-#~ msgid "Error opening file '%s': %s"
-#~ msgstr "Errorea '%s' fitxategia irekitzean: %s "
-
-#~ msgid ""
-#~ "Can't open '%s' for writing:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin da '%s' idazteko ireki:\n"
-#~ "%s"
-
-#~ msgid "The GIMP (unstable)"
-#~ msgstr "GIMP (ezegonkorra)"
diff --git a/regexrepl/Makefile.in b/regexrepl/Makefile.in
index e1cc51a26f..c11f8822a1 100644
--- a/regexrepl/Makefile.in
+++ b/regexrepl/Makefile.in
@@ -72,6 +72,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -180,6 +181,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -341,6 +343,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -348,17 +351,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -375,6 +370,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -385,6 +383,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -396,10 +395,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/themes/Default/Makefile.in b/themes/Default/Makefile.in
index 6d70d96635..20dd4fb31f 100644
--- a/themes/Default/Makefile.in
+++ b/themes/Default/Makefile.in
@@ -70,6 +70,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -178,6 +179,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -339,6 +341,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -346,17 +349,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -373,6 +368,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -383,6 +381,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -394,10 +393,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/themes/Default/images/Makefile.in b/themes/Default/images/Makefile.in
index 84d33986f6..691aeed2ce 100644
--- a/themes/Default/images/Makefile.in
+++ b/themes/Default/images/Makefile.in
@@ -70,6 +70,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -178,6 +179,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -339,6 +341,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -346,17 +349,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -373,6 +368,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -383,6 +381,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -394,10 +393,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/themes/Default/images/preferences/Makefile.in b/themes/Default/images/preferences/Makefile.in
index 4e4c17a8e7..2814294c72 100644
--- a/themes/Default/images/preferences/Makefile.in
+++ b/themes/Default/images/preferences/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/themes/Makefile.in b/themes/Makefile.in
index c423779dab..cd64bc81f8 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -60,6 +60,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -168,6 +169,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -329,6 +331,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -336,17 +339,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -363,6 +358,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -373,6 +371,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -384,10 +383,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/themes/Small/Makefile.in b/themes/Small/Makefile.in
index a6aae5dc7a..fd5de93f89 100644
--- a/themes/Small/Makefile.in
+++ b/themes/Small/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/tips/Makefile.in b/tips/Makefile.in
index 877b5496bf..b38fb247a1 100644
--- a/tips/Makefile.in
+++ b/tips/Makefile.in
@@ -61,6 +61,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -169,6 +170,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -330,6 +332,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -337,17 +340,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -364,6 +359,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -374,6 +372,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -385,10 +384,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 28486174df..008d0157bb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -86,6 +86,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -194,6 +195,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -355,6 +357,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -362,17 +365,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -389,6 +384,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -399,6 +397,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -410,10 +409,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/tools/pdbgen/Makefile.in b/tools/pdbgen/Makefile.in
index 8350d45ef7..841a75f8b0 100644
--- a/tools/pdbgen/Makefile.in
+++ b/tools/pdbgen/Makefile.in
@@ -51,6 +51,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA = @AA@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_CFLAGS = @ALSA_CFLAGS@
 ALSA_LIBS = @ALSA_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -159,6 +160,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
 GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
 GTKHTML2_LIBS = @GTKHTML2_LIBS@
@@ -320,6 +322,7 @@ WMF_CFLAGS = @WMF_CFLAGS@
 WMF_CONFIG = @WMF_CONFIG@
 WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XMLLINT = @XMLLINT@
 XPM = @XPM@
 XSLTPROC = @XSLTPROC@
@@ -327,17 +330,9 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_ct_WINDRES = @ac_ct_WINDRES@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -354,6 +349,9 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimpdatadir = @gimpdatadir@
 gimpdir = @gimpdir@
@@ -364,6 +362,7 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -375,10 +374,12 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 sbindir = @sbindir@
diff --git a/tools/pdbgen/pdb/drawable_transform.pdb b/tools/pdbgen/pdb/drawable_transform.pdb
index fe21006491..9e8a1c9f95 100644
--- a/tools/pdbgen/pdb/drawable_transform.pdb
+++ b/tools/pdbgen/pdb/drawable_transform.pdb
@@ -83,6 +83,12 @@ sub transform_invoke {
       gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height))
     {
       GimpMatrix3 matrix;
+      gint        off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
 $assemble_matrix
@@ -126,6 +132,12 @@ sub transform_default_invoke {
     {
       GimpMatrix3           matrix;
       GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
+      gint                  off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
 $assemble_matrix
diff --git a/tools/pdbgen/pdb/transform_tools.pdb b/tools/pdbgen/pdb/transform_tools.pdb
index 0e83012e19..45609036c8 100644
--- a/tools/pdbgen/pdb/transform_tools.pdb
+++ b/tools/pdbgen/pdb/transform_tools.pdb
@@ -103,6 +103,12 @@ sub perspective {
     {
       GimpMatrix3           matrix;
       GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
+      gint                  off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
       gimp_transform_matrix_perspective (x, y, width, height,
@@ -158,6 +164,12 @@ sub rotate {
     {
       GimpMatrix3           matrix;
       GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
+      gint                  off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
       gimp_transform_matrix_rotate (x, y, width, height,
@@ -222,6 +234,12 @@ sub scale {
     {
       GimpMatrix3           matrix;
       GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
+      gint                  off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
       gimp_transform_matrix_scale (x, y, width, height,
@@ -279,6 +297,12 @@ sub shear {
     {
       GimpMatrix3           matrix;
       GimpInterpolationType interpolation_type = GIMP_INTERPOLATION_NONE;
+      gint                  off_x, off_y;
+
+      gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      x += off_x;
+      y += off_y;
 
       /* Assemble the transformation matrix */
       gimp_transform_matrix_shear (x, y, width, height,