diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/aclocal.m4 gnome-spell-1.0.8/aclocal.m4
--- gnome-spell-1.0.7/aclocal.m4	2006-02-10 11:49:01.000000000 +0000
+++ gnome-spell-1.0.8/aclocal.m4	2007-10-15 12:40:08.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,27 +11,611 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+    USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+    dnl ******************************
+    dnl More compiler warnings
+    dnl ******************************
+
+    AC_ARG_ENABLE(compile-warnings, 
+                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+                                 [Turn on compiler warnings]),,
+                  [enable_compile_warnings="m4_default([$1],[yes])"])
+
+    warnCFLAGS=
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
+    fi
+
+    warning_flags=
+    realsave_CFLAGS="$CFLAGS"
+
+    case "$enable_compile_warnings" in
+    no)
+	warning_flags=
+	;;
+    minimum)
+	warning_flags="-Wall"
+	;;
+    yes)
+	warning_flags="-Wall -Wmissing-prototypes"
+	;;
+    maximum|error)
+	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+	CFLAGS="$warning_flags $CFLAGS"
+	for option in -Wno-sign-compare; do
+		SAVE_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $option"
+		AC_MSG_CHECKING([whether gcc understands $option])
+		AC_TRY_COMPILE([], [],
+			has_option=yes,
+			has_option=no,)
+		CFLAGS="$SAVE_CFLAGS"
+		AC_MSG_RESULT($has_option)
+		if test $has_option = yes; then
+		  warning_flags="$warning_flags $option"
+		fi
+		unset has_option
+		unset SAVE_CFLAGS
+	done
+	unset option
+	if test "$enable_compile_warnings" = "error" ; then
+	    warning_flags="$warning_flags -Werror"
+	fi
+	;;
+    *)
+	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+	;;
+    esac
+    CFLAGS="$realsave_CFLAGS"
+    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+    AC_MSG_RESULT($warning_flags)
+
+    AC_ARG_ENABLE(iso-c,
+                  AC_HELP_STRING([--enable-iso-c],
+                                 [Try to warn if code is not ISO C ]),,
+                  [enable_iso_c=no])
+
+    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+    complCFLAGS=
+    if test "x$enable_iso_c" != "xno"; then
+	if test "x$GCC" = "xyes"; then
+	case " $CFLAGS " in
+	    *[\ \	]-ansi[\ \	]*) ;;
+	    *) complCFLAGS="$complCFLAGS -ansi" ;;
+	esac
+	case " $CFLAGS " in
+	    *[\ \	]-pedantic[\ \	]*) ;;
+	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
+	esac
+	fi
+    fi
+    AC_MSG_RESULT($complCFLAGS)
+
+    WARN_CFLAGS="$warning_flags $complCFLAGS"
+    AC_SUBST(WARN_CFLAGS)
+])
+
+dnl For C++, do basically the same thing.
+
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+  AC_ARG_ENABLE(cxx-warnings,
+                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+                               [Turn on compiler warnings.]),,
+                [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+  warnCXXFLAGS=
+  if test "x$GXX" != xyes; then
+    enable_cxx_warnings=no
+  fi
+  if test "x$enable_cxx_warnings" != "xno"; then
+    if test "x$GXX" = "xyes"; then
+      case " $CXXFLAGS " in
+      *[\ \	]-Wall[\ \	]*) ;;
+      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+      esac
+
+      ## -W is not all that useful.  And it cannot be controlled
+      ## with individual -Wno-xxx flags, unlike -Wall
+      if test "x$enable_cxx_warnings" = "xyes"; then
+	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+      fi
+    fi
+  fi
+  AC_MSG_RESULT($warnCXXFLAGS)
+
+   AC_ARG_ENABLE(iso-cxx,
+                 AC_HELP_STRING([--enable-iso-cxx],
+                                [Try to warn if code is not ISO C++ ]),,
+                 [enable_iso_cxx=no])
+
+   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+   complCXXFLAGS=
+   if test "x$enable_iso_cxx" != "xno"; then
+     if test "x$GXX" = "xyes"; then
+      case " $CXXFLAGS " in
+      *[\ \	]-ansi[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+      esac
+
+      case " $CXXFLAGS " in
+      *[\ \	]-pedantic[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+      esac
+     fi
+   fi
+  AC_MSG_RESULT($complCXXFLAGS)
+
+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+  AC_SUBST(WARN_CXXFLAGS)
+])
+
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 2 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL],
-[
+[AC_PREREQ([2.50])dnl
 
-if test -n "$1"; then
-    AC_MSG_CHECKING(for intltool >= $1)
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
 
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }'  < ${ac_aux_dir}/intltool-update.in`
-    changequote({{,}})
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-    changequote([,])
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
 
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    else
-	AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool $1 or later.])
-	exit 1
-    fi
+    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] * 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" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -51,6 +635,8 @@
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 AC_SUBST(INTLTOOL_DESKTOP_RULE)
 AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -69,16 +655,13 @@
 AC_SUBST(INTLTOOL_CAVES_RULE)
 AC_SUBST(INTLTOOL_SCHEMAS_RULE)
 AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
 
 # Use the tools built into the package, not the ones that are installed.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
 
 AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
@@ -96,86 +679,120 @@
    fi
 fi
 
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-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)
 
-# Remove file type tags (using []) from po/POTFILES.
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
 
-ifdef([AC_DIVERSION_ICMDS],[
-  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-     [mv -f po/POTFILES po/POTFILES.tmp
-      sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-      rm -f po/POTFILES.tmp
-     ]dnl
-  AC_DIVERT_POP()
-],[
-  ifdef([AC_CONFIG_COMMANDS_PRE],[
-    AC_CONFIG_COMMANDS_PRE([
-       [mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-       ]dnl
-    ])
-  ])
-])
+IT_PO_SUBDIR([po])
 
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+dnl The following is very similar to
+dnl
+dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+dnl
+dnl with the following slight differences:
+dnl  - the *.in files are in ac_aux_dir,
+dnl  - if the file haven't changed upon reconfigure, it's not touched,
+dnl  - the evaluation of the third parameter enables a hack which computes
+dnl    the actual value of $libdir,
+dnl  - the user sees "executing intltool commands", instead of
+dnl    "creating intltool-extract" and such.
+dnl
+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+dnl a reason for it.
 
 AC_CONFIG_COMMANDS([intltool], [
 
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-               -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-               -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-               -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-               -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-               -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
+for file in intltool-extract intltool-merge intltool-update; do
+  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+	< ${ac_aux_dir}/${file}.in > ${file}.out
+  if cmp -s ${file} ${file}.out 2>/dev/null; then
+    rm -f ${file}.out
+  else
+    mv -f ${file}.out ${file}
+  fi
+  chmod ugo+x ${file}
+  chmod u+w ${file}
+done
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
+],
+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
+])
 
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}')
 
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    if test ! -f "$1/Makefile"; then
+      AC_MSG_ERROR([$1/Makefile is not ready.])
+    fi
+    mv "$1/Makefile" "$1/Makefile.tmp"
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
 ])
 
+
 # deprecated macros
-AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
 
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -338,7 +955,7 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -425,8 +1042,9 @@
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -438,8 +1056,9 @@
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -455,12 +1074,20 @@
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -691,13 +1318,17 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -713,7 +1344,11 @@
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -785,7 +1420,7 @@
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -826,11 +1461,12 @@
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -944,24 +1580,27 @@
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -1188,7 +1827,8 @@
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1196,7 +1836,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1336,6 +1976,7 @@
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1353,7 +1994,8 @@
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1367,20 +2009,58 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1537,12 +2217,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -1559,18 +2235,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1608,7 +2272,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1671,7 +2335,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1726,7 +2390,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1739,11 +2403,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1755,18 +2421,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -1848,6 +2502,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1953,7 +2611,8 @@
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2214,7 +2873,7 @@
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2277,7 +2936,7 @@
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2424,7 +3083,7 @@
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2463,16 +3122,22 @@
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2510,7 +3175,7 @@
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -2526,7 +3191,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2560,6 +3225,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2612,7 +3281,7 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -2828,10 +3497,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -2933,10 +3602,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3082,7 +3751,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3241,10 +3910,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3278,7 +3947,7 @@
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3327,9 +3996,7 @@
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3397,7 +4064,7 @@
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3437,7 +4104,7 @@
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3517,6 +4184,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -3555,16 +4245,20 @@
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -3726,15 +4420,10 @@
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3781,6 +4470,12 @@
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -4024,7 +4719,7 @@
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -4032,13 +4727,46 @@
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -4087,10 +4815,17 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4169,10 +4904,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4225,7 +4960,7 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4314,6 +5049,7 @@
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4360,7 +5096,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4685,7 +5421,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4768,6 +5504,7 @@
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4804,7 +5541,7 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4994,12 +5731,14 @@
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -5011,7 +5750,7 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5077,7 +5816,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -5120,7 +5859,7 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -5147,6 +5886,14 @@
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5267,13 +6014,15 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
@@ -5283,7 +6032,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5341,7 +6090,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -5374,7 +6123,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5393,6 +6142,22 @@
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -5402,6 +6167,10 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5496,7 +6265,8 @@
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -5513,7 +6283,7 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5652,7 +6422,7 @@
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5670,7 +6440,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5685,7 +6455,7 @@
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -5703,13 +6473,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5749,7 +6528,7 @@
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -5868,7 +6647,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5961,7 +6740,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -6003,10 +6782,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -6046,7 +6825,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6168,24 +6947,28 @@
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6244,17 +7027,16 @@
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6311,7 +7093,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6386,7 +7168,7 @@
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6489,6 +7271,30 @@
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
@@ -6509,12 +7315,13 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6547,6 +7354,7 @@
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
@@ -6688,7 +7496,8 @@
 
 _PKG_TEXT
 ])],
-		[$4])
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
@@ -6697,7 +7506,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -6707,7 +7516,7 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6717,14 +7526,29 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6781,14 +7605,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -6797,8 +7621,10 @@
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -6812,15 +7638,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -6848,6 +7673,7 @@
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -6913,6 +7739,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6965,7 +7792,8 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -6990,8 +7818,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -7050,8 +7879,8 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7074,16 +7903,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -7103,6 +7936,9 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -7138,6 +7974,10 @@
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -7173,7 +8013,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -7280,14 +8120,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7303,6 +8143,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -7313,7 +8154,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7321,60 +8162,23 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -7486,9 +8290,21 @@
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -7585,532 +8401,3 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-         [return !ngettext ("","", 1)],
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        	[AC_TRY_LINK([
-#include <libintl.h>
-],
-	          [return !dgettext ("","")],
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	])
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, ngettext,
-		    [AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)])])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-  	  AC_CHECK_LIB(intl, ngettext,
-          	[AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)],
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/art/Makefile.in gnome-spell-1.0.8/art/Makefile.in
--- gnome-spell-1.0.7/art/Makefile.in	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/art/Makefile.in	2007-10-15 12:40:10.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -58,8 +54,7 @@
 DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 API_VERSION = @API_VERSION@
 API_VERSION_IN_SHLIB_NAME = @API_VERSION_IN_SHLIB_NAME@
@@ -104,6 +99,8 @@
 GNOME_SPELL_DATADIR = @GNOME_SPELL_DATADIR@
 GNOME_SPELL_LIBS = @GNOME_SPELL_LIBS@
 GNOME_SPELL_RELEASE = @GNOME_SPELL_RELEASE@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -114,25 +111,23 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
 INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
 INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
 INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
 INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
@@ -142,16 +137,15 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 NO_UNDEFINED = @NO_UNDEFINED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 ORBIT_IDL = @ORBIT_IDL@
-OS_WIN32_FALSE = @OS_WIN32_FALSE@
-OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -165,6 +159,7 @@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOEXT = @SOEXT@
@@ -173,20 +168,13 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 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_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@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -198,28 +186,39 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 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@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/control-center-2.0/icons
 icons_DATA = \
 	spell-checker.png
@@ -265,13 +264,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -294,22 +289,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -325,7 +319,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(iconsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -357,7 +351,7 @@
 
 distclean: distclean-am
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -371,12 +365,20 @@
 
 install-data-am: install-iconsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -395,17 +397,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-iconsDATA uninstall-info-am
+uninstall-am: uninstall-iconsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
 	install-iconsDATA install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA uninstall-info-am
+	uninstall uninstall-am uninstall-iconsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/ChangeLog gnome-spell-1.0.8/ChangeLog
--- gnome-spell-1.0.7/ChangeLog	2006-01-19 22:14:15.000000000 +0000
+++ gnome-spell-1.0.8/ChangeLog	2007-10-15 12:39:57.000000000 +0000
@@ -1,3 +1,31 @@
+2007-10-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* MAINTAINERS: Add this.
+	* NEWS: Update
+	* README: Fix some typos.
+	* configure.in: Release 1.0.8.
+
+2007-10-14  Yannig Marchegay  <yannig@marchegay.org>
+
+	* configure.in: Added 'oc' to ALL_LINGUAS.
+
+2007-02-12  Matic Zgur <mr.zgur@gmail.com>
+
+	* configure.in: Added 'sl' to ALL_LINGUAS.
+
+2006-12-15  Pema Geyleg  <pgeyleg@gmail.com>
+
+	* configure.in: Added 'dz' to ALL_LINGUAS
+
+2006-11-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* README: Fix a typo.
+
+2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Remove obsolete entry for no_NO
+	* po/no.po: And the translation.
+
 2006-01-20  Tor Lillqvist  <tml@novell.com>
 
 	* gnome-spell-zip.in: New file. Shell script used to build binary
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/config.guess gnome-spell-1.0.8/config.guess
--- gnome-spell-1.0.7/config.guess	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/config.guess	2007-10-15 12:25:30.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -138,16 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -216,8 +207,11 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -774,7 +768,14 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -789,8 +790,11 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -804,7 +808,7 @@
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -825,25 +829,28 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -861,8 +868,12 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -880,14 +891,21 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -901,33 +919,36 @@
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -942,18 +963,18 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit ;;
 	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -971,7 +992,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -981,9 +1002,13 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
@@ -1192,7 +1217,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1271,6 +1295,9 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/config.sub gnome-spell-1.0.8/config.sub
--- gnome-spell-1.0.7/config.sub	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/config.sub	2007-10-15 12:25:30.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,7 +241,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -239,7 +249,8 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,28 +268,27 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -286,6 +296,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,7 +318,7 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -316,7 +329,7 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,31 +349,30 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -696,6 +708,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +818,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +880,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +910,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1101,7 +1130,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1174,21 +1203,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1215,6 +1246,9 @@
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1337,6 +1371,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1346,9 +1386,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/configure gnome-spell-1.0.8/configure
--- gnome-spell-1.0.7/configure	2006-02-10 11:49:08.000000000 +0000
+++ gnome-spell-1.0.8/configure	2007-10-15 12:40:11.000000000 +0000
@@ -1,25 +1,54 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
 #
-# 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.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 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+"$@"}'='"$@"'
-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
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -29,8 +58,43 @@
 fi
 
 
+# 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_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.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +108,19 @@
   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
+    ($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; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +128,388 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+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
+}
 
-  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
-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
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  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: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+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
 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 that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+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
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+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
+
+
+:
+(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=:
@@ -222,7 +518,28 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # 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'"
@@ -231,15 +548,6 @@
 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.
@@ -395,29 +703,26 @@
 
 tagnames=${tagnames+${tagnames},}F77
 
+exec 7<&0 </dev/null 6>&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=
 PACKAGE_TARNAME=
@@ -429,42 +734,227 @@
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #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 GNOME_SPELL_RELEASE 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT 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 WARN_CFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OS_WIN32_TRUE OS_WIN32_FALSE SOEXT NO_UNDEFINED API_VERSION_IN_SHLIB_NAME USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB GETTEXT_PACKAGE API_VERSION ASPELL_DICT ASPELL_INC ASPELL_LIBS PKG_CONFIG ac_pt_PKG_CONFIG GNOME_SPELL_CFLAGS GNOME_SPELL_LIBS ORBIT_IDL BONOBO_IDL_INCLUDES GNOME_SPELL_DATADIR 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
+GNOME_SPELL_RELEASE
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+am__isrc
+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
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+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_POLICY_RULE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
+INTLTOOL_PERL
+ALL_LINGUAS
+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
+DATADIRNAME
+WARN_CFLAGS
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CPP
+GREP
+EGREP
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+SED
+LN_S
+ECHO
+AR
+RANLIB
+DLLTOOL
+AS
+OBJDUMP
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+OS_WIN32_TRUE
+OS_WIN32_FALSE
+SOEXT
+NO_UNDEFINED
+API_VERSION_IN_SHLIB_NAME
+USE_NLS
+MSGFMT
+MSGFMT_OPTS
+GMSGFMT
+XGETTEXT
+CATALOGS
+CATOBJEXT
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+GETTEXT_PACKAGE
+API_VERSION
+ASPELL_DICT
+ASPELL_INC
+ASPELL_LIBS
+PKG_CONFIG
+GNOME_SPELL_CFLAGS
+GNOME_SPELL_LIBS
+ORBIT_IDL
+BONOBO_IDL_INCLUDES
+GNOME_SPELL_DATADIR
+LIBOBJS
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CPP
+CXXCPP
+F77
+FFLAGS
+PKG_CONFIG
+GNOME_SPELL_CFLAGS
+GNOME_SPELL_LIBS'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -491,34 +981,48 @@
 # 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}'
+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 ;;
@@ -540,33 +1044,45 @@
   --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.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { 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" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    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-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { 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'" ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -593,6 +1109,12 @@
   -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 ;;
@@ -617,13 +1139,16 @@
   | --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)
@@ -688,6 +1213,16 @@
   | --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 ;;
@@ -740,24 +1275,20 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { 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'" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { 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" ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -788,8 +1319,7 @@
     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 ;;
 
   *)
@@ -809,27 +1339,19 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $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
+# 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
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { 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'
@@ -856,106 +1378,76 @@
 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
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&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; }; }
-  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_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_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-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_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_GNOME_SPELL_CFLAGS_set=${GNOME_SPELL_CFLAGS+set}
-ac_env_GNOME_SPELL_CFLAGS_value=$GNOME_SPELL_CFLAGS
-ac_cv_env_GNOME_SPELL_CFLAGS_set=${GNOME_SPELL_CFLAGS+set}
-ac_cv_env_GNOME_SPELL_CFLAGS_value=$GNOME_SPELL_CFLAGS
-ac_env_GNOME_SPELL_LIBS_set=${GNOME_SPELL_LIBS+set}
-ac_env_GNOME_SPELL_LIBS_value=$GNOME_SPELL_LIBS
-ac_cv_env_GNOME_SPELL_LIBS_set=${GNOME_SPELL_LIBS+set}
-ac_cv_env_GNOME_SPELL_LIBS_value=$GNOME_SPELL_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.
@@ -984,9 +1476,6 @@
   -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]
@@ -1004,15 +1493,22 @@
   --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/PACKAGE]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1037,15 +1533,13 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-compile-warnings=[no/minimum/yes/maximum/error]
-                          Turn on compiler warnings
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-compile-warnings=[no/minimum/yes/maximum/error]
+                          Turn on compiler warnings
   --enable-iso-c          Try to warn if code is not ISO C
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
@@ -1056,8 +1550,7 @@
   --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-aspell-prefix=DIR
                           specify under which prefix aspell is installed.
 
@@ -1066,8 +1559,9 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
@@ -1084,118 +1578,86 @@
 it to find libraries and programs with nonstandard names/locations.
 
 _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 ;;
-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;;
+    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
 
-    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
+configure
+generated by GNU Autoconf 2.61
 
-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 $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1214,7 +1676,7 @@
 /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`
@@ -1228,6 +1690,7 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1249,7 +1712,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1260,7 +1722,7 @@
     -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
@@ -1282,9 +1744,7 @@
 	  -* ) 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
@@ -1295,8 +1755,8 @@
 # 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.
   {
@@ -1309,20 +1769,34 @@
 _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
@@ -1333,22 +1807,28 @@
     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
@@ -1360,26 +1840,24 @@
 ## ----------- ##
 _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.
 
@@ -1410,14 +1888,17 @@
 
 # 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;}
@@ -1433,8 +1914,8 @@
     { 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
@@ -1446,12 +1927,11 @@
 # 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
@@ -1476,8 +1956,7 @@
   # 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
@@ -1494,12 +1973,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-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
-
 
 
 
@@ -1516,16 +1989,21 @@
 
 
 
+ac_ext=c
+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
 
 
-          ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
 
 
 PACKAGE=gnome-spell
 
 
-GETTEXT_PACKAGE=gnome-spell-1.0.7
-GNOME_SPELL_RELEASE=1.0.7
+GETTEXT_PACKAGE=gnome-spell-1.0.8
+GNOME_SPELL_RELEASE=1.0.8
 API_VERSION=0.3
 
 
@@ -1536,31 +2014,38 @@
 _ACEOF
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 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
@@ -1575,8 +2060,8 @@
 # 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
@@ -1598,7 +2083,7 @@
     # 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_test_x "$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.
@@ -1617,21 +2102,22 @@
     ;;
 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.
@@ -1641,8 +2127,8 @@
 
 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
@@ -1684,20 +2170,20 @@
 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`
@@ -1712,45 +2198,60 @@
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 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
@@ -1763,54 +2264,57 @@
   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_test_x "$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
 
@@ -1823,12 +2327,16 @@
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -1871,7 +2379,7 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -1881,8 +2389,8 @@
   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
@@ -1895,32 +2403,34 @@
   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_test_x "$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
@@ -1933,33 +2443,47 @@
   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_test_x "$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
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -1974,20 +2498,18 @@
 
 
 
-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
 
-if test $USE_MAINTAINER_MODE = yes; then
+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -1998,314 +2520,9 @@
   MAINT=$MAINTAINER_MODE_TRUE
 
 
-
-
-if test -n ""; then
-    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. '{ printf "%d", $1 * 100 + $2; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }'  < ${ac_aux_dir}/intltool-update.in`
-
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-
-
-    if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
-    else
-	echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old.  You need intltool  or later." >&6
-	exit 1
-    fi
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Use the tools built into the package, not the ones that are installed.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-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
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-
-  ;;
-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
-else
-  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;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-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
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       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;}
-   { (exit 1); exit 1; }; }
-   fi
-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
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_ICONV in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-
-  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
-else
-  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
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-
-  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
-else
-  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
-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-
-  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
-else
-  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
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-
-  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
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-# Remove file type tags (using []) from po/POTFILES.
-
-
-
-
-
-
-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
-          ac_config_commands="$ac_config_commands intltool"
-
-
-
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -2315,8 +2532,8 @@
 .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
@@ -2343,22 +2560,20 @@
 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='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2367,7 +2582,6 @@
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2376,8 +2590,8 @@
 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
@@ -2390,32 +2604,34 @@
   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_test_x "$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
@@ -2428,36 +2644,51 @@
   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_test_x "$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
@@ -2470,74 +2701,34 @@
   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_test_x "$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
-else
-  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
+  { 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
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  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
@@ -2551,7 +2742,7 @@
   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_test_x "$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
@@ -2562,6 +2753,7 @@
   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.
@@ -2579,22 +2771,23 @@
 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
@@ -2607,36 +2800,38 @@
   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_test_x "$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
@@ -2649,29 +2844,45 @@
   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_test_x "$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
@@ -2684,21 +2895,35 @@
    { (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 </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&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); }
@@ -2723,47 +2948,77 @@
 # 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
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2775,19 +3030,21 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-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
@@ -2806,22 +3063,27 @@
     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
@@ -2832,9 +3094,8 @@
 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
@@ -2848,14 +3109,14 @@
 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
@@ -2875,14 +3136,20 @@
 }
 _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
@@ -2900,12 +3167,12 @@
 
 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
@@ -2928,50 +3195,49 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 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
+
+rm -f core 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
@@ -2987,38 +3253,118 @@
 }
 _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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	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 -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; 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); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core 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
@@ -3034,12 +3380,12 @@
     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.  */
@@ -3073,12 +3419,17 @@
 /* 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];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3093,205 +3444,57 @@
   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_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
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+
+rm -f core 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 <stdlib.h>
-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'
@@ -3300,8 +3503,8 @@
 
 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
@@ -3365,6 +3568,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3390,13 +3594,11 @@
 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
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3409,14 +3611,305 @@
 
 
 
+case "$am__api_version" in
+    1.01234)
+	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+    *)
+    ;;
+esac
 
-    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
-  enableval="$enable_compile_warnings"
+if test -n ""; then
+    { 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 * 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] * 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; }
+    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;}
+   { (exit 1); exit 1; }; }
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Use the tools built into the package, not the ones that are installed.
+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+
+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; }
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INTLTOOL_PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_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; }
+else
+  { 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;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+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; }
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       { 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;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+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); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  DATADIRNAME=share
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	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; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char bind_textdomain_codeset (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* 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
+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
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+  ;
+  return 0;
+}
+_ACEOF
+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); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_bind_textdomain_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      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; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+
+
+
+ac_config_commands="$ac_config_commands intltool"
+
+
+
+
+
+    # Check whether --enable-compile-warnings was given.
+if test "${enable_compile_warnings+set}" = set; then
+  enableval=$enable_compile_warnings;
 else
   enable_compile_warnings="yes"
-fi;
+fi
+
 
     warnCFLAGS=
     if test "x$GCC" != xyes; then
@@ -3442,8 +3935,8 @@
 	for option in -Wno-sign-compare; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
-		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3460,38 +3953,34 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   has_option=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-has_option=no
+	has_option=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$SAVE_CFLAGS"
-		echo "$as_me:$LINENO: result: $has_option" >&5
-echo "${ECHO_T}$has_option" >&6
+		{ echo "$as_me:$LINENO: result: $has_option" >&5
+echo "${ECHO_T}$has_option" >&6; }
 		if test $has_option = yes; then
 		  warning_flags="$warning_flags $option"
 		fi
@@ -3510,21 +3999,21 @@
 	;;
     esac
     CFLAGS="$realsave_CFLAGS"
-    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
+    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: $warning_flags" >&5
+echo "${ECHO_T}$warning_flags" >&6; }
 
-    # Check whether --enable-iso-c or --disable-iso-c was given.
+    # Check whether --enable-iso-c was given.
 if test "${enable_iso_c+set}" = set; then
-  enableval="$enable_iso_c"
-
+  enableval=$enable_iso_c;
 else
   enable_iso_c=no
-fi;
+fi
 
-    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+
+    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
     complCFLAGS=
     if test "x$enable_iso_c" != "xno"; then
 	if test "x$GCC" = "xyes"; then
@@ -3538,20 +4027,19 @@
 	esac
 	fi
     fi
-    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
+    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+echo "${ECHO_T}$complCFLAGS" >&6; }
 
     WARN_CFLAGS="$warning_flags $complCFLAGS"
 
 
 
-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
@@ -3559,115 +4047,73 @@
 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
+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"
+  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_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"
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  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
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    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
-  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="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+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
 
@@ -3679,8 +4125,8 @@
 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
@@ -3693,32 +4139,34 @@
   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_test_x "$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
@@ -3731,36 +4179,51 @@
   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_test_x "$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
@@ -3773,74 +4236,34 @@
   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_test_x "$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
-else
-  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
+  { 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
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  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
@@ -3854,7 +4277,7 @@
   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_test_x "$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
@@ -3865,6 +4288,7 @@
   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.
@@ -3882,22 +4306,23 @@
 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
@@ -3910,36 +4335,38 @@
   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_test_x "$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
@@ -3952,29 +4379,45 @@
   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_test_x "$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
@@ -3987,27 +4430,41 @@
    { (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 </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&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
@@ -4030,50 +4487,49 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 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
+
+rm -f core 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
@@ -4089,38 +4545,118 @@
 }
 _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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	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 -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; 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); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core 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
@@ -4136,12 +4672,12 @@
     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.  */
@@ -4175,12 +4711,17 @@
 /* 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];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -4195,205 +4736,57 @@
   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_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
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+
+rm -f core 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 <stdlib.h>
-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'
@@ -4402,8 +4795,8 @@
 
 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
@@ -4467,6 +4860,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4492,13 +4886,11 @@
 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
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4509,18 +4901,22 @@
 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'
 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
@@ -4533,36 +4929,38 @@
   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_test_x "$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
@@ -4575,55 +4973,85 @@
   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_test_x "$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 </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&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
@@ -4646,50 +5074,49 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 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
+
+rm -f core 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
@@ -4705,159 +5132,133 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cxx_g=no
-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
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  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
+	CXXFLAGS=""
+      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 <stdlib.h>
+
 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
+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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; 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
+	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.  */
-$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
+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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; 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
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core 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
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4866,8 +5267,8 @@
 
 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
@@ -4931,6 +5332,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4956,13 +5358,11 @@
 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
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -4978,8 +5378,8 @@
 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=
@@ -5013,24 +5413,22 @@
 #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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5039,9 +5437,10 @@
   # 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.  */
@@ -5051,24 +5450,22 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5079,6 +5476,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5096,8 +5494,8 @@
 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
@@ -5120,24 +5518,22 @@
 #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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -5146,9 +5542,10 @@
   # 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.  */
@@ -5158,24 +5555,22 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -5186,6 +5581,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5208,23 +5604,170 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-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_test_x "$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
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+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_test_x "$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"
+
+
+{ 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
@@ -5248,35 +5791,31 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 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
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -5332,6 +5871,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -5351,18 +5891,27 @@
   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
@@ -5375,12 +5924,14 @@
 ( 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
-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
@@ -5391,10 +5942,9 @@
 
 
 
-# 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 ;;
@@ -5413,12 +5963,12 @@
     esac
 else
   enable_shared=yes
-fi;
+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 ;;
@@ -5437,12 +5987,12 @@
     esac
 else
   enable_static=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 ;;
@@ -5461,64 +6011,94 @@
     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
@@ -5531,12 +6111,13 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -5571,22 +6152,23 @@
 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; }
 
 
-# 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
@@ -5615,11 +6197,11 @@
     ;;
   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
@@ -5652,17 +6234,17 @@
 
 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
@@ -5676,20 +6258,20 @@
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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
 "" | " "*) ;;
@@ -5706,8 +6288,8 @@
     ;;
 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
@@ -5755,23 +6337,23 @@
   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 recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5812,16 +6394,22 @@
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -5859,7 +6447,7 @@
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -5875,7 +6463,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5909,6 +6497,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5946,8 +6538,8 @@
 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
@@ -5964,11 +6556,11 @@
 # Allow CC to be a program name with arguments.
 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
@@ -5995,7 +6587,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5998 "configure"' > conftest.$ac_ext
+  echo '#line 6590 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6030,7 +6622,8 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -6041,6 +6634,9 @@
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -6056,7 +6652,11 @@
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -6080,8 +6680,8 @@
   # 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
@@ -6107,35 +6707,32 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   lt_cv_cc_needs_belf=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6144,8 +6741,8 @@
 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"
@@ -6175,8 +6772,8 @@
   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
@@ -6189,32 +6786,34 @@
   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_test_x "$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
@@ -6227,27 +6826,41 @@
   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_test_x "$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
@@ -6255,8 +6868,8 @@
   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
@@ -6269,32 +6882,34 @@
   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_test_x "$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
@@ -6307,27 +6922,41 @@
   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_test_x "$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
@@ -6335,8 +6964,8 @@
   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
@@ -6349,32 +6978,34 @@
   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_test_x "$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
@@ -6387,27 +7018,41 @@
   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_test_x "$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
@@ -6433,9 +7078,9 @@
 		  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
@@ -6449,38 +7094,35 @@
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 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
+
+rm -f core 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
@@ -6495,18 +7137,19 @@
 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
@@ -6517,41 +7160,37 @@
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 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
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ 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
@@ -6560,24 +7199,22 @@
 /* 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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -6585,9 +7222,10 @@
 
   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
@@ -6611,25 +7249,19 @@
 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
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      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
@@ -6646,13 +7278,13 @@
 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
@@ -6682,24 +7314,22 @@
 #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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -6708,9 +7338,10 @@
   # 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.  */
@@ -6720,24 +7351,22 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -6748,6 +7377,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -6765,8 +7395,8 @@
 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
@@ -6789,24 +7419,22 @@
 #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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -6815,9 +7443,10 @@
   # 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.  */
@@ -6827,24 +7456,22 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
@@ -6855,6 +7482,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -6870,7 +7498,7 @@
    { (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'
@@ -6884,12 +7512,12 @@
 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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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
@@ -6902,36 +7530,38 @@
   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_test_x "$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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort 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
@@ -6944,48 +7574,78 @@
   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_test_x "$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:6974:" \
-     "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 </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&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 </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&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); }
@@ -6995,8 +7655,8 @@
 # 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
@@ -7009,46 +7669,42 @@
       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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 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
+
+rm -f core 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
@@ -7059,39 +7715,35 @@
       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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 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
+
+rm -f core 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
@@ -7120,8 +7772,8 @@
 # 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
@@ -7205,43 +7857,47 @@
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
 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
@@ -7276,7 +7932,7 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -7445,15 +8101,15 @@
   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
@@ -7467,8 +8123,8 @@
 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
 
 
@@ -7519,8 +8175,8 @@
 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
@@ -7533,32 +8189,34 @@
   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_test_x "$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
@@ -7571,27 +8229,41 @@
   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_test_x "$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
@@ -7599,8 +8271,8 @@
 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
@@ -7613,32 +8285,34 @@
   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_test_x "$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
@@ -7651,27 +8325,41 @@
   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_test_x "$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
@@ -7679,8 +8367,8 @@
 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
@@ -7693,32 +8381,34 @@
   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_test_x "$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
@@ -7731,27 +8421,41 @@
   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_test_x "$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
@@ -7779,7 +8483,7 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -7810,8 +8514,8 @@
 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
@@ -7863,17 +8567,17 @@
 
 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
@@ -7925,11 +8629,11 @@
 
 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
@@ -7944,21 +8648,21 @@
 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
@@ -7979,10 +8683,10 @@
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -7997,13 +8701,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -8016,14 +8720,14 @@
   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
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -8034,11 +8738,11 @@
    -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:8037: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8741: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8041: \$? = $ac_status" >&5
+   echo "$as_me:8745: \$? = $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.
@@ -8051,8 +8755,8 @@
    $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"
@@ -8066,8 +8770,8 @@
 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,'
@@ -8089,13 +8793,15 @@
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -8105,7 +8811,7 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -8163,7 +8869,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -8196,7 +8902,7 @@
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -8215,6 +8921,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -8224,6 +8946,10 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -8276,22 +9002,22 @@
     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
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -8302,11 +9028,11 @@
    -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:8305: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9031: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8309: \$? = $ac_status" >&5
+   echo "$as_me:9035: \$? = $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.
@@ -8319,8 +9045,8 @@
    $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
@@ -8347,15 +9073,15 @@
 # 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
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8375,8 +9101,8 @@
    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
     :
@@ -8385,8 +9111,8 @@
 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
@@ -8395,7 +9121,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -8406,11 +9132,11 @@
    -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:8409: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9135: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8413: \$? = $ac_status" >&5
+   echo "$as_me:9139: \$? = $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
@@ -8432,23 +9158,23 @@
    $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;}
@@ -8458,8 +9184,8 @@
   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=
@@ -8602,7 +9328,7 @@
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8620,7 +9346,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -8635,7 +9361,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -8653,13 +9379,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs=no
@@ -8818,7 +9553,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -8874,39 +9609,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -8935,39 +9675,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -9013,7 +9758,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -9055,10 +9800,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -9098,7 +9843,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -9220,24 +9965,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -9296,17 +10045,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -9363,7 +10111,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -9416,8 +10164,8 @@
     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
 
 #
@@ -9437,10 +10185,10 @@
       # 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -9475,16 +10223,16 @@
         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=
@@ -9498,17 +10246,55 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -9668,12 +10454,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -9690,18 +10472,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -9739,7 +10509,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -9802,7 +10572,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9857,7 +10627,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9870,11 +10640,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9886,18 +10658,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -9979,6 +10739,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -10071,8 +10835,8 @@
   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"
@@ -10080,8 +10844,8 @@
   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" || \
@@ -10105,8 +10869,8 @@
   # 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
@@ -10119,29 +10883,30 @@
 
 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
+         old_striplib="$STRIP -S"
+         { 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
@@ -10173,8 +10938,8 @@
 
   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
@@ -10187,56 +10952,53 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10250,8 +11012,8 @@
    ;;
 
   *)
-    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
@@ -10278,73 +11040,64 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10357,61 +11110,58 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10438,73 +11188,64 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10517,61 +11258,58 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10584,61 +11322,58 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10651,56 +11386,53 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -10740,8 +11472,8 @@
     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
@@ -10751,7 +11483,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10754 "configure"
+#line 11486 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10835,13 +11567,13 @@
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&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
@@ -10851,7 +11583,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10854 "configure"
+#line 11586 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10935,8 +11667,8 @@
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&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"
@@ -10958,13 +11690,13 @@
 
 
 # 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
@@ -10984,15 +11716,15 @@
   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
@@ -11049,6 +11781,7 @@
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -11093,7 +11826,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11417,7 +12150,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -11484,11 +12217,11 @@
 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
@@ -11542,7 +12275,7 @@
 	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'
@@ -11586,10 +12319,10 @@
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -11605,13 +12338,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -11661,18 +12394,18 @@
   # 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
@@ -11701,11 +12434,11 @@
     ;;
   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
@@ -11738,17 +12471,17 @@
 
 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
@@ -11762,8 +12495,8 @@
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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
 
 
@@ -11813,8 +12546,8 @@
 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*)
@@ -11870,7 +12603,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -11926,39 +12659,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11988,39 +12726,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -12131,10 +12874,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -12168,7 +12911,7 @@
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -12217,9 +12960,7 @@
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -12287,7 +13028,7 @@
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -12327,7 +13068,7 @@
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12407,6 +13148,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -12445,16 +13209,20 @@
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -12616,15 +13384,10 @@
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -12671,6 +13434,12 @@
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -12751,8 +13520,8 @@
     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"
@@ -12862,7 +13631,7 @@
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -12870,13 +13639,46 @@
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -12891,8 +13693,8 @@
 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
@@ -12913,12 +13715,14 @@
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -12930,7 +13734,7 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -12996,7 +13800,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -13039,7 +13843,7 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -13066,6 +13870,14 @@
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -13165,22 +13977,22 @@
     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
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13191,11 +14003,11 @@
    -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:13194: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14006: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13198: \$? = $ac_status" >&5
+   echo "$as_me:14010: \$? = $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.
@@ -13208,8 +14020,8 @@
    $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
@@ -13236,15 +14048,15 @@
 # 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
   lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13264,8 +14076,8 @@
    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
     :
@@ -13274,8 +14086,8 @@
 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
@@ -13284,7 +14096,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -13295,11 +14107,11 @@
    -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:13298: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14110: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13302: \$? = $ac_status" >&5
+   echo "$as_me:14114: \$? = $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
@@ -13321,23 +14133,23 @@
    $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;}
@@ -13347,8 +14159,8 @@
   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
@@ -13365,15 +14177,15 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   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
 
 #
@@ -13393,10 +14205,10 @@
       # 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -13431,16 +14243,16 @@
         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=
@@ -13454,20 +14266,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -13624,12 +14423,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -13646,18 +14440,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13695,7 +14477,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -13758,7 +14540,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13813,7 +14595,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13826,11 +14608,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13842,18 +14626,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -13935,6 +14707,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -14027,8 +14803,8 @@
   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"
@@ -14036,8 +14812,8 @@
   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" || \
@@ -14061,8 +14837,8 @@
   # 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
@@ -14129,6 +14905,7 @@
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -14449,7 +15226,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -14540,10 +15317,17 @@
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -14559,13 +15343,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -14587,13 +15371,13 @@
 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
@@ -14612,15 +15396,15 @@
   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"
@@ -14629,8 +15413,8 @@
 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,'
@@ -14652,13 +15436,15 @@
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -14668,7 +15454,7 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -14726,7 +15512,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -14759,7 +15545,7 @@
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -14778,6 +15564,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -14787,6 +15589,10 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14839,22 +15645,22 @@
     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
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -14865,11 +15671,11 @@
    -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:14868: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15674: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14872: \$? = $ac_status" >&5
+   echo "$as_me:15678: \$? = $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.
@@ -14882,8 +15688,8 @@
    $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
@@ -14910,15 +15716,15 @@
 # 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
   lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14938,8 +15744,8 @@
    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
     :
@@ -14948,8 +15754,8 @@
 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
@@ -14958,7 +15764,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14969,11 +15775,11 @@
    -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:14972: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15778: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14976: \$? = $ac_status" >&5
+   echo "$as_me:15782: \$? = $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
@@ -14995,23 +15801,23 @@
    $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;}
@@ -15021,8 +15827,8 @@
   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=
@@ -15165,7 +15971,7 @@
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -15183,7 +15989,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -15198,7 +16004,7 @@
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -15216,13 +16022,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_F77=no
@@ -15381,7 +16196,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -15427,39 +16242,44 @@
       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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -15478,39 +16298,44 @@
       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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -15556,7 +16381,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -15598,10 +16423,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -15641,7 +16466,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -15763,24 +16588,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -15839,17 +16668,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15906,7 +16734,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15959,8 +16787,8 @@
     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
 
 #
@@ -15980,10 +16808,10 @@
       # 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -16018,16 +16846,16 @@
         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=
@@ -16041,20 +16869,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -16211,12 +17026,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -16233,18 +17043,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16282,7 +17080,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -16345,7 +17143,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16400,7 +17198,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16413,11 +17211,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16429,18 +17229,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -16522,6 +17310,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -16614,8 +17406,8 @@
   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"
@@ -16623,8 +17415,8 @@
   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" || \
@@ -16648,8 +17440,8 @@
   # 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
@@ -16716,6 +17508,7 @@
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -17036,7 +17829,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -17086,7 +17879,6 @@
 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 
 
-
 # Source file extension for Java test sources.
 ac_ext=java
 
@@ -17095,10 +17887,10 @@
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -17114,13 +17906,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -17154,14 +17946,14 @@
   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
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17172,11 +17964,11 @@
    -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:17175: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17967: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17179: \$? = $ac_status" >&5
+   echo "$as_me:17971: \$? = $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.
@@ -17189,8 +17981,8 @@
    $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"
@@ -17204,8 +17996,8 @@
 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,'
@@ -17227,13 +18019,15 @@
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -17243,7 +18037,7 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -17301,7 +18095,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -17334,7 +18128,7 @@
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -17353,6 +18147,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -17362,6 +18172,10 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -17414,22 +18228,22 @@
     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
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17440,11 +18254,11 @@
    -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:17443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18257: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17447: \$? = $ac_status" >&5
+   echo "$as_me:18261: \$? = $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.
@@ -17457,8 +18271,8 @@
    $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
@@ -17485,15 +18299,15 @@
 # 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
   lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17513,8 +18327,8 @@
    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
     :
@@ -17523,8 +18337,8 @@
 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
@@ -17533,7 +18347,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -17544,11 +18358,11 @@
    -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:17547: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18361: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17551: \$? = $ac_status" >&5
+   echo "$as_me:18365: \$? = $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
@@ -17570,23 +18384,23 @@
    $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;}
@@ -17596,8 +18410,8 @@
   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=
@@ -17740,7 +18554,7 @@
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -17758,7 +18572,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -17773,7 +18587,7 @@
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -17791,13 +18605,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_GCJ=no
@@ -17956,7 +18779,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -18012,39 +18835,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -18073,39 +18901,44 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -18151,7 +18984,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -18193,10 +19026,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -18236,7 +19069,7 @@
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -18358,24 +19191,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -18434,17 +19271,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -18501,7 +19337,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -18554,8 +19390,8 @@
     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
 
 #
@@ -18575,10 +19411,10 @@
       # 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -18613,16 +19449,16 @@
         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=
@@ -18636,20 +19472,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -18806,12 +19629,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18828,18 +19646,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -18877,7 +19683,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18940,7 +19746,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18995,7 +19801,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19008,11 +19814,13 @@
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -19024,18 +19832,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -19117,6 +19913,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -19209,8 +20009,8 @@
   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"
@@ -19218,8 +20018,8 @@
   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" || \
@@ -19243,8 +20043,8 @@
   # 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
@@ -19311,6 +20111,7 @@
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -19631,7 +20432,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -19680,7 +20481,6 @@
       RC)
 
 
-
 # Source file extension for RC test sources.
 ac_ext=rc
 
@@ -19689,7 +20489,7 @@
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -19708,13 +20508,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -19792,6 +20592,7 @@
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -20112,7 +20913,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -20212,8 +21013,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for Win32" >&5
-echo $ECHO_N "checking for Win32... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Win32" >&5
+echo $ECHO_N "checking for Win32... $ECHO_C" >&6; }
 case "$host" in
 *-mingw*)
     os_win32=yes
@@ -20227,11 +21028,9 @@
     API_VERSION_IN_SHLIB_NAME=$API_VERSION
     ;;
 esac
-echo "$as_me:$LINENO: result: $os_win32" >&5
-echo "${ECHO_T}$os_win32" >&6
-
-
-if test $os_win32 = yes; then
+{ echo "$as_me:$LINENO: result: $os_win32" >&5
+echo "${ECHO_T}$os_win32" >&6; }
+ if test $os_win32 = yes; then
   OS_WIN32_TRUE=
   OS_WIN32_FALSE='#'
 else
@@ -20244,24 +21043,25 @@
 
 
 # Internationalization support
-ALL_LINGUAS="am az be bg ca cs da de el en_CA en_GB es fi fr ga gl he hr hu it ko ja kn lt lv nb ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv ta tr uk vi wa xh zh_CN"
+ALL_LINGUAS="ar am az be bg ca cs da de dz el en_CA en_GB es et fi fr ga gl he hr hu it ko ja kn lt lv nb ne nl oc pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv ta tr uk vi wa xh zh_CN"
 
 
 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
@@ -20272,41 +21072,37 @@
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 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
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ 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
@@ -20315,24 +21111,22 @@
 /* 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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20340,9 +21134,10 @@
 
   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
@@ -20366,25 +21161,19 @@
 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
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      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
@@ -20397,8 +21186,8 @@
 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
@@ -20418,39 +21207,36 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   am_cv_val_LC_MESSAGES=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20459,7 +21245,7 @@
 
     fi
   fi
-     USE_NLS=yes
+         USE_NLS=yes
 
 
     gt_cv_have_gettext=no
@@ -20469,17 +21255,17 @@
     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
@@ -20490,41 +21276,37 @@
 #include <libintl.h>
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 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
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ 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
@@ -20533,24 +21315,22 @@
 /* end confdefs.h.  */
 #include <libintl.h>
 _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
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20558,9 +21338,10 @@
 
   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
@@ -20584,25 +21365,18 @@
 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
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      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
@@ -20612,8 +21386,8 @@
       #
       # 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
@@ -20635,44 +21409,41 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_ngettext_libc=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20694,40 +21465,37 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   gt_cv_func_dgettext_libc=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20735,9 +21503,9 @@
 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
@@ -20763,68 +21531,60 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20842,8 +21602,8 @@
 	 || 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
@@ -20856,59 +21616,56 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_bindtextdomain=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20921,59 +21678,56 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_ngettext=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -20986,56 +21740,53 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_dgettext=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21046,12 +21797,12 @@
 
 
 	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
@@ -21064,59 +21815,56 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_ngettext=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21129,56 +21877,53 @@
 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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_intl_dcgettext=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21205,9 +21950,9 @@
 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
@@ -21233,68 +21978,60 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21333,8 +22070,8 @@
 
 	# 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
@@ -21360,11 +22097,11 @@
 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"
@@ -21373,9 +22110,9 @@
 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
@@ -21401,68 +22138,60 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21471,10 +22200,39 @@
 fi
 done
 
+	  MSGFMT_OPTS=
+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+	  cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  MSGFMT_OPTS=-c; { 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: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
 	  # 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
@@ -21489,32 +22247,33 @@
   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_test_x "$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
@@ -21540,11 +22299,11 @@
 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
@@ -21564,37 +22323,33 @@
 }
 _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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   CATOBJEXT=.gmo
              DATADIRNAME=share
 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
@@ -21621,68 +22376,59 @@
 
 #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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_bind_textdomain_codeset=yes
 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 \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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
@@ -21698,7 +22444,8 @@
 	    ;;
 	    esac
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
@@ -21723,8 +22470,8 @@
                   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
@@ -21732,7 +22479,7 @@
     # 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
@@ -21756,8 +22503,8 @@
      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
@@ -21781,8 +22528,8 @@
          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
@@ -21790,6 +22537,15 @@
      fi
    fi
 
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
          test -d po || mkdir po
    if test "x$srcdir" != "x."; then
      if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -21822,11 +22578,11 @@
 
 
 
-# Check whether --with-aspell-prefix or --without-aspell-prefix was given.
+# Check whether --with-aspell-prefix was given.
 if test "${with_aspell_prefix+set}" = set; then
-  withval="$with_aspell_prefix"
-  with_aspell_prefix="$withval"
-fi;
+  withval=$with_aspell_prefix; with_aspell_prefix="$withval"
+fi
+
 
 if test "x$with_aspell_prefix" != "x"; then
    saved_LDFLAGS=$LDFLAGS
@@ -21841,8 +22597,8 @@
    ASPELL_DICT="`aspell config dict-dir`"
 fi
 
-echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
+echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6; }
 if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21855,56 +22611,53 @@
 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 new_aspell_config ();
 int
 main ()
 {
-new_aspell_config ();
+return new_aspell_config ();
   ;
   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_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
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_aspell_new_aspell_config=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_aspell_new_aspell_config=no
+	ac_cv_lib_aspell_new_aspell_config=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
+echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6; }
 if test $ac_cv_lib_aspell_new_aspell_config = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASPELL 1
@@ -21939,8 +22692,8 @@
 	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
@@ -21955,34 +22708,35 @@
   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_test_x "$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
@@ -21997,28 +22751,42 @@
   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_test_x "$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
@@ -22026,22 +22794,22 @@
 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 GNOME_SPELL" >&5
-echo $ECHO_N "checking for GNOME_SPELL... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GNOME_SPELL" >&5
+echo $ECHO_N "checking for GNOME_SPELL... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GNOME_SPELL_CFLAGS"; then
@@ -22129,7 +22897,7 @@
 and GNOME_SPELL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -22139,14 +22907,14 @@
 and GNOME_SPELL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
 	GNOME_SPELL_CFLAGS=$pkg_cv_GNOME_SPELL_CFLAGS
 	GNOME_SPELL_LIBS=$pkg_cv_GNOME_SPELL_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
 
@@ -22162,7 +22930,8 @@
 
 
 
-                                                            ac_config_files="$ac_config_files Makefile gnome-spell.spec gnome-spell-zip po/Makefile.in gnome-spell/Makefile art/Makefile"
+ac_config_files="$ac_config_files Makefile gnome-spell.spec gnome-spell-zip po/Makefile.in gnome-spell/Makefile art/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -22181,39 +22950,58 @@
 
 # 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
@@ -22222,32 +23010,18 @@
 # 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
 
@@ -22261,11 +23035,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-
-       mv -f po/POTFILES po/POTFILES.tmp
-        sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-        rm -f po/POTFILES.tmp
-
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -22280,6 +23049,10 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+
+  ac_config_commands="$ac_config_commands po/stamp-it"
+
+
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -22325,17 +23098,45 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 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+"$@"}'='"$@"'
-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
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -22345,8 +23146,43 @@
 fi
 
 
+# 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_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.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -22360,18 +23196,19 @@
   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
+    ($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; then
+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
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -22379,159 +23216,120 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 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.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+# 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"  || {
-  # 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
-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
 
-       ;;
-  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
-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 '
   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=:
@@ -22540,7 +23338,28 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # 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'"
@@ -22549,31 +23368,14 @@
 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
-
+# values after options handling.
+ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22581,30 +23383,20 @@
   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
-
-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
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-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.
@@ -22612,7 +23404,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -22631,19 +23423,22 @@
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  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'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22654,39 +23449,24 @@
 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
@@ -22696,18 +23476,24 @@
     $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
@@ -22723,49 +23509,61 @@
 _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
 #
-
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-XGETTEXT='${INTLTOOL_XGETTEXT}'
 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"
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
 
 
 _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.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "gnome-spell.spec" ) CONFIG_FILES="$CONFIG_FILES gnome-spell.spec" ;;
-  "gnome-spell-zip" ) CONFIG_FILES="$CONFIG_FILES gnome-spell-zip" ;;
-  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "gnome-spell/Makefile" ) CONFIG_FILES="$CONFIG_FILES gnome-spell/Makefile" ;;
-  "art/Makefile" ) CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
-  "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "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" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "gnome-spell.spec") CONFIG_FILES="$CONFIG_FILES gnome-spell.spec" ;;
+    "gnome-spell-zip") CONFIG_FILES="$CONFIG_FILES gnome-spell-zip" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "gnome-spell/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-spell/Makefile" ;;
+    "art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
+    "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
@@ -22777,667 +23575,660 @@
 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,@GNOME_SPELL_RELEASE@,$GNOME_SPELL_RELEASE,;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,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;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_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,@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,@WARN_CFLAGS@,$WARN_CFLAGS,;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,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;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,@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,@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,@OS_WIN32_TRUE@,$OS_WIN32_TRUE,;t t
-s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t
-s,@SOEXT@,$SOEXT,;t t
-s,@NO_UNDEFINED@,$NO_UNDEFINED,;t t
-s,@API_VERSION_IN_SHLIB_NAME@,$API_VERSION_IN_SHLIB_NAME,;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,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@API_VERSION@,$API_VERSION,;t t
-s,@ASPELL_DICT@,$ASPELL_DICT,;t t
-s,@ASPELL_INC@,$ASPELL_INC,;t t
-s,@ASPELL_LIBS@,$ASPELL_LIBS,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@GNOME_SPELL_CFLAGS@,$GNOME_SPELL_CFLAGS,;t t
-s,@GNOME_SPELL_LIBS@,$GNOME_SPELL_LIBS,;t t
-s,@ORBIT_IDL@,$ORBIT_IDL,;t t
-s,@BONOBO_IDL_INCLUDES@,$BONOBO_IDL_INCLUDES,;t t
-s,@GNOME_SPELL_DATADIR@,$GNOME_SPELL_DATADIR,;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
+GNOME_SPELL_RELEASE!$GNOME_SPELL_RELEASE$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$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
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$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_POLICY_RULE!$INTLTOOL_POLICY_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
+ALL_LINGUAS!$ALL_LINGUAS$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
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$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
-fi # test -n "$CONFIG_FILES"
+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 <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$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
+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
+DATADIRNAME!$DATADIRNAME$ac_delim
+WARN_CFLAGS!$WARN_CFLAGS$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
+CPP!$CPP$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$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
+SED!$SED$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
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim
+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim
+SOEXT!$SOEXT$ac_delim
+NO_UNDEFINED!$NO_UNDEFINED$ac_delim
+API_VERSION_IN_SHLIB_NAME!$API_VERSION_IN_SHLIB_NAME$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$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
+POSUB!$POSUB$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+API_VERSION!$API_VERSION$ac_delim
+ASPELL_DICT!$ASPELL_DICT$ac_delim
+ASPELL_INC!$ASPELL_INC$ac_delim
+ASPELL_LIBS!$ASPELL_LIBS$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+GNOME_SPELL_CFLAGS!$GNOME_SPELL_CFLAGS$ac_delim
+GNOME_SPELL_LIBS!$GNOME_SPELL_LIBS$ac_delim
+ORBIT_IDL!$ORBIT_IDL$ac_delim
+BONOBO_IDL_INCLUDES!$BONOBO_IDL_INCLUDES$ac_delim
+GNOME_SPELL_DATADIR!$GNOME_SPELL_DATADIR$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` = 71; 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 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 <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$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
-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 ;;
+fi # test -n "$CONFIG_FILES"
+
+
+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
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  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
+
+  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
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
   esac
+_ACEOF
 
-  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
-  # 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."
+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=
 
-  # 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; }
+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
 _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
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
+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
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
-# 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'
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$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;}
 
-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 <<CEOF' >>$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 <<CEOF' >>$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
@@ -23448,175 +24239,39 @@
       _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
-
-#
-# 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
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    intltool )
-
-intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-               -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-               -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-               -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-               -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-               -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-  > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-  rm -f intltool-extract.out
-else
-  mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-  > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-  rm -f intltool-merge.out
-else
-  mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
 
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-  > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-  rm -f intltool-update.out
-else
-  mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
-
- ;;
-    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.
@@ -23624,20 +24279,32 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+    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
@@ -23659,56 +24326,122 @@
        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
  ;;
-    default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+    "intltool":C)
+
+for file in intltool-extract intltool-merge intltool-update; do
+  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+	< ${ac_aux_dir}/${file}.in > ${file}.out
+  if cmp -s ${file} ${file}.out 2>/dev/null; then
+    rm -f ${file}.out
+  else
+    mv -f ${file}.out ${file}
+  fi
+  chmod ugo+x ${file}
+  chmod u+w ${file}
+done
+
+ ;;
+    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
+    "po/stamp-it":C)
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    if test ! -f "po/Makefile"; then
+      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+echo "$as_me: error: po/Makefile is not ready." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    mv "po/Makefile" "po/Makefile.tmp"
+    sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.tmp" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/configure.in gnome-spell-1.0.8/configure.in
--- gnome-spell-1.0.7/configure.in	2006-02-10 11:46:32.000000000 +0000
+++ gnome-spell-1.0.8/configure.in	2007-10-15 12:38:08.000000000 +0000
@@ -11,8 +11,8 @@
 dnl Versions
 dnl
 
-GETTEXT_PACKAGE=gnome-spell-1.0.7
-GNOME_SPELL_RELEASE=1.0.7
+GETTEXT_PACKAGE=gnome-spell-1.0.8
+GNOME_SPELL_RELEASE=1.0.8
 API_VERSION=0.3
 
 dnl
@@ -57,7 +57,7 @@
 AC_SUBST(API_VERSION_IN_SHLIB_NAME)
 
 # Internationalization support
-ALL_LINGUAS="am az be bg ca cs da de el en_CA en_GB es fi fr ga gl he hr hu it ko ja kn lt lv nb ne nl no pa pl pt pt_BR ru rw sk sq sr sr@Latn sv ta tr uk vi wa xh zh_CN"
+ALL_LINGUAS="ar am az be bg ca cs da de dz el en_CA en_GB es et fi fr ga gl he hr hu it ko ja kn lt lv nb ne nl oc pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv ta tr uk vi wa xh zh_CN"
 AM_GLIB_GNU_GETTEXT
 
 AC_SUBST(GETTEXT_PACKAGE)
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/depcomp gnome-spell-1.0.8/depcomp
--- gnome-spell-1.0.7/depcomp	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/depcomp	2007-10-15 12:25:30.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -276,6 +290,46 @@
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell/GNOME_Spell.server gnome-spell-1.0.8/gnome-spell/GNOME_Spell.server
--- gnome-spell-1.0.7/gnome-spell/GNOME_Spell.server	2006-02-10 11:49:45.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell/GNOME_Spell.server	2007-10-15 12:40:21.000000000 +0000
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Spell_DictionaryFactory:0.3" type="shlib" location="/opt/gnome//lib/gnome-spell/libgnome-spell-component-0.3.so">
+<oaf_server iid="OAFIID:GNOME_Spell_DictionaryFactory:0.3" type="shlib" location="/usr/lib/gnome-spell/libgnome-spell-component-0.3.so">
 <oaf_attribute name="repo_ids" type="stringv">
 <item value="IDL:GNOME/ObjectFactory:1.0"/>
 </oaf_attribute>
@@ -17,7 +17,7 @@
 <oaf_attribute name="description" type="string" value="GNOME Spell dictionary component"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Spell_ControlFactory:0.3" type="shlib" location="/opt/gnome//lib/gnome-spell/libgnome-spell-component-0.3.so">
+<oaf_server iid="OAFIID:GNOME_Spell_ControlFactory:0.3" type="shlib" location="/usr/lib/gnome-spell/libgnome-spell-component-0.3.so">
 <oaf_attribute name="repo_ids" type="stringv">
 <item value="IDL:GNOME/ObjectFactory:1.0"/>
 </oaf_attribute>
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell/Makefile.in gnome-spell-1.0.8/gnome-spell/Makefile.in
--- gnome-spell-1.0.7/gnome-spell/Makefile.in	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell/Makefile.in	2007-10-15 12:40:10.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +16,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -67,6 +63,10 @@
 	spell-factory.lo $(am__objects_1)
 libgnome_spell_component_la_OBJECTS =  \
 	$(am_libgnome_spell_component_la_OBJECTS)
+libgnome_spell_component_la_LINK = $(LIBTOOL) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libgnome_spell_component_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 libgnome_spell_idl_la_LIBADD =
 am__objects_2 = Spell-common.lo Spell-skels.lo Spell-stubs.lo
 am_libgnome_spell_idl_la_OBJECTS = $(am__objects_2) $(am__objects_1)
@@ -78,17 +78,18 @@
 test_gnome_spell_component_DEPENDENCIES = libgnome-spell-idl.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libgnome_spell_component_la_SOURCES) \
 	$(libgnome_spell_idl_la_SOURCES) \
 	$(test_gnome_spell_component_SOURCES)
@@ -103,8 +104,7 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 API_VERSION = @API_VERSION@
 API_VERSION_IN_SHLIB_NAME = @API_VERSION_IN_SHLIB_NAME@
@@ -149,6 +149,8 @@
 GNOME_SPELL_DATADIR = @GNOME_SPELL_DATADIR@
 GNOME_SPELL_LIBS = @GNOME_SPELL_LIBS@
 GNOME_SPELL_RELEASE = @GNOME_SPELL_RELEASE@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -159,25 +161,23 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
 INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
 INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
 INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
 INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
@@ -187,16 +187,15 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 NO_UNDEFINED = @NO_UNDEFINED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 ORBIT_IDL = @ORBIT_IDL@
-OS_WIN32_FALSE = @OS_WIN32_FALSE@
-OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,6 +209,7 @@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOEXT = @SOEXT@
@@ -218,20 +218,13 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 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_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@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -243,28 +236,39 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 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@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 PLUGIN_DIR = $(libdir)/bonobo/plugin
 gladedir = $(datadir)/gnome-spell-@GNOME_SPELL_RELEASE@
 glade_DATA = spell-checker.glade
@@ -391,7 +395,7 @@
 	done
 install-privlibLTLIBRARIES: $(privlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(privlibdir)" || $(mkdir_p) "$(DESTDIR)$(privlibdir)"
+	test -z "$(privlibdir)" || $(MKDIR_P) "$(DESTDIR)$(privlibdir)"
 	@list='$(privlib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -402,7 +406,7 @@
 
 uninstall-privlibLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(privlib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(privlib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(privlibdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(privlibdir)/$$p"; \
@@ -417,9 +421,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libgnome-spell-component.la: $(libgnome_spell_component_la_OBJECTS) $(libgnome_spell_component_la_DEPENDENCIES) 
-	$(LINK) -rpath $(privlibdir) $(libgnome_spell_component_la_LDFLAGS) $(libgnome_spell_component_la_OBJECTS) $(libgnome_spell_component_la_LIBADD) $(LIBS)
+	$(libgnome_spell_component_la_LINK) -rpath $(privlibdir) $(libgnome_spell_component_la_OBJECTS) $(libgnome_spell_component_la_LIBADD) $(LIBS)
 libgnome-spell-idl.la: $(libgnome_spell_idl_la_OBJECTS) $(libgnome_spell_idl_la_DEPENDENCIES) 
-	$(LINK)  $(libgnome_spell_idl_la_LDFLAGS) $(libgnome_spell_idl_la_OBJECTS) $(libgnome_spell_idl_la_LIBADD) $(LIBS)
+	$(LINK)  $(libgnome_spell_idl_la_OBJECTS) $(libgnome_spell_idl_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -429,7 +433,7 @@
 	done
 test-gnome-spell-component$(EXEEXT): $(test_gnome_spell_component_OBJECTS) $(test_gnome_spell_component_DEPENDENCIES) 
 	@rm -f test-gnome-spell-component$(EXEEXT)
-	$(LINK) $(test_gnome_spell_component_LDFLAGS) $(test_gnome_spell_component_OBJECTS) $(test_gnome_spell_component_LDADD) $(LIBS)
+	$(LINK) $(test_gnome_spell_component_OBJECTS) $(test_gnome_spell_component_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -446,22 +450,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-spell.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -471,13 +475,9 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
 	@list='$(glade_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -494,7 +494,7 @@
 	done
 install-idlDATA: $(idl_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(idldir)" || $(mkdir_p) "$(DESTDIR)$(idldir)"
+	test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)"
 	@list='$(idl_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -511,7 +511,7 @@
 	done
 install-serverDATA: $(server_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+	test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
 	@list='$(server_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -576,22 +576,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -607,7 +606,7 @@
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(privlibdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(idldir)" "$(DESTDIR)$(serverdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -644,7 +643,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -661,12 +660,20 @@
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -687,24 +694,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-gladeDATA uninstall-idlDATA uninstall-info-am \
+uninstall-am: uninstall-gladeDATA uninstall-idlDATA \
 	uninstall-privlibLTLIBRARIES uninstall-serverDATA
 
+.MAKE: install-am install-data-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
 	clean-privlibLTLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook install-exec \
-	install-exec-am install-gladeDATA install-idlDATA install-info \
-	install-info-am install-man install-privlibLTLIBRARIES \
+	install-data install-data-am install-data-hook install-dvi \
+	install-dvi-am install-exec install-exec-am install-gladeDATA \
+	install-html install-html-am install-idlDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-privlibLTLIBRARIES install-ps install-ps-am \
 	install-serverDATA install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-gladeDATA uninstall-idlDATA \
-	uninstall-info-am uninstall-privlibLTLIBRARIES \
-	uninstall-serverDATA
+	uninstall-privlibLTLIBRARIES uninstall-serverDATA
 
 
 $(IDL_GENERATED): $(SPELL_IDL)
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell/Spell-common.c gnome-spell-1.0.8/gnome-spell/Spell-common.c
--- gnome-spell-1.0.7/gnome-spell/Spell-common.c	2006-02-10 11:49:38.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell/Spell-common.c	2007-10-15 12:24:01.000000000 +0000
@@ -125,8 +125,8 @@
 ,
 (CORBA_TypeCode *)anon_subtypes_array11,
 CORBA_OBJECT_NIL,
-"StringSeq",
-"IDL:GNOME/Spell/StringSeq:1.0",
+(char *)"StringSeq",
+(char *)"IDL:GNOME/Spell/StringSeq:1.0",
 NULL,
 NULL,
 -1,
@@ -157,8 +157,8 @@
 ,
 (CORBA_TypeCode *)anon_subtypes_array14,
 CORBA_OBJECT_NIL,
-"Language",
-"IDL:GNOME/Spell/Language:1.0",
+(char *)"Language",
+(char *)"IDL:GNOME/Spell/Language:1.0",
 (char **)anon_subnames_array13,
 NULL,
 -1,
@@ -250,8 +250,8 @@
 ,
 (CORBA_TypeCode *)anon_subtypes_array27,
 CORBA_OBJECT_NIL,
-"LanguageSeq",
-"IDL:GNOME/Spell/LanguageSeq:1.0",
+(char *)"LanguageSeq",
+(char *)"IDL:GNOME/Spell/LanguageSeq:1.0",
 NULL,
 NULL,
 -1,
@@ -282,8 +282,8 @@
 ,
 (CORBA_TypeCode *)anon_subtypes_array30,
 CORBA_OBJECT_NIL,
-"Error",
-"IDL:GNOME/Spell/Dictionary/Error:1.0",
+(char *)"Error",
+(char *)"IDL:GNOME/Spell/Dictionary/Error:1.0",
 (char **)anon_subnames_array29,
 NULL,
 -1,
@@ -312,8 +312,8 @@
 ,
 NULL,
 CORBA_OBJECT_NIL,
-"Dictionary",
-"IDL:GNOME/Spell/Dictionary:1.0",
+(char *)"Dictionary",
+(char *)"IDL:GNOME/Spell/Dictionary:1.0",
 NULL,
 NULL,
 -1,
@@ -329,10 +329,10 @@
 /* Interface type data */
 
 static ORBit_IArg GNOME_Spell_Dictionary_setLanguage__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "language" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"language" }
 };
 static ORBit_IArg GNOME_Spell_Dictionary_checkWord__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "word" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"word" }
 };
 /* Exceptions */
 static CORBA_TypeCode GNOME_Spell_Dictionary_checkWord__exceptinfo [] = {
@@ -340,7 +340,7 @@
 	NULL
 };
 static ORBit_IArg GNOME_Spell_Dictionary_getSuggestions__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "word" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"word" }
 };
 /* Exceptions */
 static CORBA_TypeCode GNOME_Spell_Dictionary_getSuggestions__exceptinfo [] = {
@@ -348,7 +348,7 @@
 	NULL
 };
 static ORBit_IArg GNOME_Spell_Dictionary_addWordToSession__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "word" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"word" }
 };
 /* Exceptions */
 static CORBA_TypeCode GNOME_Spell_Dictionary_addWordToSession__exceptinfo [] = {
@@ -356,8 +356,8 @@
 	NULL
 };
 static ORBit_IArg GNOME_Spell_Dictionary_addWordToPersonal__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "word" },
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "language" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"word" },
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"language" }
 };
 /* Exceptions */
 static CORBA_TypeCode GNOME_Spell_Dictionary_addWordToPersonal__exceptinfo [] = {
@@ -365,9 +365,9 @@
 	NULL
 };
 static ORBit_IArg GNOME_Spell_Dictionary_setCorrection__arginfo [] = {
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "word" },
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "replacement" },
-	{ TC_CORBA_string,  ORBit_I_ARG_IN , "language" }
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"word" },
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"replacement" },
+	{ TC_CORBA_string,  ORBit_I_ARG_IN , (char *)"language" }
 };
 
 #ifdef ORBIT_IDL_C_IMODULE_Spell
@@ -378,54 +378,56 @@
 		{ 0, 0, NULL, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 0, 0, NULL, FALSE },
-		TC_GNOME_Spell_LanguageSeq, "getLanguages", 12,
+		TC_GNOME_Spell_LanguageSeq, (char *)"getLanguages", 12,
 		0
 }
 , 	{
 		{ 1, 1, GNOME_Spell_Dictionary_setLanguage__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 0, 0, NULL, FALSE },
-TC_void, "setLanguage", 11,
+TC_void, (char *)"setLanguage", 11,
 		0
 }
 , 	{
 		{ 1, 1, GNOME_Spell_Dictionary_checkWord__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 1, 1, GNOME_Spell_Dictionary_checkWord__exceptinfo, FALSE },
-		TC_CORBA_boolean, "checkWord", 9,
+		TC_CORBA_boolean, (char *)"checkWord", 9,
 		0| ORBit_I_COMMON_FIXED_SIZE
 }
 , 	{
 		{ 1, 1, GNOME_Spell_Dictionary_getSuggestions__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 1, 1, GNOME_Spell_Dictionary_getSuggestions__exceptinfo, FALSE },
-		TC_GNOME_Spell_StringSeq, "getSuggestions", 14,
+		TC_GNOME_Spell_StringSeq, (char *)"getSuggestions", 14,
 		0
 }
 , 	{
 		{ 1, 1, GNOME_Spell_Dictionary_addWordToSession__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 1, 1, GNOME_Spell_Dictionary_addWordToSession__exceptinfo, FALSE },
-TC_void, "addWordToSession", 16,
+TC_void, (char *)"addWordToSession", 16,
 		0
 }
 , 	{
 		{ 2, 2, GNOME_Spell_Dictionary_addWordToPersonal__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 1, 1, GNOME_Spell_Dictionary_addWordToPersonal__exceptinfo, FALSE },
-TC_void, "addWordToPersonal", 17,
+TC_void, (char *)"addWordToPersonal", 17,
 		0
 }
 , 	{
 		{ 3, 3, GNOME_Spell_Dictionary_setCorrection__arginfo, FALSE },
 		{ 0, 0, NULL, FALSE },
 		{ 0, 0, NULL, FALSE },
-TC_void, "setCorrection", 13,
+TC_void, (char *)"setCorrection", 13,
 		0
 }
-};static CORBA_string GNOME_Spell_Dictionary__base_itypes[] = {
-"IDL:Bonobo/Unknown:1.0",
-"IDL:omg.org/CORBA/Object:1.0"
+};
+
+static CORBA_string GNOME_Spell_Dictionary__base_itypes[] = {
+(char *)"IDL:Bonobo/Unknown:1.0",
+(char *)"IDL:omg.org/CORBA/Object:1.0"
 };
 #ifdef ORBIT_IDL_C_IMODULE_Spell
 static
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell/Spell.h gnome-spell-1.0.8/gnome-spell/Spell.h
--- gnome-spell-1.0.7/gnome-spell/Spell.h	2006-02-10 11:49:38.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell/Spell.h	2007-10-15 12:24:01.000000000 +0000
@@ -255,6 +255,27 @@
 extern 
 #endif
 ORBit_IMethod GNOME_Spell_Dictionary__imethods[GNOME_Spell_Dictionary_IMETHODS_LEN];
+
+/** IMethods index */
+
+#ifndef __GNOME_Spell_Dictionary__imethods_index
+#define __GNOME_Spell_Dictionary__imethods_index
+typedef enum {
+	GNOME_Spell_Dictionary_getLanguages__imethods_index,
+	GNOME_Spell_Dictionary_setLanguage__imethods_index,
+	GNOME_Spell_Dictionary_checkWord__imethods_index,
+	GNOME_Spell_Dictionary_getSuggestions__imethods_index,
+	GNOME_Spell_Dictionary_addWordToSession__imethods_index,
+	GNOME_Spell_Dictionary_addWordToPersonal__imethods_index,
+	GNOME_Spell_Dictionary_setCorrection__imethods_index
+} GNOME_Spell_Dictionary__imethods_index;
+#endif /* __GNOME_Spell_Dictionary__imethods_index */
+
+#ifndef __ORBIT_IMETHODS_INDEX
+#define __ORBIT_IMETHODS_INDEX
+#define ORBIT_IMETHODS_INDEX(m) (m ## __imethods_index)
+#endif /* __ORBIT_IMETHODS_INDEX */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell/Spell-skels.c gnome-spell-1.0.8/gnome-spell/Spell-skels.c
--- gnome-spell-1.0.7/gnome-spell/Spell-skels.c	2006-02-10 11:49:38.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell/Spell-skels.c	2007-10-15 12:24:01.000000000 +0000
@@ -31,13 +31,13 @@
 case 'P':
 if(strcmp((opname + 10), "ersonal")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->addWordToPersonal;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [5];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [5];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_addWordToPersonal;
 break;
 case 'S':
 if(strcmp((opname + 10), "ession")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->addWordToSession;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [4];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [4];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_addWordToSession;
 break;
 default: break; 
@@ -70,7 +70,7 @@
 case 'c':
 if(strcmp((opname + 1), "heckWord")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->checkWord;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [2];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [2];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_checkWord;
 break;
 case 'g':
@@ -82,13 +82,13 @@
 case 'L':
 if(strcmp((opname + 4), "anguages")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->getLanguages;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [0];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [0];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_getLanguages;
 break;
 case 'S':
 if(strcmp((opname + 4), "uggestions")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->getSuggestions;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [3];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [3];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_getSuggestions;
 break;
 default: break; 
@@ -103,13 +103,13 @@
 case 'q':
 if(strcmp((opname + 1), "ueryInterface")) break;
 *impl = (gpointer)servant->vepv->Bonobo_Unknown_epv->queryInterface;
-{volatile ORBit_IInterface *_t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [2];}
+{ORBit_IInterface *volatile _t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [2];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_Bonobo_Unknown_queryInterface;
 break;
 case 'r':
 if(strcmp((opname + 1), "ef")) break;
 *impl = (gpointer)servant->vepv->Bonobo_Unknown_epv->ref;
-{volatile ORBit_IInterface *_t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [0];}
+{ORBit_IInterface *volatile _t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [0];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_Bonobo_Unknown_ref;
 break;
 case 's':
@@ -121,13 +121,13 @@
 case 'C':
 if(strcmp((opname + 4), "orrection")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->setCorrection;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [6];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [6];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_setCorrection;
 break;
 case 'L':
 if(strcmp((opname + 4), "anguage")) break;
 *impl = (gpointer)servant->vepv->GNOME_Spell_Dictionary_epv->setLanguage;
-{volatile ORBit_IInterface *_t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [1];}
+{ORBit_IInterface *volatile _t_=&GNOME_Spell_Dictionary__iinterface;*m_data = (gpointer)&_t_->methods._buffer [1];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_GNOME_Spell_Dictionary_setLanguage;
 break;
 default: break; 
@@ -142,7 +142,7 @@
 case 'u':
 if(strcmp((opname + 1), "nref")) break;
 *impl = (gpointer)servant->vepv->Bonobo_Unknown_epv->unref;
-{volatile ORBit_IInterface *_t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [1];}
+{ORBit_IInterface *volatile _t_=&Bonobo_Unknown__iinterface;*m_data = (gpointer)&_t_->methods._buffer [1];}
 return (ORBitSmallSkeleton)_ORBIT_skel_small_Bonobo_Unknown_unref;
 break;
 default: break; 
@@ -157,7 +157,7 @@
   PortableServer_ServantBase__init (       ((PortableServer_ServantBase *)servant), env);
   POA_Bonobo_Unknown__init(servant, env);
    ORBit_skel_class_register (&class_info,
-   servant, POA_GNOME_Spell_Dictionary__fini,
+   (PortableServer_ServantBase *)servant, POA_GNOME_Spell_Dictionary__fini,
    ORBIT_VEPV_OFFSET (POA_GNOME_Spell_Dictionary__vepv, GNOME_Spell_Dictionary_epv),
 (CORBA_unsigned_long) Bonobo_Unknown__classid,
 ORBIT_VEPV_OFFSET (POA_GNOME_Spell_Dictionary__vepv, Bonobo_Unknown_epv),
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/gnome-spell.spec gnome-spell-1.0.8/gnome-spell.spec
--- gnome-spell-1.0.7/gnome-spell.spec	2006-02-10 11:49:31.000000000 +0000
+++ gnome-spell-1.0.8/gnome-spell.spec	2007-10-15 12:40:19.000000000 +0000
@@ -1,5 +1,5 @@
 Name:     	gnome-spell	
-Version: 	1.0.7	
+Version: 	1.0.8	
 Release:	%{?custom_release}%{!?custom_release:1}
 License:	GPL
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/INSTALL gnome-spell-1.0.8/INSTALL
--- gnome-spell-1.0.7/INSTALL	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/INSTALL	2007-10-15 12:25:30.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -78,7 +78,7 @@
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,17 +87,15 @@
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -190,12 +188,12 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/install-sh gnome-spell-1.0.8/install-sh
--- gnome-spell-1.0.7/install-sh	2006-02-10 11:49:10.000000000 +0000
+++ gnome-spell-1.0.8/install-sh	2007-10-15 12:25:30.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@@ -95,7 +110,7 @@
   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
     -c) shift
         continue;;
@@ -111,9 +126,15 @@
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
         shift
         shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
         continue;;
 
     -o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,6 +193,33 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
@@ -173,15 +229,11 @@
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
 
-  # Make sure that the destination directory exists.
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
 
-    pathcomp=
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -276,10 +462,10 @@
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
       || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@@ -304,16 +491,13 @@
 	   } &&
 
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
+    } || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
+    trap '' 0
+  fi
+done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/intltool-extract.in gnome-spell-1.0.8/intltool-extract.in
--- gnome-spell-1.0.7/intltool-extract.in	2006-02-10 11:48:52.000000000 +0000
+++ gnome-spell-1.0.8/intltool-extract.in	2007-10-15 12:25:22.000000000 +0000
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.34.1";
+my $VERSION      = "0.36.2";
 
 ## Loaded modules
 use strict; 
@@ -114,6 +114,11 @@
 sub place_normal {
     $FILE	 = $ARGV[0];
     $OUTFILE     = "$FILE.h";
+
+    my $dirname = dirname ($OUTFILE);
+    if (! -d "$dirname" && $dirname ne "") {
+        system ("mkdir -p $dirname");
+    }
 }   
 
 sub place_local {
@@ -156,7 +161,7 @@
       --type=TYPE   Specify the file type of FILENAME. Currently supports:
                     "gettext/glade", "gettext/ini", "gettext/keys"
                     "gettext/rfc822deb", "gettext/schemas",
-                    "gettext/scheme", "gettext/xml"
+                    "gettext/scheme", "gettext/xml", "gettext/quoted"
   -l, --local       Writes output into current working directory
                     (conflicts with --update)
       --update      Writes output into the same directory the source file 
@@ -212,6 +217,7 @@
     &type_scheme if $gettext_type eq "scheme";
     &type_schemas  if $gettext_type eq "schemas";
     &type_rfc822deb  if $gettext_type eq "rfc822deb";
+    &type_quoted if $gettext_type eq "quoted";
 }
 
 sub entity_decode_minimal
@@ -231,9 +237,9 @@
 
     s/&apos;/'/g; # '
     s/&quot;/"/g; # "
-    s/&amp;/&/g;
     s/&lt;/</g;
     s/&gt;/>/g;
+    s/&amp;/&/g;
 
     return $_;
 }
@@ -242,7 +248,7 @@
 {
     return '\"' if $_ eq '"';
     return '\n' if $_ eq "\n";
-    return '\\' if $_ eq '\\';
+    return '\\\\' if $_ eq '\\';
 
     return $_;
 }
@@ -255,8 +261,11 @@
 
 sub type_ini {
     ### For generic translatable desktop files ###
-    while ($input =~ /^_.*=(.*)$/mg) {
-        $messages{$1} = [];
+    while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+        if (defined($2))  {
+            $comments{$3} = $2;
+        }
+        $messages{$3} = [];
     }
 }
 
@@ -485,10 +494,12 @@
 sub intltool_tree_comment
 {
     my $expat = shift;
-    my $data  = shift;
+    my $data  = $expat->original_string();
     my $clist = $expat->{Curlist};
     my $pos   = $#$clist;
 
+    $data =~ s/^<!--//s;
+    $data =~ s/-->$//s;
     push @$clist, 1 => $data;
 }
 
@@ -709,6 +720,17 @@
     return @list;
 }
 
+sub type_quoted {
+    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+        my $message = $1;
+        my $before = $`;
+        $message =~ s/\\\"/\"/g;
+        $before =~ s/[^\n]//g;
+        $messages{$message} = [];
+        $loc{$message} = length ($before) + 2;
+    }
+}
+
 sub type_glade {
     ### For translatable Glade XML files ###
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/intltool-merge.in gnome-spell-1.0.8/intltool-merge.in
--- gnome-spell-1.0.7/intltool-merge.in	2006-02-10 11:48:52.000000000 +0000
+++ gnome-spell-1.0.8/intltool-merge.in	2007-10-15 12:25:22.000000000 +0000
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.34.1";
+my $VERSION = "0.36.2";
 
 ## Loaded modules
 use strict; 
@@ -60,6 +60,7 @@
 my $DESKTOP_STYLE_ARG = 0;
 my $SCHEMAS_STYLE_ARG = 0;
 my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
 my $QUIET_ARG = 0;
 my $PASS_THROUGH_ARG = 0;
 my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@
  "desktop-style|d" => \$DESKTOP_STYLE_ARG,
  "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
  "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
  "pass-through|p" => \$PASS_THROUGH_ARG,
  "utf8|u" => \$UTF8_ARG,
  "multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -91,9 +93,24 @@
 
 my %po_files_by_lang = ();
 my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
+my $iconv = $ENV{"ICONV"} || "iconv";
 my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
 
+sub isProgramInPath
+{
+    my ($file) = @_;
+    # If either a file exists, or when run it returns 0 exit status
+    return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
+    return 0;
+}
+
+if (! isProgramInPath ("$iconv"))
+{
+	print STDERR " *** iconv is not found on this system!\n".
+		     " *** Without it, intltool-merge can not convert encodings.\n";
+	exit;
+}
+
 # Use this instead of \w for XML files to handle more possible characters.
 my $w = "[-A-Za-z0-9._:]";
 
@@ -157,6 +174,14 @@
 	&rfc822deb_merge_translations;
 	&finalize;
 } 
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
+{
+	&utf8_sanity_check;
+	&preparation;
+	&print_message;
+	&quoted_merge_translations;
+	&finalize;
+} 
 else 
 {
 	&print_help;
@@ -193,6 +218,7 @@
   -k, --keys-style       includes translations in the keys style
   -s, --schemas-style    includes translations in the schemas style
   -r, --rfc822deb-style  includes translations in the RFC822 style
+      --quoted-style     includes translations in the quoted string style
   -x, --xml-style        includes translations in the standard xml style
 
 Other options:
@@ -249,15 +275,49 @@
 
 sub gather_po_files
 {
-    for my $po_file (glob "$PO_DIR/*.po") {
-	$po_files_by_lang{po_file2lang($po_file)} = $po_file;
+    if (my $linguas = $ENV{"LINGUAS"})
+    {
+        for my $lang (split / /, $linguas) {
+            my $po_file = $PO_DIR . "/" . $lang . ".po";
+            if (-e $po_file) {
+                $po_files_by_lang{$lang} = $po_file;
+            }
+        }
+    }
+    else
+    {
+        if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
+        {
+            while (<LINGUAS_FILE>)
+            {
+                next if /^#/;
+
+                if (/([-a-zA-Z_@.]+)\n/)
+                {
+                    my $lang = $1;
+
+                    my $po_file = $PO_DIR . "/" . $lang . ".po";
+                    if (-e $po_file) {
+                        $po_files_by_lang{$lang} = $po_file;
+                    }
+                }
+            }
+
+            close LINGUAS_FILE;
+        }
+        else
+        {
+            for my $po_file (glob "$PO_DIR/*.po") {
+                $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+            }
+        }
     }
 }
 
 sub get_local_charset
 {
     my ($encoding) = @_;
-    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
+    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias";
 
     # seek character encoding aliases in charset.alias (glib)
 
@@ -395,7 +455,7 @@
             } 
             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|";	
             }
@@ -415,7 +475,7 @@
         {
 	    $nextfuzzy = 1 if /^#, fuzzy/;
        
-	    if (/^msgid "((\\.|[^\\])*)"/ ) 
+	    if (/^msgid "((\\.|[^\\]+)*)"/ ) 
             {
 		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
 		$msgid = "";
@@ -431,14 +491,14 @@
 		$nextfuzzy = 0;
 	    }
 
-	    if (/^msgstr "((\\.|[^\\])*)"/) 
+	    if (/^msgstr "((\\.|[^\\]+)*)"/) 
             {
 	        $msgstr = unescape_po_string($1);
 		$inmsgstr = 1;
 		$inmsgid = 0;
 	    }
 
-	    if (/^"((\\.|[^\\])*)"/) 
+	    if (/^"((\\.|[^\\]+)*)"/) 
             {
 	        $msgid .= unescape_po_string($1) if $inmsgid;
 	        $msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -483,16 +543,15 @@
     return $string;
 }
 
-## NOTE: deal with < - &lt; but not > - &gt;  because it seems its ok to have 
-## > in the entity. For further info please look at #84738.
 sub entity_decode
 {
     local ($_) = @_;
 
     s/&apos;/'/g; # '
     s/&quot;/"/g; # "
-    s/&amp;/&/g;
     s/&lt;/</g;
+    s/&gt;/>/g;
+    s/&amp;/&/g;
 
     return $_;
 }
@@ -1006,8 +1065,8 @@
 
     if ($MULTIPLE_OUTPUT) {
         for my $lang (sort keys %po_files_by_lang) {
-	    if ( ! -e $lang ) {
-	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+	    if ( ! -d $lang ) {
+	        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
             }
             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
             binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1354,3 +1413,39 @@
     return @list;
 }
 
+sub quoted_translation
+{
+    my ($lang, $string) = @_;
+
+    $string =~ s/\\\"/\"/g;
+
+    my $translation = $translations{$lang, $string};
+    $translation = $string if !$translation;
+
+    $translation =~ s/\"/\\\"/g;
+    return $translation
+}
+
+sub quoted_merge_translations
+{
+    if (!$MULTIPLE_OUTPUT) {
+        print "Quoted only supports Multiple Output.\n";
+        exit(1);
+    }
+
+    for my $lang (sort keys %po_files_by_lang) {
+        if ( ! -d $lang ) {
+            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+        }
+        open INPUT, "<${FILE}" or die;
+        open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        while (<INPUT>) 
+        {
+            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
+            print OUTPUT;
+        }
+        close OUTPUT;
+        close INPUT;
+    }
+}
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/intltool-update.in gnome-spell-1.0.8/intltool-update.in
--- gnome-spell-1.0.7/intltool-update.in	2006-02-10 11:48:52.000000000 +0000
+++ gnome-spell-1.0.8/intltool-update.in	2007-10-15 12:25:22.000000000 +0000
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.1";
+my $VERSION = "0.36.2";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -71,7 +71,8 @@
 "sheet(?:\\.in)+|".	# ?
 "schemas(?:\\.in)+|".	# GConf specific
 "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+";	# GOK specific. 
+"kbd(?:\\.in)+|".	# GOK specific. 
+"policy(?:\\.in)+";	# PolicyKit files
 
 my $ini_support =
 "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
@@ -80,7 +81,8 @@
 "directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
 "soundlist(?:\\.in)+|".	# GNOME specific
 "keys(?:\\.in)+|".	# GNOME Mime database specific
-"theme(?:\\.in)+";	# http://www.freedesktop.org/Standards/icon-theme-spec
+"theme(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
+"service(?:\\.in)+";    # DBus specific
 
 my $buildin_gettext_support = 
 "c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
@@ -89,10 +91,9 @@
 $| = 1;
 
 ## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
 my $POTFILES_in;
 
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
 $POTFILES_in = "<$SRCDIR/POTFILES.in";
 
 my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -123,8 +124,10 @@
 
 &Console_Write_IntltoolHelp if $arg_count > 1;
 
+my $PKGNAME = FindPackageName ();
+
 # --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName;
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
 
 if ($POT_ARG)
 {
@@ -315,7 +318,8 @@
 	@buf_potfiles_ignore,
 	@buf_allfiles,
 	@buf_allfiles_sorted,
-	@buf_potfiles_sorted
+	@buf_potfiles_sorted,
+        @buf_potfiles_ignore_sorted
     );
 
     ## Search and find all translatable files
@@ -325,7 +329,12 @@
 	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
 	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
 	}, "..";
-
+    find sub { 
+	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
+	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
+	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
+	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+	}, "$SRCDIR/..";
 
     open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
     @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -341,7 +350,7 @@
     ## comparing with POTFILES.in
     foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
     {
-	(-s $ignore) or next;
+	(-s "$SRCDIR/$ignore") or next;
 
 	if ("$ignore" eq "POTFILES.ignore")
 	{
@@ -350,7 +359,7 @@
 	}
 
 	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-	open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
 	    
 	while (<FILE>)
 	{
@@ -358,7 +367,7 @@
 	}
 	close FILE;
 
-	@buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
     }
 
     foreach my $file (@buf_i18n_plain)
@@ -416,7 +425,7 @@
 		}
 	    }	    
 
-	    if (/\.GetString ?\(QUOTEDTEXT/)
+	    if (/\w\.GetString *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -425,7 +434,8 @@
 		last;
 	    }
 
-	    if (/_\(QUOTEDTEXT/)
+            ## N_ Q_ and _ are the three macros defined in gi8n.h
+	    if (/[NQ]?_ *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -485,6 +495,15 @@
     my %in2;
     foreach (@buf_potfiles_sorted) 
     {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
+	$in2{$_} = 1;
+    }
+
+    foreach (@buf_potfiles_ignore_sorted) 
+    {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
 	$in2{$_} = 1;
     }
 
@@ -492,9 +511,16 @@
 
     foreach (@buf_allfiles_sorted)
     {
-	if (!exists($in2{$_}))
+        my $dummy = $_;
+        my $srcdir = $SRCDIR;
+
+        $srcdir =~ s#^../##;
+        $dummy =~ s#^$srcdir/../##;
+        $dummy =~ s#^$srcdir/##;
+        $dummy =~ s#_build/##;
+	if (!exists($in2{$dummy}))
 	{
-	    push @result, $_
+	    push @result, $dummy
 	}
     }
 
@@ -503,7 +529,7 @@
     foreach (@buf_potfiles_sorted)
     {
 	chomp (my $dummy = $_);
-	if ("$dummy" ne "" and ! -f "../$dummy")
+	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
 	{
 	    push @buf_potfiles_notexist, $_;
 	}
@@ -536,7 +562,7 @@
 	    warn "\n" if ($VERBOSE or @result);
 	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
 	    warn @buf_potfiles_notexist, "\n";
-	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
+	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
 		 "containing this list of absent files has been written in the current directory.\n";
 	}
     }
@@ -554,16 +580,33 @@
     exit 1;
 }
 
-sub GenerateHeaders
+sub isProgramInPath
 {
-    my $EXTRACT = "@INTLTOOL_EXTRACT@";
-    chomp $EXTRACT;
+    my ($file) = @_;
+    # If either a file exists, or when run it returns 0 exit status
+    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+    return 0;
+}
 
-    $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+sub isGNUGettextTool
+{
+    my ($file) = @_;
+    # Check that we are using GNU gettext tools
+    if (isProgramInPath ($file))
+    {
+        my $version = `$file --version`;
+        return 1 if ($version =~ m/.*\(GNU .*\).*/);
+    }
+    return 0;
+}
+
+sub GenerateHeaders
+{
+    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
 
     ## Generate the .h header files, so we can allow glade and
     ## xml translation support
-    if (! -x "$EXTRACT")
+    if (! isProgramInPath ("$EXTRACT"))
     {
 	print STDERR "\n *** The intltool-extract script wasn't found!"
 	     ."\n *** Without it, intltool-update can not generate files.\n";
@@ -610,13 +653,13 @@
 #
 sub GeneratePOTemplate
 {
-    my $XGETTEXT = $ENV{"XGETTEXT"} || "/usr/bin/xgettext";
+    my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
     my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
     chomp $XGETTEXT;
 
-    if (! -x $XGETTEXT)
+    if (! isGNUGettextTool ("$XGETTEXT"))
     {
-	print STDERR " *** xgettext is not found on this system!\n".
+	print STDERR " *** GNU xgettext is not found on this system!\n".
 		     " *** Without it, intltool-update can not extract strings.\n";
 	exit;
     }
@@ -670,12 +713,8 @@
 	} 
 	else 
 	{
-	    if ($SRCDIR eq ".") {
-	        print OUTFILE "../$_\n";
-	    } else {
-	        print OUTFILE "$SRCDIR/../$_\n";
-	    }
-	    $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+            print OUTFILE "$SRCDIR/../$_\n";
+	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
 	}
 
 	next if (! $gettext_support_nonascii);
@@ -716,11 +755,29 @@
     unlink "$MODULE.pot";
     my @xgettext_argument=("$XGETTEXT",
 			   "--add-comments",
-			   "--directory\=\.",
+			   "--directory\=.",
+                           "--default-domain\=$MODULE",
+                           "--flag\=g_strdup_printf:1:c-format",
+                           "--flag\=g_string_printf:2:c-format",
+                           "--flag\=g_string_append_printf:2:c-format",
+                           "--flag\=g_error_new:3:c-format",
+                           "--flag\=g_set_error:4:c-format",
+                           "--flag\=g_markup_printf_escaped:1:c-format",
+                           "--flag\=g_log:3:c-format",
+                           "--flag\=g_print:1:c-format",
+                           "--flag\=g_printerr:1:c-format",
+                           "--flag\=g_printf:1:c-format",
+                           "--flag\=g_fprintf:2:c-format",
+                           "--flag\=g_sprintf:2:c-format",
+                           "--flag\=g_snprintf:3:c-format",
+                           "--flag\=g_scanner_error:2:c-format",
+                           "--flag\=g_scanner_warn:2:c-format",
 			   "--output\=$MODULE\.pot",
 			   "--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;
@@ -781,9 +838,16 @@
 {
     -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
 
-    my $MSGMERGE = $ENV{"MSGMERGE"} || "/usr/bin/msgmerge";
+    my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
     my ($lang, $outfile) = @_;
 
+    if (! isGNUGettextTool ("$MSGMERGE"))
+    {
+	print STDERR " *** GNU msgmerge is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
     print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
 
     my $infile = "$SRCDIR/$lang.po";
@@ -824,7 +888,14 @@
 sub Console_Write_TranslationStatus
 {
     my ($lang, $output_file) = @_;
-    my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
 
     $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
 
@@ -833,21 +904,28 @@
 
 sub Console_Write_CoverageReport
 {
-    my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
 
     &GatherPOFiles;
 
     foreach my $lang (@languages) 
     {
-	print "$lang: ";
+	print STDERR "$lang: ";
 	&POFile_Update ($lang, "");
     }
 
-    print "\n\n * Current translation support in $MODULE \n\n";
+    print STDERR "\n\n * Current translation support in $MODULE \n\n";
 
     foreach my $lang (@languages)
     {
-	print "$lang: ";
+	print STDERR "$lang: ";
 	system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
     }
 }
@@ -873,8 +951,10 @@
     {
 	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");
     }
     
@@ -919,13 +999,13 @@
 
 	    $conf_in || die "Cannot find top_builddir in Makevars.";
 	}
-	elsif (-f "../configure.ac") 
+	elsif (-f "$SRCDIR/../configure.ac") 
 	{
-	    $conf_in = "../configure.ac";
+	    $conf_in = "$SRCDIR/../configure.ac";
 	} 
-	elsif (-f "../configure.in") 
+	elsif (-f "$SRCDIR/../configure.in") 
 	{
-	    $conf_in = "../configure.in";
+	    $conf_in = "$SRCDIR/../configure.in";
 	} 
 	else 
 	{
@@ -991,10 +1071,10 @@
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"AC_PACKAGE_NAME"} = $name;
-	$varhash{"PACKAGE"} = $name;
-	$varhash{"AC_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) 
@@ -1002,19 +1082,18 @@
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"AC_PACKAGE_NAME"} = $name;
-	$varhash{"PACKAGE"} = $name;
-	$varhash{"AC_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?
     $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
     
-    # prepend '$' to auto* internal variables, usually they are
-    # used in configure.in/ac without the '$'
-    $name =~ s/AC_/\$AC_/g;
-    $name =~ s/\$\$/\$/g;
+    # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
+    # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
+    $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
 
     $name = $domain if $domain;
 
@@ -1063,3 +1142,23 @@
     
     return $domain;
 }
+
+sub FindMakevarsBugAddress
+{
+
+    my $address = "";
+    my $makevars_source; { 
+	local (*IN);
+	open (IN, "<Makevars") || return undef;
+	seek (IN, 0, 0);
+	local $/; # slurp mode
+	$makevars_source = <IN>;
+	close IN;
+    }
+
+    $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
+    $address =~ s/^\s+//;
+    $address =~ s/\s+$//;
+    
+    return $address;
+}
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/ltmain.sh gnome-spell-1.0.8/ltmain.sh
--- gnome-spell-1.0.7/ltmain.sh	2006-01-29 14:49:19.000000000 +0000
+++ gnome-spell-1.0.8/ltmain.sh	2007-08-29 11:52:51.000000000 +0000
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_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
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,12 +113,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +146,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +208,13 @@
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +345,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +482,12 @@
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +784,10 @@
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1168,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1178,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,7 +1639,7 @@
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1620,10 +1659,11 @@
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1691,9 @@
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1752,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2094,7 +2134,7 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2490,7 +2530,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3228,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3197,9 +3239,10 @@
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3258,7 +3301,8 @@
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3272,8 +3316,11 @@
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3410,11 +3457,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3562,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3606,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3638,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3880,7 +3924,10 @@
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4239,12 +4286,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4741,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4765,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4858,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4895,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5302,20 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_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
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5458,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5644,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5989,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6200,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6348,8 +6411,10 @@
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6413,12 +6478,12 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6840,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6856,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/Makefile.in gnome-spell-1.0.8/Makefile.in
--- gnome-spell-1.0.7/Makefile.in	2006-02-10 11:49:12.000000000 +0000
+++ gnome-spell-1.0.8/Makefile.in	2007-10-15 12:40:11.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,19 +31,19 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/gnome-spell-zip.in $(srcdir)/gnome-spell.spec.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 	acconfig.h config.guess config.sub depcomp install-sh \
 	ltmain.sh missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = gnome-spell.spec gnome-spell-zip
@@ -55,10 +51,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -74,8 +73,7 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 API_VERSION = @API_VERSION@
 API_VERSION_IN_SHLIB_NAME = @API_VERSION_IN_SHLIB_NAME@
@@ -120,6 +118,8 @@
 GNOME_SPELL_DATADIR = @GNOME_SPELL_DATADIR@
 GNOME_SPELL_LIBS = @GNOME_SPELL_LIBS@
 GNOME_SPELL_RELEASE = @GNOME_SPELL_RELEASE@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -130,25 +130,23 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
 INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
 INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
 INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
 INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
@@ -158,16 +156,15 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 NO_UNDEFINED = @NO_UNDEFINED@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 ORBIT_IDL = @ORBIT_IDL@
-OS_WIN32_FALSE = @OS_WIN32_FALSE@
-OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -181,6 +178,7 @@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOEXT = @SOEXT@
@@ -189,20 +187,13 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 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_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@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -214,28 +205,39 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 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@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = po gnome-spell art
 EXTRA_DIST = \
 	gnome-spell.spec	\
@@ -290,7 +292,7 @@
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -316,7 +318,6 @@
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -349,8 +350,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -452,24 +452,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/po
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -483,7 +481,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -491,6 +489,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -498,7 +498,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -573,7 +573,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -644,12 +644,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -670,24 +678,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/missing gnome-spell-1.0.8/missing
--- gnome-spell-1.0.7/missing	2006-02-10 11:49:10.000000000 +0000
+++ gnome-spell-1.0.8/missing	2007-10-15 12:25:30.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/mkinstalldirs gnome-spell-1.0.8/mkinstalldirs
--- gnome-spell-1.0.7/mkinstalldirs	2006-02-10 11:49:11.000000000 +0000
+++ gnome-spell-1.0.8/mkinstalldirs	2007-10-15 12:25:30.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -11,6 +11,9 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
 dirmode=
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/NEWS gnome-spell-1.0.8/NEWS
--- gnome-spell-1.0.7/NEWS	2006-02-10 07:59:08.000000000 +0000
+++ gnome-spell-1.0.8/NEWS	2007-10-15 12:39:10.000000000 +0000
@@ -1,3 +1,23 @@
+* version 1.0.8 "Autumn leaves"
+
+  - Win32 fixes (Tor Lillqvist)
+
+  - Added Occitan translation (Yannig Marchegay)
+
+  - Added Slovenian translation (Matic Zgur)
+
+  - Added Dzongkha translation (Pema Geyleg)
+
+  - Added Xhosa translation (Adi Attar)
+
+  - Added Kinyarwanda translation (Steve Murphy)
+
+  - Added Nepali translation (Pawan Chitrakar)
+
+  - Added Korean translation (Changwoo Ryu)
+
+  - Added Galician translation (Ignacio Casal Quinteiro)
+
 * version 1.0.7 "Winter beauty" 02-10-2005
 
   - added all languages listed by gnome-spell (Andre Klapper)
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ar.po gnome-spell-1.0.8/po/ar.po
--- gnome-spell-1.0.7/po/ar.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-spell-1.0.8/po/ar.po	2007-09-03 07:42:15.000000000 +0000
@@ -0,0 +1,1054 @@
+# Arabic translations for THIS package.
+# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as THIS package.
+# Automatically generated, 2007.
+# Djihed Afifi <djihed@gmail.com>, 2007
+msgid ""
+msgstr ""
+"Project-Id-Version: Arabic\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-04-21 22:52+0100\n"
+"PO-Revision-Date: 2007-04-14 18:49+0100\n"
+"Last-Translator: Djihed Afifi <djihed@gmail.com>\n"
+"Language-Team: Arabeyes <doc@arabeyes.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../gnome-spell/control.c:232
+#, fuzzy, c-format
+msgid "_Suggestions for '%s'"
+msgstr "إ_قتراحات:"
+
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
+msgid "Suggestions"
+msgstr "إقتراحات"
+
+#: ../gnome-spell/control.c:415
+msgid "Could not load glade file."
+msgstr "لم أتمكن من تحميل ملف glade"
+
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+#, fuzzy
+msgid "Afar"
+msgstr "أرار"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "الأفريكانية"
+
+#: ../gnome-spell/dictionary.c:152
+#, fuzzy
+msgid "Akan"
+msgstr "أبَكان"
+
+#: ../gnome-spell/dictionary.c:153
+#, fuzzy
+msgid "Amharic"
+msgstr "ا-ص|أمهري"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "عربي"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "الأسامية"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "الإستوريانية"
+
+#: ../gnome-spell/dictionary.c:157
+#, fuzzy
+msgid "Avar"
+msgstr "الفا"
+
+#: ../gnome-spell/dictionary.c:158
+#, fuzzy
+msgid "Aymara"
+msgstr "أجواني"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "الأذريبيجانيّة"
+
+#: ../gnome-spell/dictionary.c:160
+#, fuzzy
+msgid "Bashkir"
+msgstr "بسيط"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "بالينية"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "البلا روسية"
+
+#: ../gnome-spell/dictionary.c:163
+#, fuzzy
+msgid "Bemba"
+msgstr "بمبا"
+
+#: ../gnome-spell/dictionary.c:164
+#, fuzzy
+msgid "Bulgarian"
+msgstr "بلغاريا"
+
+#: ../gnome-spell/dictionary.c:165
+#, fuzzy
+msgid "Bihari"
+msgstr "بيشا"
+
+#: ../gnome-spell/dictionary.c:166
+#, fuzzy
+msgid "Bislama"
+msgstr "براتسلافا"
+
+#: ../gnome-spell/dictionary.c:167
+#, fuzzy
+msgid "Bambara"
+msgstr "سامرّاء"
+
+#: ../gnome-spell/dictionary.c:168
+#, fuzzy
+msgid "Bengali"
+msgstr "ا-ص|بنغالي"
+
+#: ../gnome-spell/dictionary.c:169
+#, fuzzy
+msgid "Tibetan"
+msgstr "ريبيرالتا"
+
+#: ../gnome-spell/dictionary.c:170
+msgid "Breton"
+msgstr "البروطونية"
+
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "البوسنية"
+
+#: ../gnome-spell/dictionary.c:172
+#, fuzzy
+msgid "Catalan"
+msgstr "ض-ي|كتلان"
+
+#: ../gnome-spell/dictionary.c:173
+#, fuzzy
+msgid "Chechen"
+msgstr "قائمة_خيار"
+
+#: ../gnome-spell/dictionary.c:174
+#, fuzzy
+msgid "Cebuano"
+msgstr "لبنان"
+
+#: ../gnome-spell/dictionary.c:175
+#, fuzzy
+msgid "Chamorro"
+msgstr "شارليروي"
+
+#: ../gnome-spell/dictionary.c:176
+#, fuzzy
+msgid "Chuukese"
+msgstr "صّينيّ"
+
+#: ../gnome-spell/dictionary.c:177
+#, fuzzy
+msgid "Corsican"
+msgstr "كورسيكانا"
+
+#: ../gnome-spell/dictionary.c:178
+msgid "Czech"
+msgstr "التشيكية"
+
+#: ../gnome-spell/dictionary.c:179
+#, fuzzy
+msgid "Kashubian"
+msgstr "كاشي"
+
+#: ../gnome-spell/dictionary.c:180
+#, fuzzy
+msgid "Chuvash"
+msgstr "شانغ"
+
+#: ../gnome-spell/dictionary.c:181
+msgid "Welsh"
+msgstr "الغالية"
+
+#: ../gnome-spell/dictionary.c:182
+#, fuzzy
+msgid "Danish"
+msgstr "اسباني"
+
+#: ../gnome-spell/dictionary.c:183
+#, fuzzy
+msgid "German (Austria)"
+msgstr "ا-ص|ألماني (النّمسا)"
+
+#: ../gnome-spell/dictionary.c:184
+#, fuzzy
+msgid "German (Germany)"
+msgstr "خريطة مفاتيح ألمانية"
+
+#: ../gnome-spell/dictionary.c:185
+#, fuzzy
+msgid "German (Swiss)"
+msgstr "ألمانية سويسرية مع يورو"
+
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:187
+#, fuzzy
+msgid "Greek"
+msgstr "أخضر"
+
+#: ../gnome-spell/dictionary.c:188
+#, fuzzy
+msgid "English (American)"
+msgstr "إنجليزي (المملكة المتحدة)"
+
+#: ../gnome-spell/dictionary.c:189
+#, fuzzy
+msgid "English (British)"
+msgstr "إنجليزي (المملكة المتحدة)"
+
+#: ../gnome-spell/dictionary.c:190
+#, fuzzy
+msgid "English (Canadian)"
+msgstr "إنجليزي (كندا)"
+
+#: ../gnome-spell/dictionary.c:191
+msgid "Esperanto"
+msgstr "الإسبرانتو"
+
+#: ../gnome-spell/dictionary.c:192
+msgid "Spanish"
+msgstr "اسباني"
+
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "الإستونيّة"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "باسك"
+
+#: ../gnome-spell/dictionary.c:195
+#, fuzzy
+msgid "Farsi"
+msgstr "فيغاري"
+
+#: ../gnome-spell/dictionary.c:196
+#, fuzzy
+msgid "Fulah"
+msgstr "المسار الكلّي:"
+
+#: ../gnome-spell/dictionary.c:197
+#, fuzzy
+msgid "Finnish"
+msgstr "انهاء"
+
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "الفيجية"
+
+#: ../gnome-spell/dictionary.c:199
+#, fuzzy
+msgid "Faroese"
+msgstr "فارو"
+
+#: ../gnome-spell/dictionary.c:200
+#, fuzzy
+msgid "French (France)"
+msgstr "ض-ي|فرنسي (كندا)"
+
+#: ../gnome-spell/dictionary.c:201
+#, fuzzy
+msgid "French (Swiss)"
+msgstr "فرنسية سويسرية"
+
+#: ../gnome-spell/dictionary.c:202
+#, fuzzy
+msgid "Friulian"
+msgstr "الفيجية"
+
+#: ../gnome-spell/dictionary.c:203
+#, fuzzy
+msgid "Frisian"
+msgstr "الفيجية"
+
+#: ../gnome-spell/dictionary.c:204
+msgid "Irish"
+msgstr "الإيرلندية"
+
+#: ../gnome-spell/dictionary.c:205
+#, fuzzy
+msgid "Scottish Gaelic"
+msgstr "إيرلندي"
+
+#: ../gnome-spell/dictionary.c:206
+msgid "Galician"
+msgstr "الغاليتشية"
+
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "الجوارانية"
+
+#: ../gnome-spell/dictionary.c:208
+#, fuzzy
+msgid "Gujarati"
+msgstr "الجوارانية"
+
+#: ../gnome-spell/dictionary.c:209
+#, fuzzy
+msgid "Manx Gaelic"
+msgstr "أقصى عدد من السّطور"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "الهوسية"
+
+#: ../gnome-spell/dictionary.c:211
+#, fuzzy
+msgid "Hawaiian"
+msgstr "هاواي"
+
+#: ../gnome-spell/dictionary.c:212
+#, fuzzy
+msgid "Hebrew"
+msgstr "ض-ي|عبري"
+
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "هندي"
+
+#: ../gnome-spell/dictionary.c:214
+#, fuzzy
+msgid "Hiligaynon"
+msgstr "ميلنغتون"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "كرواتي"
+
+#: ../gnome-spell/dictionary.c:217
+#, fuzzy
+msgid "Upper Sorbian"
+msgstr "الساعة العليا"
+
+#: ../gnome-spell/dictionary.c:218
+#, fuzzy
+msgid "Haitian Creole"
+msgstr "التحكّم في الزيادة"
+
+#: ../gnome-spell/dictionary.c:219
+#, fuzzy
+msgid "Hungarian"
+msgstr "ض-ي|مجري"
+
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "الأرمينية"
+
+#: ../gnome-spell/dictionary.c:221
+#, fuzzy
+msgid "Herero"
+msgstr "هيريرا"
+
+#: ../gnome-spell/dictionary.c:222
+#, fuzzy
+msgid "Interlingua"
+msgstr "ا-ص|إنترلنغوا"
+
+#: ../gnome-spell/dictionary.c:223
+#, fuzzy
+msgid "Iban"
+msgstr "عبدان"
+
+#: ../gnome-spell/dictionary.c:224
+#, fuzzy
+msgid "Indonesian"
+msgstr "ا-ص|إندونيسي"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "الإجبوية"
+
+#: ../gnome-spell/dictionary.c:226
+#, fuzzy
+msgid "Sichuan Yi"
+msgstr "سيتشوان"
+
+#: ../gnome-spell/dictionary.c:227
+#, fuzzy
+msgid "Iloko"
+msgstr "إلكو"
+
+#: ../gnome-spell/dictionary.c:228
+#, fuzzy
+msgid "Ido"
+msgstr "إداهو"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "الأيسلندية"
+
+#: ../gnome-spell/dictionary.c:230
+#, fuzzy
+msgid "Italian"
+msgstr "ا-ص|إيطالي"
+
+#: ../gnome-spell/dictionary.c:231
+#, fuzzy
+msgid "Japanese"
+msgstr "ض-ي|ياباني"
+
+#: ../gnome-spell/dictionary.c:232
+#, fuzzy
+msgid "Javanese"
+msgstr "كونسول جافا"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "جورجي"
+
+#: ../gnome-spell/dictionary.c:234
+#, fuzzy
+msgid "Kachin"
+msgstr "كراتشي"
+
+#: ../gnome-spell/dictionary.c:235
+#, fuzzy
+msgid "Kongo"
+msgstr "الكنغو"
+
+#: ../gnome-spell/dictionary.c:236
+#, fuzzy
+msgid "Khasi"
+msgstr "كاشي"
+
+#: ../gnome-spell/dictionary.c:237
+#, fuzzy
+msgid "Kikuyu"
+msgstr "كيسومو"
+
+#: ../gnome-spell/dictionary.c:238
+#, fuzzy
+msgid "Kwanyama"
+msgstr "اوكاياما"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "الكازاخستانية"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:241
+#, fuzzy
+msgid "Khmer"
+msgstr "كيميروفو"
+
+#: ../gnome-spell/dictionary.c:242
+#, fuzzy
+msgid "Kannada"
+msgstr "ض-ي|كندي"
+
+#: ../gnome-spell/dictionary.c:243
+#, fuzzy
+msgid "Korean"
+msgstr "ض-ي|كوري"
+
+#: ../gnome-spell/dictionary.c:244
+#, fuzzy
+msgid "Konkani"
+msgstr "كوزاني"
+
+#: ../gnome-spell/dictionary.c:245
+#, fuzzy
+msgid "Kanuri"
+msgstr "بانكوي"
+
+#: ../gnome-spell/dictionary.c:246
+#, fuzzy
+msgid "Kashmiri"
+msgstr "كاشي"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "الكردية"
+
+#: ../gnome-spell/dictionary.c:248
+#, fuzzy
+msgid "Komi"
+msgstr "كيمي"
+
+#: ../gnome-spell/dictionary.c:249
+#, fuzzy
+msgid "Cornish"
+msgstr "الإيرلندية"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "الكرغيزية"
+
+#: ../gnome-spell/dictionary.c:251
+#, fuzzy
+msgid "Latin"
+msgstr "لاتينا"
+
+#: ../gnome-spell/dictionary.c:252
+#, fuzzy
+msgid "Luxembourgish"
+msgstr "لكسمبورغ"
+
+#: ../gnome-spell/dictionary.c:253
+#, fuzzy
+msgid "Ganda"
+msgstr "غانا"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "الليمبرجية"
+
+#: ../gnome-spell/dictionary.c:255
+#, fuzzy
+msgid "Lingala"
+msgstr "قانوني"
+
+#: ../gnome-spell/dictionary.c:256
+#, fuzzy
+msgid "Lao"
+msgstr "لاكون"
+
+#: ../gnome-spell/dictionary.c:257
+#, fuzzy
+msgid "Lozi"
+msgstr "لوي"
+
+#: ../gnome-spell/dictionary.c:258
+#, fuzzy
+msgid "Lithuanian"
+msgstr "ليتوانيا"
+
+#: ../gnome-spell/dictionary.c:259
+#, fuzzy
+msgid "Luba-Katanga"
+msgstr "لاتاكونغا"
+
+#: ../gnome-spell/dictionary.c:260
+#, fuzzy
+msgid "Luo"
+msgstr "لوتون"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "اللتفية"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "الملغاسية"
+
+#: ../gnome-spell/dictionary.c:263
+#, fuzzy
+msgid "Marshallese"
+msgstr "مارشال"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "الماورية"
+
+#: ../gnome-spell/dictionary.c:265
+#, fuzzy
+msgid "Minangkabau"
+msgstr "شينيانغا"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "مقدونية"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "ملايلام"
+
+#: ../gnome-spell/dictionary.c:268
+#, fuzzy
+msgid "Mongolian"
+msgstr "منغوليا"
+
+#: ../gnome-spell/dictionary.c:269
+#, fuzzy
+msgid "Moldavian"
+msgstr "جاري النقل"
+
+#: ../gnome-spell/dictionary.c:270
+#, fuzzy
+msgid "Marathi"
+msgstr "ماراثون"
+
+#: ../gnome-spell/dictionary.c:271
+#, fuzzy
+msgid "Malay"
+msgstr "الملغاسية"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "المالطيّة"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "البورميّة"
+
+#: ../gnome-spell/dictionary.c:274
+#, fuzzy
+msgid "Norwegian (Bokmal)"
+msgstr "نرويجي بوكمال"
+
+#: ../gnome-spell/dictionary.c:275
+#, fuzzy
+msgid "North Ndebele"
+msgstr "غير مدمج"
+
+#: ../gnome-spell/dictionary.c:276
+#, fuzzy
+msgid "Low Saxon"
+msgstr "ساكسونيا السفلى"
+
+# نيبال
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "النيبالية"
+
+#: ../gnome-spell/dictionary.c:278
+#, fuzzy
+msgid "Ndonga"
+msgstr "ندولا"
+
+#: ../gnome-spell/dictionary.c:279
+#, fuzzy
+msgid "Niuean"
+msgstr "نيوي"
+
+#: ../gnome-spell/dictionary.c:280
+#, fuzzy
+msgid "Dutch"
+msgstr "دولوث"
+
+#: ../gnome-spell/dictionary.c:281
+#, fuzzy
+msgid "Norwegian (Nyorsk)"
+msgstr "ض-ي|نرويجي (نينرسك)"
+
+#: ../gnome-spell/dictionary.c:282
+msgid "Norwegian"
+msgstr "نرويجية"
+
+#: ../gnome-spell/dictionary.c:283
+#, fuzzy
+msgid "South Ndebele"
+msgstr "ساوث تمبالير"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "السوثو الشمالي"
+
+#: ../gnome-spell/dictionary.c:285
+#, fuzzy
+msgid "Navajo"
+msgstr "دافاو"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "الأوكسيتانية"
+
+#: ../gnome-spell/dictionary.c:288
+#, fuzzy
+msgid "Oromo"
+msgstr "روميو"
+
+#: ../gnome-spell/dictionary.c:289
+#, fuzzy
+msgid "Oriya"
+msgstr "ا-ص|أوريا"
+
+#: ../gnome-spell/dictionary.c:290
+#, fuzzy
+msgid "Ossetic"
+msgstr "كلتي"
+
+#: ../gnome-spell/dictionary.c:291
+#, fuzzy
+msgid "Punjabi"
+msgstr "ا-ص|بنجابي"
+
+#: ../gnome-spell/dictionary.c:292
+#, fuzzy
+msgid "Pampanga"
+msgstr "لامبانغ"
+
+#: ../gnome-spell/dictionary.c:293
+#, fuzzy
+msgid "Papiamento"
+msgstr "ساكرامنتو"
+
+#: ../gnome-spell/dictionary.c:294
+msgid "Polish"
+msgstr "بولندية"
+
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "الباشتوية"
+
+#: ../gnome-spell/dictionary.c:296
+#, fuzzy
+msgid "Portuguese (Portugal)"
+msgstr "برتغالي (البرازيل)"
+
+#: ../gnome-spell/dictionary.c:297
+#, fuzzy
+msgid "Portuguese (Brazilian)"
+msgstr "برتغالي (البرازيل)"
+
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "الكشوائية"
+
+#: ../gnome-spell/dictionary.c:299
+#, fuzzy
+msgid "Rarotongan"
+msgstr "راروتونغا"
+
+#: ../gnome-spell/dictionary.c:300
+#, fuzzy
+msgid "Rundi"
+msgstr "دائري"
+
+#: ../gnome-spell/dictionary.c:301
+msgid "Romanian"
+msgstr "روماني"
+
+#: ../gnome-spell/dictionary.c:302
+#, fuzzy
+msgid "Russian"
+msgstr "روسيا"
+
+#: ../gnome-spell/dictionary.c:303
+#, fuzzy
+msgid "Kinyarwanda"
+msgstr "ض-ي|الكينيارواندية"
+
+#: ../gnome-spell/dictionary.c:304
+msgid "Sardinian"
+msgstr "السردينية"
+
+#: ../gnome-spell/dictionary.c:305
+#, fuzzy
+msgid "Sindhi"
+msgstr "هندي"
+
+#: ../gnome-spell/dictionary.c:306
+#, fuzzy
+msgid "Northern Sami"
+msgstr "السوثو الشمالي"
+
+#: ../gnome-spell/dictionary.c:307
+#, fuzzy
+msgid "Sango"
+msgstr "تانجو"
+
+#: ../gnome-spell/dictionary.c:308
+#, fuzzy
+msgid "Sinhalese"
+msgstr "سجّيل"
+
+#: ../gnome-spell/dictionary.c:309
+#, fuzzy
+msgid "Slovak"
+msgstr "سلوفاكيا"
+
+#: ../gnome-spell/dictionary.c:310
+msgid "Slovenian"
+msgstr "سلوفينية"
+
+#: ../gnome-spell/dictionary.c:311
+#, fuzzy
+msgid "Samoan"
+msgstr "سالمون"
+
+#: ../gnome-spell/dictionary.c:312
+#, fuzzy
+msgid "Shona"
+msgstr "شوناي"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "صومالي"
+
+#: ../gnome-spell/dictionary.c:314
+#, fuzzy
+msgid "Albanian"
+msgstr "ألبانيا"
+
+#: ../gnome-spell/dictionary.c:315
+#, fuzzy
+msgid "Serbian"
+msgstr "شريدان"
+
+#: ../gnome-spell/dictionary.c:316
+#, fuzzy
+msgid "Swati"
+msgstr "هجو"
+
+#: ../gnome-spell/dictionary.c:317
+#, fuzzy
+msgid "Southern Sotho"
+msgstr "السوثو الشمالي"
+
+#: ../gnome-spell/dictionary.c:318
+#, fuzzy
+msgid "Sundanese"
+msgstr "السودان"
+
+#: ../gnome-spell/dictionary.c:319
+#, fuzzy
+msgid "Swedish"
+msgstr "ا-ص|سويدي"
+
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "السواحيلية"
+
+#: ../gnome-spell/dictionary.c:321
+#, fuzzy
+msgid "Tamil"
+msgstr "ذيل"
+
+#: ../gnome-spell/dictionary.c:322
+#, fuzzy
+msgid "Telugu"
+msgstr "ا-ص|تلوجو"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "التيتومية"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "الطاجكستانية"
+
+#: ../gnome-spell/dictionary.c:325
+#, fuzzy
+msgid "Thai"
+msgstr "الطّائف"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "التيجرينياوية"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "التركمانية"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "توكيلاو"
+
+#: ../gnome-spell/dictionary.c:329
+#, fuzzy
+msgid "Tagalog"
+msgstr "فهرس"
+
+#: ../gnome-spell/dictionary.c:330
+#, fuzzy
+msgid "Tswana"
+msgstr "تاكنا"
+
+#: ../gnome-spell/dictionary.c:331
+#, fuzzy
+msgid "Tonga"
+msgstr "تانغا"
+
+#: ../gnome-spell/dictionary.c:332
+#, fuzzy
+msgid "Tok Pisin"
+msgstr "الحشو الأعلى"
+
+#: ../gnome-spell/dictionary.c:333
+#, fuzzy
+msgid "Turkish"
+msgstr "ا-ص|تركي"
+
+#: ../gnome-spell/dictionary.c:334
+#, fuzzy
+msgid "Tsonga"
+msgstr "تسابونغ"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "التتارية"
+
+#: ../gnome-spell/dictionary.c:336
+#, fuzzy
+msgid "Twi"
+msgstr "تلميحة"
+
+#: ../gnome-spell/dictionary.c:337
+#, fuzzy
+msgid "Tahitian"
+msgstr "تاهيتي-فا"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "الأيغورية"
+
+#: ../gnome-spell/dictionary.c:339
+#, fuzzy
+msgid "Ukrainian"
+msgstr "ا-ص|اكراني"
+
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "الأردية"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "الأزبكية"
+
+#: ../gnome-spell/dictionary.c:342
+#, fuzzy
+msgid "Venda"
+msgstr "end"
+
+#: ../gnome-spell/dictionary.c:343
+#, fuzzy
+msgid "Vietnamese"
+msgstr "ض-ي|فيتنامي"
+
+#: ../gnome-spell/dictionary.c:344
+#, fuzzy
+msgid "Walloon"
+msgstr "ض-ي|والوني"
+
+#: ../gnome-spell/dictionary.c:345
+#, fuzzy
+msgid "Wolof"
+msgstr "جولف"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "الزوشاوية"
+
+#: ../gnome-spell/dictionary.c:347
+msgid "Yiddish"
+msgstr "اليديشية"
+
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "اليوروباوية"
+
+#: ../gnome-spell/dictionary.c:349
+#, fuzzy
+msgid "Zhuang"
+msgstr "جيجيانغ"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "صّينيّ"
+
+#: ../gnome-spell/dictionary.c:351
+#, fuzzy
+msgid "Zulu"
+msgstr "الزولو"
+
+#: ../gnome-spell/spell-checker.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../gnome-spell/spell-checker.glade.h:2
+#, fuzzy
+msgid "Add to dictionary"
+msgstr "إضافة كلمة إلى القاموس"
+
+#: ../gnome-spell/spell-checker.glade.h:3
+#, fuzzy
+msgid "Checked word"
+msgstr "دقق الك_لمة"
+
+#: ../gnome-spell/spell-checker.glade.h:4
+#, fuzzy
+msgid "D_ictionaries"
+msgstr "قواميس"
+
+#: ../gnome-spell/spell-checker.glade.h:5
+#, fuzzy
+msgid "Describe _all"
+msgstr "ارف_ض الكل"
+
+#: ../gnome-spell/spell-checker.glade.h:6
+msgid "Ignore"
+msgstr "تجاهل"
+
+#: ../gnome-spell/spell-checker.glade.h:7
+#, fuzzy
+msgid "Remember"
+msgstr "ديسمبر"
+
+#: ../gnome-spell/spell-checker.glade.h:8
+#, fuzzy
+msgid "Replace"
+msgstr "المبدل"
+
+#: ../gnome-spell/spell-checker.glade.h:10
+#, fuzzy
+msgid "_Add word"
+msgstr "أضِف _كلمة"
+
+#: ../gnome-spell/spell-checker.glade.h:11
+msgid "_Back"
+msgstr "_خلف"
+
+#: ../gnome-spell/spell-checker.glade.h:12
+#, fuzzy
+msgid "_Describe"
+msgstr "وصف من طرف"
+
+#: ../gnome-spell/spell-checker.glade.h:13
+#, fuzzy
+msgid "_Help"
+msgstr "مساعدة"
+
+#: ../gnome-spell/spell-checker.glade.h:14
+#, fuzzy
+msgid "_Ignore"
+msgstr "تجاهل"
+
+#: ../gnome-spell/spell-checker.glade.h:15
+#, fuzzy
+msgid "_Replace"
+msgstr "المبدل"
+
+#: ../gnome-spell/spell-checker.glade.h:16
+#, fuzzy
+msgid "_Skip"
+msgstr "_تخطّي إلى:"
+
+#: ../gnome-spell/test-spell.c:39
+msgid "I could not initialize Bonobo"
+msgstr "لم أتمكن من تفعيل بونوبو"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ca.po gnome-spell-1.0.8/po/ca.po
--- gnome-spell-1.0.7/po/ca.po	2006-01-07 12:27:34.000000000 +0000
+++ gnome-spell-1.0.8/po/ca.po	2007-01-01 22:18:09.000000000 +0000
@@ -2,240 +2,898 @@
 # Copyright (C) 2004, 2006 The Free Ssoftware Foundation, Inc.
 # This file is distributed under the same license as the gnome-spell package.
 # Xavier Conde Rueda <xavi.conde@gmail.com>, 2004, 2006.
+# Gil Forcada <gilforcada@guifi.net>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-07 13:22+0100\n"
-"PO-Revision-Date: 2006-01-07 13:27+0100\n"
-"Last-Translator: Xavier Conde Rueda <xavi.conde@gmail.com>\n"
+"POT-Creation-Date: 2006-10-10 01:25+0200\n"
+"PO-Revision-Date: 2006-10-10 01:40+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
-msgstr "_Suggiments per a '%s'"
+msgstr "_Suggiments per a «%s»"
 
 # 
-#: ../gnome-spell/control.c:334 ../gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Suggeriments"
 
-#: ../gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "No s'ha pogut carregar el fitxer glade."
 
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amhàric"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Àrab"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamès"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturià"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avar"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Àzeri"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Baixkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinès"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Bielorús"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Búlgar"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetà"
+
 # Mozilla 1.3->br
-#: ../gnome-spell/dictionary.c:148
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Bretó"
 
+# Mozilla 1.3->ro
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnià"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Català"
 
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Txetxè"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukès"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Cors"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Txec"
 
-# Mozilla 1.3->cy
-#: ../gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Caixubi"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Gal·lès"
 
-# Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Danès"
 
-# Projecte_Mandrake [abiword-ca.po]
-#: ../gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "Alemany (Àustria)"
 
-# Projecte_Mandrake [abiword-ca.po]
-#: ../gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Alemany (Alemanya)"
 
-# Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Alemany (Suïssa)"
 
-# Netscape_4.7->String:RESDLL.DLL
-#: ../gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grec"
 
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
-msgstr "Anglès (americà)"
+msgstr "Anglès (Americà)"
 
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
-msgstr "Anglès (britànic)"
+msgstr "Anglès (Britànic)"
 
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
-msgstr "Anglès (canadenc)"
+msgstr "Anglès (Canadenc)"
 
 # Mozilla 1.3->eo
-#: ../gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Castellà"
 
+# Mozilla 1.3->ro
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estonià"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basc"
+
+# Gnome_2.6_Desktop [gedit.HEAD.ca.po]
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulah"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finès"
 
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fijià"
+
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Faroès"
 
 # Projecte_Mandrake [abiword-ca.po]
-#: ../gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Francès (França)"
 
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Francès (Suïssa)"
 
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friülès"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frisó"
+
 # Mozilla 1.3->ga
-#: ../gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Irlandès"
 
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Gal·lès d'Escòcia"
+
 # Mozilla 1.3->gl
-#: ../gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Gallec"
 
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guaraní"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Gal·lès Manx"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausa"
+
+# Mozilla 1.3->gl
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaià"
+
 # Mozilla 1.3->he
-#: ../gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Hebreu"
 
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligayà"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Croat"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Alt Sòrab"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haití Creole"
+
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Hongarès"
 
-# Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italià"
+# Mozilla 1.3->ro
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armeni"
+
+# Mozilla 1.3->he
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesi"
+
+# Netscape_4.7->Dialog Box Control:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+# Mozilla 1.3->lt
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Sichuan Yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
 
 # Mozilla 1.3->is
-#: ../gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Islandès"
 
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italià"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japonès"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanès"
+
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgià"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Kalaallisut / Greenlandès"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada"
+
+# Netscape_4.7->String:EDITOR32.DLL
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Coreà"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+# Netscape_4.7->String:RESDLL.DLL
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurd"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+# Mozilla 1.3->ga
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Còrnic"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirghiz"
+
 # Mozilla 1.3->la
-#: ../gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Llatí"
 
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxemburguès"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ganda"
+
 # Mozilla 1.3->lt
-#: ../gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburguès"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+# Mozilla 1.3->lt
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: ../gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+# Mozilla 1.3->la
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Letó"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagaix"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshallès"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedoni"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongol"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldau"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malai"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltès"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmès"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "Noruec (Bokmål)"
 
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Ndebele del Nord"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Baix alemany"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepalès"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niueà"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Holandès"
 
-#: ../gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Noruec (Nyorsk)"
 
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Noruec"
 
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Ndebele del Sud"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Sotho septentrional"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navajo"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Nyanja/Chichewa"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occità"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Osset"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polonès"
 
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pushto"
+
 # Projecte_Mandrake [abiword-ca.po]
-#: ../gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portuguès (Portugal)"
 
 # Gnome_2.6_Desktop [gedit.HEAD.ca.po]
-#: ../gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguès (Brasil)"
 
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quítxua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotangà"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
 # Mozilla 1.3->ro
-#: ../gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Romanès"
 
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Rus"
 
-#: ../gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Sard"
 
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Sami septentrional"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Sinhalès"
+
 # Mozilla 1.3->sk
-#: ../gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Eslovac"
 
 # Mozilla 1.3->sl
-#: ../gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Eslovè"
 
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoà"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+# Mozilla 1.3->ro
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanès"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbi"
+
+# Mozilla 1.3->la
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Sotho del Sud"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sundanès"
+
 # Netscape_4.7->String:EDITOR32.DLL
-#: ../gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Suec"
 
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Suahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tàmil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tajik"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Tai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrinya"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turcman"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagàlog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok Pisin"
+
 # Netscape_4.7->String:RESDLL.DLL
-#: ../gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Turc"
 
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+# Mozilla 1.3->gl
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahití"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uighur"
+
 # Mozilla 1.3->chardet.ukprob.title
-#: ../gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdú"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Uzbekistà"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Való"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
 # Mozilla 1.3->ji
-#: ../gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "Jiddisch"
 
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Xinès"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
 # Mozilla 1.3->allFilter
 #: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
@@ -243,7 +901,7 @@
 
 #: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
-msgstr "Afegeix al diccionari"
+msgstr "Afegeix-la al diccionari"
 
 #: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
@@ -260,50 +918,43 @@
 # Netscape_4.7->Dialog Box Control:EDITOR32.DLL
 #: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
-msgstr "Ignora"
+msgstr "Ignora-la"
 
 #: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
-msgstr "Recorda"
+msgstr "Recorda-la"
 
-# Netscape_4.7->Dialog Box Control:RESDLL.DLL
 #: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
-msgstr "Reemplaça"
+msgstr "Reemplaça-la"
 
 #: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Afegeix la paraula"
 
-# Projecte_Fedora [firstboot.ca.po]
 #: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Endarrere"
 
 #: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
-msgstr "_Descriu"
+msgstr "_Descriu-la"
 
-# Projecte_Fedora [redhat-config-users.ca.po]
 #: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
-msgstr "_Ajuda"
+msgstr "A_juda"
 
-# Netscape_4.7->Dialog Box Control:EDITOR32.DLL
-# Gnome_2.6_Desktop [gnopernicus.HEAD.ca.po]
 #: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
-msgstr "_Ignora"
+msgstr "_Ignora-la"
 
-# Gnome_2.6_Desktop [nautilus.HEAD.ca.po]
 #: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
-msgstr "_Reemplaça"
+msgstr "_Reemplaça-la"
 
-# Gnome_2.6_Fifth_Toe [sound-juicer.HEAD.ca.po]
 #: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
-msgstr "_Omet"
+msgstr "_Omet-la"
 
 #: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ChangeLog gnome-spell-1.0.8/po/ChangeLog
--- gnome-spell-1.0.7/po/ChangeLog	2006-02-09 19:12:01.000000000 +0000
+++ gnome-spell-1.0.8/po/ChangeLog	2007-09-03 07:42:15.000000000 +0000
@@ -1,3 +1,100 @@
+2007-08-01  Raivis Dejus  <orvils@gmail.com>
+
+        * lv.po: Updated Latvian Translation.
+
+2007-04-22  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2007-02-12  Matic Zgur <mr.zgur@gmail.com>
+
+	* sl.po: Added Slovenian translation.
+
+2006-12-15  Pema Geyleg  <pgeyleg@gmail.com>
+
+	* dz.po: Added Dzongkha Translation.
+	* LINGUAS: Added dz.
+
+2006-11-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Added Arabic Translation.
+	* LINGUAS: Added ar.
+
+2006-10-21  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2006-10-14  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-10-10  Josep Puigdemont i Casamajó  <josep.puigdemont@gmail.com>
+
+	* ca.po: Updated Catalan translation by
+	Gil Forcada <gilforcada@guifi.net>.
+
+2006-10-08  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-09-26  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-09-25  Pawan Chitrakar  <pchitrakar@gmail.com>
+
+	* ne.po: Updated Nepali Translation
+
+2006-09-16  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-09-12  David Lodge <dave@cirt.net>
+
+	* en_GB.po: British (English) translation updated.
+
+2006-08-26  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation from
+	Jonathan Ernst <jonathan@ernstfamily.ch>.
+
+2006-08-23  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation added by Ivar Smolin.
+
+2006-07-28  Francisco Javier F. Serrador  <serrador@openshine.com>
+
+	* es.po: Updated Spanish translation.
+
+2006-07-13  Roman Kalashnikov <cargo200@gmail.com>
+
+	* ru.po: Updated Russian translation.
+
+2006-04-17  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated.
+
+2006-04-16  Daniel Nylander  <po@danielnylander.se>
+
+        * sv.po: Updated Swedish translation.
+	
+2006-04-15  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2006-04-11  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2006-02-25  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2006-02-17  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+	* no.po: Same.
+
 2006-02-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/dz.po gnome-spell-1.0.8/po/dz.po
--- gnome-spell-1.0.7/po/dz.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-spell-1.0.8/po/dz.po	2007-01-01 22:18:09.000000000 +0000
@@ -0,0 +1,910 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: spell\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-01 03:50+0100\n"
+"PO-Revision-Date: 2006-11-02 04:34+0530\n"
+"Last-Translator: yangka <yanang_ka@hotmail.com>\n"
+"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2;plural=(n!=1);\n"
+"X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: BHUTAN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../gnome-spell/control.c:232
+#, c-format
+msgid "_Suggestions for '%s'"
+msgstr "དོན་ལུ་བསམ་འཆར་ཚུ '%s' (_S)"
+
+#: ../gnome-spell/control.c:335
+#: ../gnome-spell/spell-checker.glade.h:9
+msgid "Suggestions"
+msgstr "བསམ་འཆར་ཚུ།"
+
+#: ../gnome-spell/control.c:415
+msgid "Could not load glade file."
+msgstr "གེལེཌི་ཡིག་སྣོད་མངོན་གསལ་འབད་མ་ཚུགསཔ།"
+
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "ཨ་ཕར།"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "ཨཕ་རི་ཀཱནསི།"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "ཨ་ཀཱན།"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "ཨམ་ཧ་རིཀ།"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "ཨ་ར་བིཀ།"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "ཨས་ས་མི་སི།"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "ཨསི་ཊི་རི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "ཨ་བར།"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "ཨེའི་མ་ར།"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "ཨ་ཛར་བའི་ཇ་ནི།"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "བཱཤི་ཀིར།"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "བཱ་ལིན་སི།"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "བེ་ལ་རུ་སི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "བིམ་བཱ།"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "བཱལ་ག་རི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "བི་ཧ་རི།"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "བའི་སི་ལ་མ།"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "བེམ་བ་ར།"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "བེང་ག་ལི།"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "ཊི་བེ་ཊཱན།"
+
+#: ../gnome-spell/dictionary.c:170
+msgid "Breton"
+msgstr "བིརི་ཊཱོན"
+
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "བོསོ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:172
+msgid "Catalan"
+msgstr "ཀེ་ཊེ་ལཱན།"
+
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "ཅི་ཅེན།"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "སི་བིའུ་ནོ།"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "ཅ་མོ་རོ།"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "ཅུའུ་ཀི་སི།"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "ཀོར་སི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:178
+msgid "Czech"
+msgstr "ཅེཛི།"
+
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "ཀཱཤིའུ་བེ་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "ཆུ་ཝེཤི།"
+
+#: ../gnome-spell/dictionary.c:181
+msgid "Welsh"
+msgstr "ཝེལཤི།"
+
+#: ../gnome-spell/dictionary.c:182
+msgid "Danish"
+msgstr "ཌེ་ནིཤ།"
+
+#: ../gnome-spell/dictionary.c:183
+msgid "German (Austria)"
+msgstr "ཇར་མཱན།(ཨཱསི་ཊི་ཡ)"
+
+#: ../gnome-spell/dictionary.c:184
+msgid "German (Germany)"
+msgstr "ཇར་མཱན།(ཇར་མ་ནི)"
+
+#: ../gnome-spell/dictionary.c:185
+msgid "German (Swiss)"
+msgstr "ཇར་མཱན།(སུའིསི)"
+
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "ཨི་ཝི།"
+
+#: ../gnome-spell/dictionary.c:187
+msgid "Greek"
+msgstr "གིརིཀ།"
+
+#: ../gnome-spell/dictionary.c:188
+msgid "English (American)"
+msgstr "ཨིང་ལིཤ།(ཨ་མི་རི་ཀཱན)"
+
+#: ../gnome-spell/dictionary.c:189
+msgid "English (British)"
+msgstr "ཨིང་ལིཤ།(བིརི་ཊིཤ)"
+
+#: ../gnome-spell/dictionary.c:190
+msgid "English (Canadian)"
+msgstr "ཨིང་ལིཤ།(ཀེ་ནེ་ཌི་ཡཱན)"
+
+#: ../gnome-spell/dictionary.c:191
+msgid "Esperanto"
+msgstr "ཨིསི་པེ་རེན་ཊོ།"
+
+#: ../gnome-spell/dictionary.c:192
+msgid "Spanish"
+msgstr "སིཔེ་ནིཤི།"
+
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "ཨིསི་ཊོ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "བཱགསིཀ།"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "ཕར་སི།"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "ཕུ་ལ་ཧ།"
+
+#: ../gnome-spell/dictionary.c:197
+msgid "Finnish"
+msgstr "ཕིན་ནིཤ།"
+
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "ཕའི་ཇི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:199
+msgid "Faroese"
+msgstr "ཕེ་རོ་སི།"
+
+#: ../gnome-spell/dictionary.c:200
+msgid "French (France)"
+msgstr "ཕིརེནཆི།(ཕརཱནསི)"
+
+#: ../gnome-spell/dictionary.c:201
+msgid "French (Swiss)"
+msgstr "ཕིརེནཆི(སུའིསི)"
+
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "ཕི་རིའུ་ལེ་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "ཕི་རི་སི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:204
+msgid "Irish"
+msgstr "ཨའི་རིཤ།"
+
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "སིཀོ་ཊིཤ་གེ་ལིཀ།"
+
+#: ../gnome-spell/dictionary.c:206
+msgid "Galician"
+msgstr "གེ་ལི་ཤི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "གཱའུ་ར་ནི།"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "གུ་ཇ་ར་ཏི།"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "མེ་ནགསི་གེ་ལིཀ།"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "ཧའུ་ས།"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "ཧ་ཝའི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:212
+msgid "Hebrew"
+msgstr "ཧེ་བིརིའུ།"
+
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "ཧིན་དི།"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "ཧི་ལི་གེ་ནོན།"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "ཧི་རི་མོ་ཊུ།"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "ཀོརོ་ཤི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "ལྟག་གི་སོར་བི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "ཧའི་ཊའི་ཡཱན་སི་རི་ལི།"
+
+#: ../gnome-spell/dictionary.c:219
+msgid "Hungarian"
+msgstr "ཧང་ག་རི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "ཨར་མི་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "ཧི་རི་རོ།"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "བར་སྐད།"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "ཨའི་བཱན།"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "ཨིན་ཌོ་ནེ་ཤི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "ཨིཀ་བོ།"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "སའི་ཅུན་ཡཱན་ཡིད།"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "ཨའི་ལོ་ཀོ།"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "ཨའི་དོ།"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "ཨའིསི་ལེན་ཌིཀ།"
+
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "ཨི་ཊ་ལི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "ཇ་པ་ནིསི།"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "ཇ་བ་ནི་སི།"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "ཇིའོར་ཇི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "ཀཱ་ཅིན།"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "ཀོང་གོ།"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "ཀ་ཧཱ་སི།"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "ཀི་ཀུ་ཡུ།"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "ཀ་ཝན་ཡ་མ།"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "ཀ་ཛཀ།"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "ཀཱ་ལ་ལི་སི་ཊི/གི་རིན་ལེན་ཌིཀ།"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "ཁེ་མར།"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "ཀཱན་ན་ད།"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "ཀོ་རི་ཡའི།"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "ཀོན་ཀཱ་ནི"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "ཀཱ་ནུ་རི།"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "ཀཤི་མི་རི།"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "ཀར་ཌིཤ།"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "ཀོ་མི།"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "ཀོར་ནིཤི།"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "ཀིར་ཇི་ཧིཇི།"
+
+#: ../gnome-spell/dictionary.c:251
+msgid "Latin"
+msgstr "ལེ་ཊིན།"
+
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "ལུགསི་བོ་འུར་གིཤི།"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "གེན་ཌ།"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "ལིམ་བུར་ཇི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "ལིང་ག་ལ།"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "ལའོ།"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "ལོ་ཛི།"
+
+#: ../gnome-spell/dictionary.c:258
+msgid "Lithuanian"
+msgstr "ལི་ཐུ་འ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "ལུ་བཱ་-ཀཱ་ཏའང་ག"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "ལཱའོ།"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "ལེཊི་བི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "མ་ལ་ག་སེ།"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "མར་ཤལ་ལི་སི།"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "མའོ་རི།"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "མིའི་ནང་ཀཱ་བུཀ།"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "མ་ལ་ཡ་ལམ།"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "མོང་གོ་ལི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "མོལ་ཌ་ཝི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "མ་ར་ཐི།"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "མ་ལེ།"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "མཱལ་ཊི་སི།"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "བར་མི་སི།"
+
+#: ../gnome-spell/dictionary.c:274
+msgid "Norwegian (Bokmal)"
+msgstr "ནོར་ཝེ་ཇི་ཡཱན། (བོག་མཱལ)"
+
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "བྱང་་ནཌི་བི་ལི།"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "སེགསི་ཨོན་དམའ་བ།"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "ནེ་པ་ལི།"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "ནཌི་འང་ག།"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "ནའི་ཡུ་ཨིན།"
+
+#: ../gnome-spell/dictionary.c:280
+msgid "Dutch"
+msgstr "ཌཆ།"
+
+#: ../gnome-spell/dictionary.c:281
+msgid "Norwegian (Nyorsk)"
+msgstr "ནོར་ཝེ་ཇི་ཡཱན། (ནི་ནོརསིཀ)"
+
+#: ../gnome-spell/dictionary.c:282
+msgid "Norwegian"
+msgstr "ནོར་ཝེ་ཇི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "ལྷོ་ནཌི་བི་ལི།"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "བྱང་སོ་ཐོ།"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "ནཱ་ཝཱ་ཇོ།"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "ནི་ཡཱན་ཇ/ཅིའི་ཅི་ཝ།"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "ཨོ་སི་སིའི་ཏི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "ཨོ་རོ་མོ།"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "ཨོ་རི་ཡ།"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "ཨོ་སི་སི་ཊིཀ།"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "པན་ཇཱ་བི།"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "པཱམ་པཱའང་ག།"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "པཱ་པའི་མིན་ཊོ།"
+
+#: ../gnome-spell/dictionary.c:294
+msgid "Polish"
+msgstr "པོ་ལིཤ།"
+
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "པུཤི་ཏུ།"
+
+#: ../gnome-spell/dictionary.c:296
+msgid "Portuguese (Portugal)"
+msgstr "པོར་ཊུ་གིསི། (པོར་ཊུ་གཱལ)"
+
+#: ../gnome-spell/dictionary.c:297
+msgid "Portuguese (Brazilian)"
+msgstr "པོར་ཊུ་གེསི (བ་ར་ཛི་ལི་ཡཱན)"
+
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "ཀིའུ་ཅི་འ།"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "རཱ་རོ་ཏོང་གེན།"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "རུན་ཌ་ཡེ།"
+
+#: ../gnome-spell/dictionary.c:301
+msgid "Romanian"
+msgstr "རོ་མ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:302
+msgid "Russian"
+msgstr "ར་ཤི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "ཀིན་ཡར་ཝན་ཌ།"
+
+#: ../gnome-spell/dictionary.c:304
+msgid "Sardinian"
+msgstr "སར་དི་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "སིན་དི་ཧི།"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "བྱང་ཕྱོགས་ཀྱི་སི་འ་མི།"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "སི་འང་གོ།"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "སིན་ཧ་་ལིསི།"
+
+#: ../gnome-spell/dictionary.c:309
+msgid "Slovak"
+msgstr "སོལོ་བཱཀ།"
+
+#: ../gnome-spell/dictionary.c:310
+msgid "Slovenian"
+msgstr "སོལོ་བཱཀ་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "སིའ་མོན།"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "སི་ཧོ་ན།"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "སོ་མ་ལི།"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "ཨཱལ་བཱ་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "སར་བི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "སི་ཝ་ཊི།"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "ལྷོ་ཕྱོགས་ཀྱི་སོ་ཐོ།"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "སཱན་ཌེནསི།"
+
+#: ../gnome-spell/dictionary.c:319
+msgid "Swedish"
+msgstr "སུའི་ཌིཤི།"
+
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "ས་ཝ་ཧི་ལི།"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "ཏ་མིལ།"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "ཏེ་ལུ་གུ།"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "ཊི་ཊམ།"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "ཏ་ཇི་ཀི།"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "ཐཱའི།"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "ཊི་ཇི་རིན་ཡ།"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "ཊརཀ་མི་ནི།"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "ཊོ་ཀི་ལའོ།"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "ཏ་ག་ལོག"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "ཙ་ཝ་ན།"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "ཊོང་ག"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "ཊོཀ་པི་སིན།"
+
+#: ../gnome-spell/dictionary.c:333
+msgid "Turkish"
+msgstr "ཊར་ཀིཤི།"
+
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "ཚོང་ག"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "ཊཱ་ཊར།"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "ཊི་ཝི།"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "ཏཱ་ཧི་ཊི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "ཡུའི་ཇི་ཧུར།"
+
+#: ../gnome-spell/dictionary.c:339
+msgid "Ukrainian"
+msgstr "ཡུཀ་རའི་ནི་ཡཱན།"
+
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "ཨུར་དུ།"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "ཡུ་ཛི་བིཀ།"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "ཝིན་ད།"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "ཝེཊི་ན་མིསི།"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "ཝེལ་ལཱུན།"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "ཝོལ་ལོཕ།"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "ཨེགསི་ཧོ་ས།"
+
+#: ../gnome-spell/dictionary.c:347
+msgid "Yiddish"
+msgstr "ཡིད་དིཤ།"
+
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "ཡོ་རུབ་བཱ།"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "ཛོང་འང་།"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "རྒྱ་ནག་གི།"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "ཛུ་ལུ།"
+
+#: ../gnome-spell/spell-checker.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../gnome-spell/spell-checker.glade.h:2
+msgid "Add to dictionary"
+msgstr "སྣོད་ཐོ་ལུ་ཁ་སྐོང་།"
+
+#: ../gnome-spell/spell-checker.glade.h:3
+msgid "Checked word"
+msgstr "ཞིབ་དཔྱད་འབད་ཡོད་མི་མིང་ཚིག"
+
+#: ../gnome-spell/spell-checker.glade.h:4
+msgid "D_ictionaries"
+msgstr "སྣོད་ཐོ་ཚུ།(_i)"
+
+#: ../gnome-spell/spell-checker.glade.h:5
+msgid "Describe _all"
+msgstr "ཆ་མཉམ་འགྲེལ་བཤད་རྐྱབས།(_a)"
+
+#: ../gnome-spell/spell-checker.glade.h:6
+msgid "Ignore"
+msgstr "སྣང་མེད་བཞག"
+
+#: ../gnome-spell/spell-checker.glade.h:7
+msgid "Remember"
+msgstr "སེམས་ཁར་བཞག"
+
+#: ../gnome-spell/spell-checker.glade.h:8
+msgid "Replace"
+msgstr "ཚབ་བཙུགས།"
+
+#: ../gnome-spell/spell-checker.glade.h:10
+msgid "_Add word"
+msgstr "མིང་ཚིག་ཁ་སྐོང་རྐྱབས།(_A)"
+
+#: ../gnome-spell/spell-checker.glade.h:11
+msgid "_Back"
+msgstr "རྒྱབ།(_B)"
+
+#: ../gnome-spell/spell-checker.glade.h:12
+msgid "_Describe"
+msgstr "འགྲེལ་བཤད།(_D)"
+
+#: ../gnome-spell/spell-checker.glade.h:13
+msgid "_Help"
+msgstr "གྲོགས་རམ།(_H)"
+
+#: ../gnome-spell/spell-checker.glade.h:14
+msgid "_Ignore"
+msgstr "སྣང་མེད་བཞག(_I)"
+
+#: ../gnome-spell/spell-checker.glade.h:15
+msgid "_Replace"
+msgstr "ཚབ་བཙུགས།(_R)"
+
+#: ../gnome-spell/spell-checker.glade.h:16
+msgid "_Skip"
+msgstr "གོམ་འགྱོ།(_S)"
+
+#: ../gnome-spell/test-spell.c:39
+msgid "I could not initialize Bonobo"
+msgstr "ང་གིས་བོ་ནོ་བོ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/en_GB.po gnome-spell-1.0.8/po/en_GB.po
--- gnome-spell-1.0.7/po/en_GB.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/en_GB.po	2007-01-01 22:18:09.000000000 +0000
@@ -7,255 +7,900 @@
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-10-05 23:50+0100\n"
+"POT-Creation-Date: 2006-09-12 07:02+0100\n"
+"PO-Revision-Date: 2006-09-12 07:04-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "_Suggestions for '%s'"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335
+#: ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Suggestions"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Could not load glade file."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amharic"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamese"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturian"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avar"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbaijani"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Bashkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinese"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Belarusian"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetan"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Breton"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnian"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Catalan"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Chechen"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukese"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Corsican"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Czech"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kashubian"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Welsh"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Danish"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "German (Austria)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "German (Germany)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "German (Swiss)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Greek"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "English (American)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "English (British)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "English (Canadian)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spanish"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estonian"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basque"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulah"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finnish"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fijian"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Faroese"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "French (France)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "French (Swiss)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friulian"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frisian"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Irish"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Scottish Gaelic"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Galician"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manx Gaelic"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaiian"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Upper Sorbian"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haitian Creole"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italian"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armenian"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesian"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Sichuan Yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Icelandic"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italian"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanese"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Kalaallisut / Greenlandic"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Korean"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurdish"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornish"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirghiz"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latin"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxembourgish"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgian"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Latvian"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagasy"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshallese"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongolian"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldavian"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malay"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltese"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmese"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "Norwegian (Bokmal)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "North Ndebele"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Low Saxon"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niuean"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Dutch"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Norwegian (Nyorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "South Ndebele"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Northern Sotho"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navajo"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Nyanja/Chichewa"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Ossetic"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polish"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pushto"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portuguese (Portugal)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quechua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotongan"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Romanian"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Russian"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Sardinian"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Northern Sami"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Sinhalese"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slovak"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoan"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanian"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbian"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Southern Sotho"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sundanese"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Swedish"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tajik"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrinya"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmen"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok Pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Turkish"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahitian"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uighur"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Uzbek"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Walloon"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "Yiddish"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Chinese"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Add to dictionary"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Checked word"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "D_ictionaries"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Describe _all"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignore"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Remember"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Replace"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Add word"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Back"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Describe"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Help"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignore"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Replace"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Skip"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "I could not initialise Bonobo"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/es.po gnome-spell-1.0.8/po/es.po
--- gnome-spell-1.0.7/po/es.po	2006-02-09 19:12:01.000000000 +0000
+++ gnome-spell-1.0.8/po/es.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,26 +1,25 @@
 # translation of es.po to Spanish
-# translation of gnome-spell.HEAD.po to Spanish
 # Gnome-spell's Spanish translation.
-# Copyright © 2001-2003 Free Software Foundation, Inc.
+# Copyright © 2001-2003, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-spell package.
+#
 # Raúl Miró <cotin@geocities.com>, 2001.
 # Ismael Olea <ismael@olea.org>, 2001.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>, 2002-2003.
 # Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2006.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-02-09 20:10+0100\n"
-"PO-Revision-Date: 2006-02-06 18:59+0100\n"
+"PO-Revision-Date: 2006-07-28 01:14+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../gnome-spell/control.c:232
@@ -893,7 +892,7 @@
 
 #: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
-msgstr "A_yuda"
+msgstr "Ay_uda"
 
 #: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
@@ -910,3 +909,4 @@
 #: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/et.po gnome-spell-1.0.8/po/et.po
--- gnome-spell-1.0.7/po/et.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-spell-1.0.8/po/et.po	2007-01-01 22:18:09.000000000 +0000
@@ -0,0 +1,909 @@
+# GNOME õigekirjakontrollija eesti keele tõlge.
+# Estonian translation of GNOME spell.
+#
+# Copyright (C) 2006, The Gnome Project.
+# This file is distributed under the same license as the gnome-spell package.
+#
+# Ivar Smolin <okul@linux.ee>, 2006.
+# Priit Laes <amd@store20.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-spell HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-23 03:54+0200\n"
+"PO-Revision-Date: 2006-10-13 21:55+0300\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"Language-Team: Estonian <gnome-et@linux.ee>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../gnome-spell/control.c:232
+#, c-format
+msgid "_Suggestions for '%s'"
+msgstr "S_oovitused sõnale '%s'"
+
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
+msgid "Suggestions"
+msgstr "Soovitused"
+
+#: ../gnome-spell/control.c:415
+msgid "Could not load glade file."
+msgstr "Glade faili pole võimalik avada."
+
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afari"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaani"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amhari"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Araabia"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assami"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avaari"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aimara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Aserbaidžaani"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Baškiiri"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Bali"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Valgevene"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgaaria"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihaari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tiibeti"
+
+#: ../gnome-spell/dictionary.c:170
+msgid "Breton"
+msgstr "Bretooni"
+
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnia"
+
+#: ../gnome-spell/dictionary.c:172
+msgid "Catalan"
+msgstr "Katalaani"
+
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Tšetšeeni"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Tšamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Tšuugi"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Korsika"
+
+#: ../gnome-spell/dictionary.c:178
+msgid "Czech"
+msgstr "Tšehhi"
+
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kašuubi"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Tšuvaši"
+
+#: ../gnome-spell/dictionary.c:181
+msgid "Welsh"
+msgstr "Uelsi"
+
+#: ../gnome-spell/dictionary.c:182
+msgid "Danish"
+msgstr "Taani"
+
+#: ../gnome-spell/dictionary.c:183
+msgid "German (Austria)"
+msgstr "Saksa (Austria)"
+
+#: ../gnome-spell/dictionary.c:184
+msgid "German (Germany)"
+msgstr "Saksa (Saksamaa)"
+
+#: ../gnome-spell/dictionary.c:185
+msgid "German (Swiss)"
+msgstr "Saksa (Šveitsi)"
+
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Eve"
+
+#: ../gnome-spell/dictionary.c:187
+msgid "Greek"
+msgstr "Kreeka"
+
+#: ../gnome-spell/dictionary.c:188
+msgid "English (American)"
+msgstr "Inglise (Ameerika)"
+
+#: ../gnome-spell/dictionary.c:189
+msgid "English (British)"
+msgstr "Inglise (Briti)"
+
+#: ../gnome-spell/dictionary.c:190
+msgid "English (Canadian)"
+msgstr "Inglise (Kanada)"
+
+#: ../gnome-spell/dictionary.c:191
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../gnome-spell/dictionary.c:192
+msgid "Spanish"
+msgstr "Hispaania"
+
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Eesti"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Baski"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulbe"
+
+#: ../gnome-spell/dictionary.c:197
+msgid "Finnish"
+msgstr "Soome"
+
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Friisi"
+
+#: ../gnome-spell/dictionary.c:199
+msgid "Faroese"
+msgstr "Fääri"
+
+#: ../gnome-spell/dictionary.c:200
+msgid "French (France)"
+msgstr "Prantsuse (Prantsusmaa)"
+
+#: ../gnome-spell/dictionary.c:201
+msgid "French (Swiss)"
+msgstr "Prantsuse (Šveitsi)"
+
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friuuli"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Friisi"
+
+#: ../gnome-spell/dictionary.c:204
+msgid "Irish"
+msgstr "Iiri"
+
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Šoti gaeli"
+
+#: ../gnome-spell/dictionary.c:206
+msgid "Galician"
+msgstr "Galeegi"
+
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guaranii"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gudžarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Mänksi gaeli"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:212
+msgid "Hebrew"
+msgstr "Heebrea"
+
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+# M
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Horvaatia"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Ülemsorbi"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haitikreooli"
+
+#: ../gnome-spell/dictionary.c:219
+msgid "Hungarian"
+msgstr "Ungari"
+
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armeenia"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indoneesia"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "Islandi"
+
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Itaalia"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Jaapani"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Jaava"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Gruusia"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Katšini"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuju"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kasahhi"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmeeri"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Korea"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kašmiiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurdi"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Korni"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirgiisi"
+
+#: ../gnome-spell/dictionary.c:251
+msgid "Latin"
+msgstr "Ladina"
+
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luksembourgi"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgi"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:258
+msgid "Lithuanian"
+msgstr "Leedu"
+
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Läti"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagassi"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Maršalli"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maoori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Makedoonia"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malajalami"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongoolia"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldaavia"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malay"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Malta"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Birma"
+
+#: ../gnome-spell/dictionary.c:274
+msgid "Norwegian (Bokmal)"
+msgstr "Norra (Bokmal)"
+
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Põhja-ndebele"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Alamsaksi"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepaali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:280
+msgid "Dutch"
+msgstr "Hollandi"
+
+#: ../gnome-spell/dictionary.c:281
+msgid "Norwegian (Nyorsk)"
+msgstr "Norra (Nyorsk)"
+
+#: ../gnome-spell/dictionary.c:282
+msgid "Norwegian"
+msgstr "Norra"
+
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Lõuna-ndebele"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Põhja-sotho"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navaho"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Njandža"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Oktsitaani"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oria"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Osseedi"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Pandžabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:294
+msgid "Polish"
+msgstr "Poola"
+
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Puštu"
+
+#: ../gnome-spell/dictionary.c:296
+msgid "Portuguese (Portugal)"
+msgstr "Portugali (Portugal)"
+
+#: ../gnome-spell/dictionary.c:297
+msgid "Portuguese (Brazilian)"
+msgstr "Portugali (Brasiilia)"
+
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Ketšua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
+msgid "Romanian"
+msgstr "Rumeenia"
+
+#: ../gnome-spell/dictionary.c:302
+msgid "Russian"
+msgstr "Vene"
+
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Ruanda"
+
+#: ../gnome-spell/dictionary.c:304
+msgid "Sardinian"
+msgstr "Sardiinia"
+
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Põhja-saami"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Singaleesi"
+
+#: ../gnome-spell/dictionary.c:309
+msgid "Slovak"
+msgstr "Slovaki"
+
+#: ../gnome-spell/dictionary.c:310
+msgid "Slovenian"
+msgstr "Sloveenia"
+
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoa"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somaali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albaania"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbia"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Svaasi"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Lõuna-sotho"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sunda"
+
+#: ../gnome-spell/dictionary.c:319
+msgid "Swedish"
+msgstr "Rootsi"
+
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Suahiili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamili"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetumi"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadžiki"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Tai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrinja"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmeeni"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tsvana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:333
+msgid "Turkish"
+msgstr "Türgi"
+
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatari"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Tvii"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahiti"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uiguuri"
+
+#: ../gnome-spell/dictionary.c:339
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Usbeki"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnami"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Vallooni"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Volofi"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
+msgid "Yiddish"
+msgstr "Jidiš"
+
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuangi"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Hiina"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Suulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../gnome-spell/spell-checker.glade.h:2
+msgid "Add to dictionary"
+msgstr "Sõnastikku lisamine"
+
+#: ../gnome-spell/spell-checker.glade.h:3
+msgid "Checked word"
+msgstr "Kontrollitud sõna"
+
+#: ../gnome-spell/spell-checker.glade.h:4
+msgid "D_ictionaries"
+msgstr "Sõnast_ikud"
+
+#: ../gnome-spell/spell-checker.glade.h:5
+msgid "Describe _all"
+msgstr "Ki_rjelda kõik"
+
+#: ../gnome-spell/spell-checker.glade.h:6
+msgid "Ignore"
+msgstr "Eira"
+
+#: ../gnome-spell/spell-checker.glade.h:7
+msgid "Remember"
+msgstr "Jäta meelde"
+
+#: ../gnome-spell/spell-checker.glade.h:8
+msgid "Replace"
+msgstr "Asenda"
+
+#: ../gnome-spell/spell-checker.glade.h:10
+msgid "_Add word"
+msgstr "_Lisa sõna"
+
+#: ../gnome-spell/spell-checker.glade.h:11
+msgid "_Back"
+msgstr "_Tagasi"
+
+#: ../gnome-spell/spell-checker.glade.h:12
+msgid "_Describe"
+msgstr "_Kirjelda"
+
+#: ../gnome-spell/spell-checker.glade.h:13
+msgid "_Help"
+msgstr "_Abi"
+
+#: ../gnome-spell/spell-checker.glade.h:14
+msgid "_Ignore"
+msgstr "_Eira"
+
+#: ../gnome-spell/spell-checker.glade.h:15
+msgid "_Replace"
+msgstr "_Asenda"
+
+#: ../gnome-spell/spell-checker.glade.h:16
+msgid "_Skip"
+msgstr "_Hüppa järgmisele"
+
+#: ../gnome-spell/test-spell.c:39
+msgid "I could not initialize Bonobo"
+msgstr "Bonobo't pole võimalik lähtestada"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/fi.po gnome-spell-1.0.8/po/fi.po
--- gnome-spell-1.0.7/po/fi.po	2005-02-28 11:20:23.000000000 +0000
+++ gnome-spell-1.0.8/po/fi.po	2007-01-01 22:18:09.000000000 +0000
@@ -2,201 +2,844 @@
 # Copyright (C) 2003,2005 the Free Software Foundation, Inc.
 # Suomennos: http://gnome.fi/
 # Lauri Nurmi <lanurmi@iki.fi>, 2003.
-# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005.
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-28 13:03+0200\n"
-"PO-Revision-Date: 2005-02-28 13:22+0200\n"
+"POT-Creation-Date: 2006-04-15 19:46+0300\n"
+"PO-Revision-Date: 2006-04-15 19:50+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "_Ehdotukset sanalle \"%s\""
 
-#: ../gnome-spell/control.c:334 ../gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Ehdotukset"
 
-#: ../gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Glade-tiedostoa ei voitu ladata."
 
-#: ../gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "amhara"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "arabia"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "assami"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "asturia"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "avaari"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "aimara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "azeri"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "baškiiri"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "bali"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "valkovenäjä"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "bulgaria"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "tiibet"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "bretoni"
 
-#: ../gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "bosnia"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "tšetšeeni"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "tšamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "chuuk"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "korsika"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "kašubi"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "tšuvassi"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
-msgstr "wales"
+msgstr "kymri"
 
-#: ../gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "tanska"
 
-#: ../gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "saksa (itävallan-)"
 
-#: ../gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "saksa (saksan-)"
 
-#: ../gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "saksa (sveitsin-)"
 
-#: ../gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "englanti (amerikan-)"
 
-#: ../gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "englanti (britti-)"
 
-#: ../gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "englanti (kanadan-)"
 
-#: ../gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "eesti"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "baski"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "fulani"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "fidži"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "fääri"
 
-#: ../gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "ranska (ranskan-)"
 
-#: ../gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "ranska (sveitsin-)"
 
-#: ../gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "friuli"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "friisi"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "iiri"
 
-#: ../gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "gaeli"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "galicia"
 
-#: ../gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "manx"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "hausa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "havaiji"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "hiligaino"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "hiri-motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "kroatia"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "yläsorbi"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "haiti"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "italia"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "armenia"
 
-#: ../gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "indonesia"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "sichuanin-yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "islanti"
 
-#: ../gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "italia"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "japani"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "jaava"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "georgia"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "kikuju"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "kuanjama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "kazakki"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "kalaallisut / grönlanti"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "kannada"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "korea"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "kašmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "kurdi"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "korni"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "kirgiisi"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "latina"
 
-#: ../gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "luxemburg"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "ganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "limburg"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "luba (Katanga)"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "latvia"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "malagassi"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "marshall"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "makedonia"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "malajalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "mongolia"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "moldovia"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "malaiji"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "malta"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "burma"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "norja (kirjanorja)"
 
-#: ../gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "ndebele (pohjois-)"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "alasaksa"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "nepali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "niue"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "hollanti"
 
-#: ../gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "norja (uusnorja)"
 
-#: ../gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "ndebele (etelä-)"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "sotho (pohjois-)"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "navajo"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "njandža"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "oksitaani"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "orija"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "osseetti"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "pandžabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "papiamentu"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "puola"
 
-#: ../gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "paštu"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "portugali (portugalin-)"
 
-#: ../gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "portugali (brasilian-)"
 
-#: ../gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "ketšua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "rarotonga"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "romania"
 
-#: ../gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "ruanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "sardi"
 
-#: ../gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "saame (pohjois-)"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "sinhali"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "samoa"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "šona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "albania"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "serbia"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "swazi"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "sotho (etelä-)"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "sunda"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "tadžikki"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "thai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "tigrinja"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "turkmeen"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "tok-pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "tataari"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "tahiti"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "uiguuri"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: ../gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "uzbekki"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "vietnam"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "valloni"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "jiddiš"
 
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "joruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "kiina"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "zulu"
+
 #: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/fr.po gnome-spell-1.0.8/po/fr.po
--- gnome-spell-1.0.7/po/fr.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/fr.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,264 +1,908 @@
 # French translation of gnome-spell.
-# Copyright (C) 2001-2004 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # This file is distriibuted under the GNU General Public License version 2.
 #
-# maintainer: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2001-2004.
+# maintainer: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2001-2006.
 # Laurent RICHARD <laurent.richard@lilit.be>, 2002-2003.
 # Audrey Simons <asimons@redhat.com>, 2004.
+# Jonathan Ernst <jonathan@ernstfamily.ch>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-spell 1.0.5\n"
+"Project-Id-Version: gnome-spell 1.0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-09-03 23:19+0200\n"
-"Last-Translator: Audrey Simons <asimons@redhat.com>\n"
+"POT-Creation-Date: 2006-08-26 15:12+0200\n"
+"PO-Revision-Date: 2006-08-26 15:12+0200\n"
+"Last-Translator: Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "_Suggestions pour « %s »"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Suggestions"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Impossible de charger le fichier glade."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amharique"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamais"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturien"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avar"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbaijani"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Bachkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinais"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Biélorusse"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgare"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bichlamar"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibétain"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Breton"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnien"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Catalan"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Tchétchène"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukese"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Corse"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Tchèque"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kachoube"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Tchouvache"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Galois"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Danois"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "Allemand (Autriche)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Allemand (Allemagne)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Allemand (Suisse)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Éwé"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grec"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Anglais (États-Unis)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Anglais (Royaume-Uni)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Anglais (Canada)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estonien"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basque"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Peul"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finlandais"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fidjien"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Féroé"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Français (France)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Français (Suisse)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Frioulan"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frison"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Irlandais"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Gaélique Écossais"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Galicien"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Goudjerate"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manx Gaelic"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Haoussa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaïen"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Croate"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Serbe du haut"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haïtien; Créole haïtien"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italien"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Arménien"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonésien"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Yi de Sichuan"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Ilocano"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Icelandais"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italien"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japonais"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanais"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Géorgien"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Groenlandais"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannara"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Coréen"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanouri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurde"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornique"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirghize"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latin"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxembourgeois"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limbourgeois"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Lithuanien"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Latvian"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malgache"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshall"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macédionien"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongole"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldave"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malay"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Malte"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Birman"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "Norvégien (Bokmal)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Ndébélé du nord"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Bas Saxon :"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Népalais"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niué"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Norvégien (Nyorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Ndébélé du sud"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Sotho du nord"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navaho"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Chichewa/Nyanja"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Galla"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Ossète"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampangan"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polonais"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pachto"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugais (Portugal)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portugais (Brésil)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quecha"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotonga"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Roumain"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Russe"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Sarde"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Sami du nord"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Singhalais"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Slovénien"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoan"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanais"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbe"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Sotho du sud"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Soudanais"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Suédois"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamoul"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Télougou"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadjik"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thaï"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrigna"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmène"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Turc"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahitien"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Ouïgour"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Ourdou"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Ouzbékistan"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamien"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Wallon"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "Yiddish"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Chinois"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zoulou"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Ajouter au dictionnaire"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Mot vérifié"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "D_ictionnaires"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "_Tout décrire"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Se souvenir"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Remplacer"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "A_jouter le mot"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Retour"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Décrire"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Aide"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Sauter"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Je ne peux initialiser Bonobo"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/hu.po gnome-spell-1.0.8/po/hu.po
--- gnome-spell-1.0.7/po/hu.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/hu.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,263 +1,911 @@
 # Hungarian translation of gnome-spell.
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-spell package.
+#
 # Andras Timar <timar@gnome.hu>, 2001, 2002, 2003.
 # Laszlo Dvornik <dvornik@gnome.hu>, 2004.
-#
+# Gabor Kelemen <kelemeng@gnome.hu>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-10-09 18:57+0200\n"
-"Last-Translator: Laszlo Dvornik <dvornik@gnome.hu>\n"
+"POT-Creation-Date: 2006-10-20 05:01+0200\n"
+"PO-Revision-Date: 2006-10-21 03:37+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
-msgstr "_Javaslatok a(z) '%s' szóra"
+msgstr "_Javaslatok a(z) \"%s\" szóra"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Javaslatok"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Nem lehet betölteni a glade fájlt."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amhara"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Asszámi"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asztúri"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avar"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azeri"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Baskír"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinéz"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Belorusz"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bolgár"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Biszlama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengáli"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibeti"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Breton"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnyák"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Katalán"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Csecsen"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Csukéz"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Korzikai"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Cseh"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kasubi"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Csuvas"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
-msgstr "Velszi"
+msgstr "Walesi"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Dán"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "Német (Ausztria)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Német (Németország)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Német (Svájc)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Görög"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Angol (amerikai)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Angol (brit)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Angol (kanadai)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Észt"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Baszk"
+
+# Lásd: A világ nyelvei, Akadémiai kiadó
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Perzsa"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fula"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finn"
 
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fidzsi"
+
 # Lásd: A világ nyelvei, Akadémiai kiadó
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Färöi"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Francia (Franciaország)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Francia (Svájc)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friul"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Fríz"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Ír"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Skót kelta"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Galíciai"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gudzsarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manx kelta"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausza"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaii"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Héber"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligajnon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Horvát"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Felső szorb"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haiti kreol"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Olasz"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Örmény"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingva"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iba"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonéz"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Szecsuáni ji"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Olasz"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japán"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Jávai"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Grúz"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Kazi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazah"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Kalaallisut / Grönlandi"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Koreai"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kasmíri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurd"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornwalli"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirgiz"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latin"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxemburgi"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgi"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Litván"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Lett"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagasy"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshall-szigeteki"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedón"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malajalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongol"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldáv"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Maláj"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Máltai"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmai"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "Norvég (Bokmål)"
+msgstr "Norvég (Bokmal)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Északi Ndebele"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Délnémet"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepáli"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niuei"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Holland"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Norvég (Nynorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Déli Ndebele"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Északi Sotho"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navahó"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Nyanja/Chichewa"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Okcitán"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Orija"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Oszét"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Pandzsábi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Lengyel"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pastu"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugál (Portugália)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portugál (Brazília)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Kecsua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotongai"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Román"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Orosz"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kiruanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Szárd"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Szindi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Északi szami"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Szango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Szingaléz"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Szlovén"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Szamoai"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Szomáli"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albán"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Szerb"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Déli Sotho"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Szundanéz"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Svéd"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Szuahéli"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadzsik"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrinya"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Türkmén"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok Pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Török"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatár"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahiti"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Ujgur"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukrán"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Üzbég"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnami"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Vallon"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "Jiddis"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Kínai"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Hozzáadás a szótárhoz"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Ellenőrzött szó"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "S_zótárak"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Leírás _mindről"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
-msgstr "Kihagy"
+msgstr "Kihagyás"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
-msgstr "Megjegyez"
+msgstr "Megjegyzés"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Csere"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Szó hozzáadása"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Vissza"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Leírás"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Súgó"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
-msgstr "_Kihagy"
+msgstr "_Kihagyás"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Csere"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "Á_tugrik"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Nem lehet inicializálni a Bonobo-t"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ja.po gnome-spell-1.0.8/po/ja.po
--- gnome-spell-1.0.7/po/ja.po	2005-01-26 13:05:45.000000000 +0000
+++ gnome-spell-1.0.8/po/ja.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,261 +1,905 @@
 # gnome-spell ja.po.
-# Copyright (C) 2001-2005 Free Software Foundation, Inc.
-# Takeshi Aihana <aihana@gnome.gr.jp>, 2001-2003, 2005.
+# Copyright (C) 2001-2006 Free Software Foundation, Inc.
+# Takeshi Aihana <aihana@gnome.gr.jp>, 2001-2003, 2005-2006.
 # Ryoichi INAGAKI <ryo1@bc.wakwak.com>, 2004.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-26 22:05+0900\n"
-"PO-Revision-Date: 2005-01-26 22:05+0900\n"
+"POT-Creation-Date: 2006-02-25 11:50+0900\n"
+"PO-Revision-Date: 2006-02-25 11:48+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "'%s' の候補(_S)"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "候補"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Glade ファイルが読み込めませんでした。"
 
-#: gnome-spell/dictionary.c:148
+# 参考 URL: http://www.marbacka.net/msearch/sprakkod.html
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "アファール語"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "アフリカーンス語"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "アカン語"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "アムハラ語"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "アラビア語"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "アッサム語"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "アストゥリアス語"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "アバール語"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "アイマラ語"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "アゼルバイジャン語"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "バシキール語"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "バリ語"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "ベラルーシ語"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "ベンバ語"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "ブルガリア語"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "ビハール語"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "ビスラマ語"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "バンバラ語"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "ベンガル語"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "チベット語"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "ブルターニュ語"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "ボスニア語"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "カタラン語"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "チェチェン語"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "セブアノ語"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "チャモロ語"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukese 語"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "コルシカ方言"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "チェコ語"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kashubian 語"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "チュバシュ語"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "ウェールズ語"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "ドイツ語 (オーストリア)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "ドイツ語 (ドイツ)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "ドイツ語 (スイス)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "エウェ語"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "英語 (アメリカ)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "英語 (イギリス)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "英語 (カナダ)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "エスペラント語"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "エストニア語"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "バスク語"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "ファルシ語"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulah 語"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "フィージー語"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "フェロー語"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "フランス語 (フランス)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "フランス語 (スイス)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friulian 語"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "フリジア語"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "アイルランド語"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "ゲール語 (スコットランド)"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "ガリシア語"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "グアラニ語"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "グジャラート語"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "ゲール語"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "ハウサ語"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "ハワイ方言"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "ヒンディー語"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "ヒリガイノン語"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu 語"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "クロアチア語"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "ソルビア語"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "ハイチ語"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "イタリア語"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "アルメニア語"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "ヘレロ語"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "インターリングア"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "イバン語"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "インドネシア語"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "イグブー語"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "四川語"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko 語"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido 語"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "アイスランド語"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "イタリア語"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "日本語"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "ジャワ語"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "グルジア語"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "カチン語"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "コンゴ語"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "カーシ語"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "キクユ語"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama 語"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "カザフ語"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "グリーンランド語"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "クメール語"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "カンナダ語"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "韓国語"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "コンカニ語"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "カヌリ語"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "カシミール語"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "クルド語"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "コミ語"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "コーニッシュ語"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "キルギス語"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "ラテン語"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "ルクセンブルグ語"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "ガンダ語"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgian 語"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "リンガラ語"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "ラオ語"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "ロージ語"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "カタンガ語"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo 語"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "ラトビア語"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "マラガシ語"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "マーシャル諸島の言語"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "マオリ語"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "ミナンカバウ語"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "マケドニア語"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "マラヤーラム語"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "モンゴル語"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "モルダビア語"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "マラーティー語"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "マレー語"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "マルタ語"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "ビルマ語"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "ノルウェー語 (ブークモール)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "北ヌデベレ語"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "低サクソン語"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "ネパール語"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "ドゥンガ語"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "ニウエ語"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "ノルウェー語 (ニューノルスク)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "北ヌデベレ語"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "ソト語 (北部)"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "ナバホ語"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "ニャンジャ語"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "オキタン語"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "オロモ語"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "オリヤー語"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "オセット語"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "パンジャブ語"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "パンパンゴ語"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "パピアメント語"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "パシュトゥ語"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "ポルトガル語 (ポルトガル)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "ポルトガル語 (ブラジル)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "ケチュア語"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "ラロトンガ語"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "キルンジ語"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "ロシア語"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "キンヤルワンダ語"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "サルディニア語"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "シンド語"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "サモス語"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "サンゴ語 (サングホ語)"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "シンハラ語"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "サモア語"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "ショナ語"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "ソマリ語"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "アルバニア語"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "シスワティ語"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "ソト語 (南部)"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "スーダン語"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "スワヒリ語"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "タミル語"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "テルグ語"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "テトゥム語"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "タジク語 "
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "タイ語"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "ティグリニャ語"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "トルクメン語"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "トケラウ語"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "タガログ語"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "ツワナ語"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "トンガ語"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "トク・ピジン語"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "ツォンガ語"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "タタール語"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "トウィ語"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "タヒチ語"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "ウィグル語"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "ウルドゥー語"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "ウズベク語"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda 語"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "ベトナム語"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "ワロン語"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "ウォロフ語"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "コーサ語"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "イディシュ語"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "ヨルバ語"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "チワン語"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "中国語"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "ズールー語 "
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "辞書への追加"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "確認済みの単語"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "辞書(_I)"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "全ての説明(_A)"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "無視する"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "記憶する"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "置き換える"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "単語の追加(_A)"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "戻る(_B)"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "説明(_D)"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "無視する(_I)"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "置き換える(_R)"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "スキップする(_S)"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/lv.po gnome-spell-1.0.8/po/lv.po
--- gnome-spell-1.0.7/po/lv.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/lv.po	2007-09-03 07:42:15.000000000 +0000
@@ -1,287 +1,907 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of lv.po to Latvian
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Raivis Dejus <orvils@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-spell for Latvian\n"
+"Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2003-02-02 22:20--300\n"
-"Last-Translator: Artis Trops <hornet@navigator.lv>\n"
-"Language-Team: Latvian <ll10nt@os.lv>\n"
+"POT-Creation-Date: 2007-08-01 17:50+0300\n"
+"PO-Revision-Date: 2007-08-01 18:02+0300\n"
+"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
+"Language-Team: Latvian <locale@laka.lv>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: gnome-spell/control.c:231
-#, fuzzy, c-format
+#: ../gnome-spell/control.c:232
+#, c-format
 msgid "_Suggestions for '%s'"
-msgstr "Ieteikumi '%s'"
+msgstr "_Ieteikumi '%s'"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Ieteikumi"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Nevarēju ielādēt glade failu."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afaru"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Āfrikāņu"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akanu"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amharu"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arābu"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Asāmiešu"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturiešu"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avaru"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aimaru"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbaidžāņu"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Baškīru"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Buginiešu"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Baltkrievu"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgāru"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bahreina"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislamiešu"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengāļu"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetiešu"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Bretoņu"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosniešu"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Katalāniešu"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Čečenu"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Čamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Čūkesu"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Korsiešu"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Čehu"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kašubīņu"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Čuvašu"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
-msgstr ""
+msgstr "Velsiešu"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Dāņu"
 
-#: gnome-spell/dictionary.c:153
-#, fuzzy
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
-msgstr "Vāciešu (Vācijas)"
+msgstr "Vāciešu (Austrija)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Vāciešu (Vācijas)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Vāciešu (Šveices)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grieķu"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Angļu (Amerikāņu)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Angļu (Britu)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Angļu (Kanādiešu)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spāņu"
 
-#: gnome-spell/dictionary.c:162
-#, fuzzy
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Igauņu"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basku"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Faroiešu"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulu"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
-msgstr "Dāņu"
+msgstr "Somu"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fidžiešu"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Faroiešu"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Franču (Francijas)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Franču (Šveices)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friuliānu"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frisiānu"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
-msgstr ""
+msgstr "Īru"
 
-#: gnome-spell/dictionary.c:167
-#, fuzzy
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Skotu Galliešu"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
-msgstr "Itāļu"
+msgstr "Gallu"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guaranu"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gudžarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manku Galliešu"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausu"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Havajiešu"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
-msgstr ""
+msgstr "Ebreju"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindu"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Horvātu"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Augš Serbu"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haitian Creole"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
-msgstr ""
+msgstr "Ungāru"
 
-#: gnome-spell/dictionary.c:170
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armēņu"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingva"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonēziešu"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Ibo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Sichuan Yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Edo"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "Islandiešu"
+
+#: ../gnome-spell/dictionary.c:230
 msgid "Italian"
 msgstr "Itāļu"
 
-#: gnome-spell/dictionary.c:171
-msgid "Icelandic"
-msgstr ""
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japāņu"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javiešu"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Gruzīņu"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikujiešu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazaku"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Kalaallisut / Greenlandic"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmeru"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannadas"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Korejiešu"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kašmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurdu"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornish"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirgīzu"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
-msgstr ""
+msgstr "Latīņu"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luksemburgiešu"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Gondu"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgian"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Laosas"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
-msgstr ""
+msgstr "Lietuviešu"
 
-#: gnome-spell/dictionary.c:174
-#, fuzzy
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Latviešu"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagašu"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshallese"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Maķedoniešu"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malaiziešu"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongoļu"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldāvu"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malajiešu"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltiešu"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmesu"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "Norvēģu"
+msgstr "Norvēģu (Bokmal)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "North Ndebele"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Low Saxon"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepāliešu"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niuean"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Holandiešu"
 
-#: gnome-spell/dictionary.c:176
-#, fuzzy
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
-msgstr "Norvēģu"
+msgstr "Norvēģu (Nyorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norvēģu"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "South Ndebele"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Ziemeļu Soto"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navajo"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Nyanja/Chichewa"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitanu"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Omāna"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Orija"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Osetu"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Pandžabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Poļu"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Puštu"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugāliešu (Portugāļu)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portugāliešu (Brazīļu)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quechua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotongan"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
-msgstr ""
+msgstr "Rumāņu"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Krievu"
 
-#: gnome-spell/dictionary.c:183
-#, fuzzy
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
-msgstr "Ukraiņu"
+msgstr "Sardīniešu"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Ziemeļsāmu"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Sudāniešu"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slovāku"
 
-#: gnome-spell/dictionary.c:185
-#, fuzzy
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
-msgstr "Slovāku"
+msgstr "Slovēņu"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoa"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Šona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somāliešu"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albāņu"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbu"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Southern Sotho"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sudāniešu"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Zviedru"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Svahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamilu"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetumu"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadžiku"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Taizemiešu"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrajiešu"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmēņu"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalogu"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tsvana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok Pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
-msgstr ""
+msgstr "Turku"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatāru"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahitian"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uiguru"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukraiņu"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Uzbeku"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vjetnamiešu"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Valloņu"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Volofu"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
-msgstr ""
+msgstr "Jidiša"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Ķīniešu"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulusu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
-#, fuzzy
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
-msgstr "_Pievienot vārdnīcai"
+msgstr "Pievienot vārdnīcai"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Pārbaudīts vārds"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "Vā_rdnīcas"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Aprakstīt _visu"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignorēt"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Atcerēties"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Aizvietot"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
-msgstr ""
+msgstr "_Pievienot vārdu"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
-msgstr ""
+msgstr "_Atpakaļ"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Aprakstīt"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignorēt"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Aizvietot"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Izlaist"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Es nevarēju inicializēt Bonobo"
 
-#~ msgid "Choose color"
-#~ msgstr "Izvēlieties krāsu"
-
-#~ msgid "Colors"
-#~ msgstr "Krāsas"
-
-#~ msgid "Language"
-#~ msgstr "Valoda"
-
-#~ msgid "misspelling underline color"
-#~ msgstr "kļūdu pasvītrošanas krāsa"
-
-#~ msgid "en"
-#~ msgstr "en"
-
-#~ msgid "Languages"
-#~ msgstr "Valodas"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/Makefile.in.in gnome-spell-1.0.8/po/Makefile.in.in
--- gnome-spell-1.0.7/po/Makefile.in.in	2006-02-10 11:48:52.000000000 +0000
+++ gnome-spell-1.0.8/po/Makefile.in.in	2007-10-15 12:25:22.000000000 +0000
@@ -22,11 +22,10 @@
 VERSION = @VERSION@
 
 SHELL = /bin/sh
-@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -34,18 +33,17 @@
 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@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-CC = @CC@
-GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
@@ -54,32 +52,26 @@
 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)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
 
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+# This comment gets stripped out
 
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; 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
@@ -94,7 +86,7 @@
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
+	  && rm -f $@ && gencat $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -105,120 +97,91 @@
 $(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
-	if test -n "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@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; \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  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)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	    $(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)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).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 \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(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:
+install-exec 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)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	linguas="$(USE_LINGUAS)"; \
+	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:
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
 
 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
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES
-	rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@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)"; \
 	for file in $$extra_dists; do \
-	  test -f $$file && dists="$$dists $$file"; \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
 	done; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
 	done
 
 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)$$//'`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
 	  echo "$$lang:"; \
 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
 	  if $$result; then \
@@ -234,28 +197,20 @@
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+	    echo "msgmerge for $$lang.gmo failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done
 
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( posrcprefix='$(top_srcdir)/'; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 					\
-		    -e 's/^[[].*] *//' 				\
-		    -e '/^[ 	]*$$/d' 			\
-		    -e "s@^@	$$posrcprefix@" $(srcdir)/$@.in	\
-		| sed -e '$$!s/$$/ \\/') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
 
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/nb.po gnome-spell-1.0.8/po/nb.po
--- gnome-spell-1.0.7/po/nb.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/nb.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,260 +1,903 @@
 # Norwegian/Bokmål translation of gnome-spell.
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Kjartan Maraas  <kmaraas@gnome.org>, 2001.
+# Kjartan Maraas  <kmaraas@gnome.org>, 2001-2006.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-12-25 16:13+0100\n"
+"POT-Creation-Date: 2006-02-17 10:30+0100\n"
+"PO-Revision-Date: 2006-02-17 10:37+0100\n"
 "Last-Translator: Kjartan Maraas  <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian/Bokmaal <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "For_slag for «%s»"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Forslag"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Kunne ikke lese glade-fil."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Bashkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinesisk"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Hviterussisk"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgarsk"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambera"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengalsk"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetansk"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Breton"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnisk"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Tsjetjensk"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Korsikansk"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Walisisk"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Dansk"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "Tysk (Østerrike)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Tysk (Tyskland)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Tysk (Sveitsisk)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Gresk"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Engelsk (Amerikansk)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Engelsk (Britisk)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Engelsk (Kanadisk)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spansk"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estisk"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Baskisk"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finsk"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Færøysk"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Fransk (Frankrike)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Fransk (Sveitsisk)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frysisk"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Irsk"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Skotsk gælisk"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Galisiks"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaiisk"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italiensk"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armensk"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Sichuan Yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japansk"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanesisk"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Koreansk"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurdisk"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latin"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgisk"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Latvisk"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Makedonsk"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongolsk"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldavisk"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmesisk"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "Norsk (bokmål)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Norsk (nynorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polsk"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugisisk"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portugisisk (Brasiliensk)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Russisk"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Sardinsk"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Nord-samisk"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albansk"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Svensk"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamilsk"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatersk"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahitisk"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamesisk"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "Jiddisk"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Kinesisk"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Legg til i ordbok"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Sjekket ord"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "_Ordbøker"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Beskriv _alle"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Husk"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "NO"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Legg til ord"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "Til_bake"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Beskriv"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ne.po gnome-spell-1.0.8/po/ne.po
--- gnome-spell-1.0.7/po/ne.po	2005-04-22 03:31:30.000000000 +0000
+++ gnome-spell-1.0.8/po/ne.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,263 +1,913 @@
+# translation of gnome-spell.HEAD.ne.po to Nepali
 # translation of gnome-spell.HEAD.po to Nepali
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Jyotsna Shrestha <jyoshrestha@hotmail.com>, 2005.
+# Ganesh Ghimire <gghimire@gmail.com>, 2005.
+# Ishwar Sharma <eesha_kaf@yahoo.com>, 2005.
+# Ishwar Sharma <sharmabeeshwar@gmail.com>, 2005.
+# Jaydeep Bhusal <zaydeep@hotmail.com>, 2005.
+# Mahesh subedi <submanesh@hotmail.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-spell.HEAD\n"
+"Project-Id-Version: gnome-spell.HEAD.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-04 03:29+0200\n"
-"PO-Revision-Date: 2005-04-12 16:30+0000\n"
-"Last-Translator: Jyotsna Shrestha <jyoshrestha@hotmail.com>\n"
+"POT-Creation-Date: 2006-05-15 11:28+0200\n"
+"PO-Revision-Date: 2006-06-11 16:31+0545\n"
+"Last-Translator: Mahesh subedi <submanesh@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
-msgstr "'%s' को लागी सुझाव"
+msgstr "'%s'का लागि सुझाव"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
-msgstr "सुझाब॒"
+msgstr "सुझावहरू"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
-msgstr "ग्लेड फाइल लोड भएन।"
+msgstr "ग्लेड फाइल लोड हुन सकेन।"
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "अफ्रिकानीहरू"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "अमारिक"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "अरेविक"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "आसामी"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "अष्ट्रेयालि"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "अभार"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "आइमारा"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "अजरवैजानि"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "वासकिर"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "बालिनेसे"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "बेलारसियालि"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "बेम्वा"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "बुल्गेरियाली"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "बिहारी"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "बिसलामा"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "बामबारा"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "बङ्गाली"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "तिवतियाली"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
-msgstr "ब्रेटन भाषा॒"
+msgstr "ब्रेटन"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "बोस्नियाली"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
-msgstr "क्याटालन भाषा॒"
+msgstr "क्याटालान"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "चेकेन"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "सेवुवनो"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "चामोरो"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "चुकेसे"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "कोर्सिकान"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
-msgstr "चेक भाषा॒"
+msgstr "चेक"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "कासुबियन"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "चुभास"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "वेल्स"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
-msgstr "डेनिस॒"
+msgstr "डेनिस"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "जर्मन (अस्ट्रिया)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "जर्मन (जर्मनी)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "जर्मन (स्वीस)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "ईवि"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
-msgstr "ग्रीक॒"
+msgstr "ग्रीक"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "अंग्रेजी (अमेरिकन)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "अंग्रेजी (ब्रिटेन)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "अंग्रेजी (क्यानेडियन)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
-msgstr "एस्पेरान्तो॒"
+msgstr "एस्पेरान्तो"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
-msgstr "स्पेनिस॒"
+msgstr "स्पेनिस"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "इस्टोनियाली"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "बास्कि"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "फारसी"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "फुलाह"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
-msgstr "फिन्नीस॒"
+msgstr "फिनिस"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "फिजियन"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
-msgstr "फारसी॒"
+msgstr "फारसी"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
-msgstr "फ्रेन्च (फ्रान्स)"
+msgstr "फ्रान्सेली (फ्रान्स)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
-msgstr "फ्रेन्च (स्वीस)"
+msgstr "फ्रान्सेली (स्वीस)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "फ्रिउलिएन"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "फ्रिसियन"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
-msgstr "आइरिस॒"
+msgstr "आइरिस"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "स्टकिस गेअलिक"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
-msgstr "ग्यालिसियन॒"
+msgstr "ग्यालिसियन"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "गुअरानि"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "गुजराती"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "म्यान्क्स गेअलिक"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "हाउसा"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "हाउलिएन"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "हिब्रु"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "हिलाग्यावन"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "हिरि मोतु"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "क्रोसियन"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "माथिल्लो सर्भिया"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "हाएटिएन क्लोर्ले"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
-msgstr "हन्गेरियन॒"
+msgstr "हन्गेरियन"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "ईटालीयन॒"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "अर्मेनियन"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "हेरेरो"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "इन्तरलिङ्ग्या"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "इबान"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "इन्डोनेसियन"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "इगबो"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "सिचुवान यि"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "इलोको"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "इडो"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
-msgstr "आइसलान्डीक॒"
+msgstr "आइसलान्डीक"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "इटालेली"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "जापानी"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "जाभानेसे"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "जर्जेयन"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "केच्यिन"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "कङ्गो"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "खासी"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "किकुयु"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "क्वानयामा"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "कजाक"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "कातालिसुट / ग्रिनल्यान्डिक"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "खमेर"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "कन्नाडा"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "कोरियाली"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "कोनकोनी"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "कानुरी"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "कश्मिरी"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "कुर्दिश"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "कोमी"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "कोर्निश"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "कोर्गिज"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
-msgstr "ल्याटिन॒"
+msgstr "ल्याटिन"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "लक्जेमबोरिगिज"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "घाना"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "लिमबुर्जियन"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "लिनगाला"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "लोव"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "लोजी"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
-msgstr "लिथुवानियन॒"
+msgstr "लिथुवानियाली"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "लुबा-कातान्जा"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "लुव"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "लाटभियन"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "मालागासी"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "मार्शेले"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "मावरी"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "मिनाङ्गकाबोउ"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "मोर्सेडिवन"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "मलायालम"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "मङ्गोलियन"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "मल्दोभियन"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "मराठी"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "मलाय"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "मेलटेसे"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "बर्मेली"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "नर्वेजीयन (बुकमल)"
+msgstr "नर्वेली (बुकमल)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "उत्तर नोडेबेले"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "लोउ साक्सोन"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "नेपाली"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "नोड्गा"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "निउएन"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
-msgstr "डच॒"
+msgstr "डच"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
-msgstr "नर्वेजीयन (नर्योस्क)"
+msgstr "नर्वेली (नर्योस्क) "
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
-msgstr "नर्वेजीयन॒"
+msgstr "नर्वेली"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "दक्षिण नोड्गो"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "उत्तरि सोतो"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "नाभोजो"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "न्यान्जा/चिकेवा"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "वसिटान"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "वरोमो"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "वरोया"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "वसेट्टिक"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "पञ्जावी"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "पमपङ्गगा"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "पापिमेन्टो"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
-msgstr "पोलिस॒"
+msgstr "पोलिस"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "पुस्तो"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
-msgstr "पोर्चुगिज (पोर्चुगल)"
+msgstr "पोर्तुगाली (पोर्चुगल)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
-msgstr "पोर्चुगिज (ब्राजिलीयन)"
+msgstr "पोर्तुगाली (ब्राजिलीयन)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "क्युचिव"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "रारोतोन्गान"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "रुन्डी"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
-msgstr "रोमानियन॒"
+msgstr "रोमानियन"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
-msgstr "रसियन॒"
+msgstr "रसियाली"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "किनय्यारवान्डा"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "सारडिनियन"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "सिन्दी"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "उत्तरिय सामी"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "साङ्गो"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "सिन्हालेसे"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "स्लोभाक"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "स्लोभिनियन"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "सामोआन"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "सोना"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "सोमाली"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "अल्बानियन"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "सर्बियन"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "स्वाटी"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "दक्षिणिय सोतो"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "सुडानेसे"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
-msgstr "स्विडिस॒"
+msgstr "स्विडिस"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "स्वाहिली"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "तामिल"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "तेलगु"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "टेतुम"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "ताजिक"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "थाइ"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "ट्रिगरिर्या"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "ट्रुर्कमेन"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "टोकेलाउ"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "टागालोग"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "टुस्वाना"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "टोङ्गो"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "टोक पिसिन"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
-msgstr "टर्कीस॒"
+msgstr "टर्कीस"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "टोसोङ्गा"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "टाटार"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "टिइ"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "ताहितिएन"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "इग्हुर"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
-msgstr "युक्रेनियन॒"
+msgstr "युक्रेनियन"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "उर्धू"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "उज्वेक"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "भेन्डा"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "भियतनामी"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "वालोवन"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "वलोफ"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "होजा"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
 msgstr "यिड्‌डिस"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "युरुर्वा"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "झुवाङ्ग"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "चिनिया"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "जुलु"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
-msgstr "शब्दकोसमा जोडनुहोला"
+msgstr "शब्दकोसमा थप्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
-msgstr "शब्द जाँच्नुहोला"
+msgstr "शब्द जाँच्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
-msgstr "शब्दकोसहरू"
+msgstr "शब्दकोशहरू "
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
-msgstr "सबै व्याख्या गर्नुहोला"
+msgstr "सबै व्याख्या गर्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
-msgstr "वेवास्ता"
+msgstr "उपेक्षा गर्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
-msgstr "सम्झना"
+msgstr "सम्झनुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
-msgstr "बदलनुहोला॒"
+msgstr "बदल्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
-msgstr "शब्द जोडनुहोला"
+msgstr "शब्द थप्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
-msgstr "_पछाडि॒"
+msgstr "पछाडि जानुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "व्याख्या"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
-msgstr "मद्दत॒"
+msgstr "मद्दत"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
-msgstr "_वेवास्ता"
+msgstr "उपेक्षा गर्नुहोस् "
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
-msgstr "_बदलनुस॒"
+msgstr "बदल्नुहोस्"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
-msgstr "_छोड़॒"
+msgstr "छोड्नुहोस्"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
-msgstr "बोनोबोको सुरुआत गर्न सकिएन॒"
+msgstr "बोनोबोको सुरुआत गर्न सकेन "
 
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/nl.po gnome-spell-1.0.8/po/nl.po
--- gnome-spell-1.0.7/po/nl.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/nl.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,280 +1,89970 @@
-# Dutch translation gnome-spell.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Taco Witte <T.C.Witte@phys.uu.nl>, 2002.
-# Daniel van Eeden <daniel_e@dds.nl>, 2004.
-# Tino Meinen <a.t.meinen@chello.nl>, 2004.
+# Dutch translation
+# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Alleyoop package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-spell\n"
+"Project-Id-Version:  cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-09-12 03:29+0200\n"
-"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
-"Language-Team: Dutch <vertaling@nl.linux.org>\n"
+"POT-Creation-Date: 2006-04-17 14:07+0200\n"
+"PO-Revision-Date: 2006-04-17 13:39+0200\n"
+"Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "_Suggesties voor '%s'"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Suggesties"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Kon glade-bestand niet laden."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr ""
+
+# moet mogelijk vertaald worden als Abisinisch
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Ethiopisch"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbeidjaans"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Belarussisch"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetaans"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Bretons"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosnisch"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Catalaans"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+#, fuzzy
+msgid "Chechen"
+msgstr "Tsjechisch"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Welsh"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Deens"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
 msgstr "Duits (Oostenrijk)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Duits (Duitsland)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Duits (Zwitserland)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grieks"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
-msgstr "Engels (Amerikaans)"
+msgstr "Engels (Amerika)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
-msgstr "Engels (Brits)"
+msgstr "Engels (Engeland)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
-msgstr "Engels (Canadees)"
+msgstr "Engels (Canada)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spaans"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estonisch"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Baskisch"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Fins"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Faroees"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Frans (Frankrijk)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Frans (Zwitserland)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:203
+#, fuzzy
+msgid "Frisian"
+msgstr "Sardinisch"
+
+# src/mozilla_i18n.c:36
+# ui/preferences.glade.h:197
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Iers"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Schots Gaelic"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
+msgstr "Galiciaans"
+
+#: ../gnome-spell/dictionary.c:207
+#, fuzzy
+msgid "Guarani"
+msgstr "Hongaars"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manx Gaelic"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:211
+#, fuzzy
+msgid "Hawaiian"
 msgstr "Gallisch"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Opper-Sorbisch"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italiaans"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armeens"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+#, fuzzy
+msgid "Herero"
+msgstr "Hebreeuws"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr ""
+
+# src/mozilla_i18n.c:33
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesisch"
+
+#: ../gnome-spell/dictionary.c:225
+#, fuzzy
+msgid "Igbo"
+msgstr "Negeren"
+
+#: ../gnome-spell/dictionary.c:226
+#, fuzzy
+msgid "Sichuan Yi"
+msgstr "Litouws"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Ijslands"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italiaans"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japans"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada, Kanara, Kanarees"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Koreaans"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Koerdisch"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornish"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latijn"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:254
+#, fuzzy
+msgid "Limburgian"
+msgstr "Litouws"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Lao"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr ""
+
+# ui/galeon.glade.h:85
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Lets"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagasy"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedonisch"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongools"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Maleis"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltees"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmees"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
 msgstr "Noors (Bokmal)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepalees"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr ""
+
+# Marc says: I looks like someone hoped I'd do this work !!!
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Noors (Nyorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Noors"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Pools"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugees (Portugal)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
-msgstr "Portugees (Braziliaans)"
+msgstr "Pourtugees (Brazilie)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quechua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Russisch"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
 msgstr "Sardinisch"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somalisch"
+
+# ui/bookmarks.glade.h:2
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanees"
+
+# ui/preferences.glade.h:159
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Servisch"
+
+#: ../gnome-spell/dictionary.c:316
+#, fuzzy
+msgid "Swati"
+msgstr "Latijn"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+# ui/preferences.glade.h:192
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmeens"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Turks"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tataraans"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:337
+#, fuzzy
+msgid "Tahitian"
+msgstr "Gallisch"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
-msgstr "Oekraïens"
+msgstr "Oekraniniens"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Oezbeeks"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamees"
+
+# galeon.desktop.in.h:1
+# sounds/galeon.soundlist.in.h:1
+# src/dialog.c:135
+# src/mozilla/PromptService.cpp:666
+# src/window.c:191
+# ui/galeon.glade.h:50
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Walloons"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
-msgstr "Yiddish"
+msgstr "Jiddisch"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Yorubaans"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Chinees"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Toevoegen aan woordenboek"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Gecontroleerd woord"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "_Woordenboeken"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "_Alle beschrijven"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Negeren"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Onthouden"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Vervangen"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "Woord _toevoegen"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Terug"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Beschrijven"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Hulp"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
-msgstr "_Negeren"
+msgstr "Ne_geren"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Overslaan"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Ik kon Bonobo niet initializeren"
 
-#~ msgid "Choose color"
-#~ msgstr "Kleur kiezen"
 
-#~ msgid "Colors"
-#~ msgstr "Kleuren"
 
-#~ msgid "Language"
-#~ msgstr "Taal"
 
-#~ msgid "misspelling underline color"
-#~ msgstr "fout gespeld onderstreepkleur"
 
-#~ msgid "en"
-#~ msgstr "en"
 
-#~ msgid "Languages"
-#~ msgstr "Talen"
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gereedschap/tool/hulp/toepassing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dialoogvenster2 ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# opdrachtregel?
+
+
+
+
+
+# Herstellen?
+
+
+
+
+# hoofdlettergevoelig?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontleden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# typefout? moet het zijn _Lock?
+
+
+
+
+# Recent openen/Oude bestanden/Oud/Vorige bestanden/Vorige
+# Recent geopend/Onlangs geopend
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schonen
+
+# schonen
+
+# schonen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# let op
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+# schonen
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# schonen
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# verkennen/bladeren
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+# toestand tonen
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# aanwijzers
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# onderkant
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/prefs.c:385
+# ui/epiphany.glade.h:36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bezig met afdrukken
+# aan het afdrukken
+# (besloten om het kort te houden: gewoon 'afdrukken')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Anjuta kent geen %s
+
+
+
+
+# achteruit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aan/uit schakelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# ui/galeon.glade.h:91
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# bezig met laden, kan...
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is een programmeerterm, moet niet vertaald worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+# standaard format?
+# (gaat het hier om: binair, octaal enz?)
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# wat is de juiste/goede vertaling hiervoor?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanpassen
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# samenvatting/onderwerp
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gncal/main.c:500
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+# hulpmiddel
+# programma
+#, fuzzy
+
+#, fuzzy
+
+# Marc says: I did not translate because it would change the wellthought hotkeys. The dutch word is Knip
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+# Bedrijf/zakelijk
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# ui/galeon.glade.h:122
+
+#, fuzzy
+
+# beter woord?
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# dit is een programmeerterm, moet niet vertaald worden
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# aanwijzers
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat betekent TT?
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# voer het regelnummer in
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+# vertalen of niet?
+#, fuzzy
+
+# Herstellen?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+# bezig met laden, kan...
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# Marc says: I did not translate because it would change the wellthought hotkeys. The dutch word is Knip
+
+
+
+
+# src/main.c:111
+
+#, fuzzy
+
+
+
+
+
+# Marc says: How did you guys know I don't drink coffee ???
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+# opdrachtregel?
+#, fuzzy
+
+
+# opdrachtregel?
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Wat is de juiste betekenis?
+# item/invoerveld/onderdeel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niveau voor consistentie? level is toch mooier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geldigheid/echtheid
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# versleutelingsprotocol
+# coderingsprotocol
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+# GnuPG gebruik makend van MIME
+
+# gebruik makend van OpenPGP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# filteren?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# beveiligen
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# postvak in
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# filteren?
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit de juiste interpretatie?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# regels ipv voorwaarden
+
+
+
+
+# filters toepassen?
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herstellen
+
+# herstellen
+
+
+
+
+
+
+
+
+
+
+
+
+# herstellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herstellen
+
+# filteren?
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# postvak in
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+# versleutelingsprotocol
+# coderingsprotocol
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verzenden
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# verzenden/versturen
+
+
+
+
+
+
+
+# verzenden
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Onvertaald laten lijkt me het best (P. van de Geer)
+
+
+
+
+
+
+
+
+
+# Onvertaald laten lijkt me het best (Wouter Bolsterlee)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of moet dit 'afspelen' zijn? rhythmbox gebruikt 'bediening'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# ../lisp/workspace.jl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+# herschalen
+
+
+
+
+
+
+# gnomecard/columnhdrs.c:36
+
+
+
+
+
+
+
+
+
+
+# klaar
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# een map selecteren
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# levert op/produceert
+
+
+# het zoeken is niet gevoelig voor het gebruik van hoofletters en kleine letters.
+
+
+
+
+# handige tips/snelle tips/aanwijzingen/handwijzingen/tips
+
+
+
+
+# Beginnen met zoeken/beginnen met zoeken
+
+
+
+# intoetsen/typen/
+
+
+
+
+
+
+
+
+
+# naam/titel
+
+# laatst bekeken
+
+
+
+
+
+
+
+
+
+# met/in/via e-mail verzenden
+
+
+
+# laatst bekeken/bezocht
+
+
+# meervoud is hier beter
+
+# meervoud is hier beter
+
+#
+# Common stuff for the templates
+#
+
+# meervoud is hier beter
+
+# geluid/audio
+
+# beeld/video
+
+
+
+
+# Meervoud is hier beter
+
+
+
+
+
+
+
+
+
+# Bureuablad doorzoeken/desktop doorzoeken/desktop zoekprogramma/zoekhulp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bureuablad doorzoeken/desktop doorzoeken/desktop zoekprogramma/zoekhulp
+
+
+
+# Bureuablad doorzoeken/desktop doorzoeken/desktop zoekprogramma/zoekhulp
+
+# alles/overal (doorzoeken)
+
+
+
+# in toepassingen zoeken/toepassingen doorzoeken
+
+
+
+
+
+
+# logboeken van expresberichten/
+
+
+
+
+# in audio en videobestanden/beeld en geluidbestanden
+
+
+# meest recentelijk gewijzigde bestanden
+
+
+
+# eerst/bovenaan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Common stuff for the templates
+#
+
+
+
+
+
+
+
+# beheer/systeembeheer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tonen met/oproepen met
+
+
+
+
+
+
+
+
+
+#
+# Common stuff for the templates
+#
+
+
+
+
+
+#
+# Common stuff for the templates
+#
+
+
+# weergegeven/getoonde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit is om een tijdspanne aan te duiden, dus ik heb voor "uur" en niet voor
+# "uren" gekozen -- Wouter Bolsterlee
+
+# Tijdspannes in minuten zeggen we weer wel in het meervoud. Rare jongens, die
+# Nederlandstaligen... -- Wouter Bolsterlee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wijzigen
+
+
+
+
+
+# schonen wissen
+
+
+
+
+# beter woord voor rack
+
+# wat is een goede vertaling hiervoor?
+
+
+
+# Een extra weergave van het project aanmaken<
+
+
+
+
+
+
+
+
+
+
+# signalen/events
+# signalen klink hier eigenlijk heel goed
+
+
+# huidige geselecteerde golf? wave-bestand?
+
+
+# mesh - net?
+
+
+
+
+
+
+
+
+
+
+# opdrachten uitgevoerd
+# taken verricht
+# doelen bereikt
+# Geeft een introductie voor veelgebruikte taken
+
+
+
+
+
+# webstek
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beter woord voor verzameling?
+
+# nummer
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# huidige/momenteel/nu
+
+
+
+
+
+
+
+
+
+
+# uitlijning misschien beter?
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# binden
+
+
+# verhogen
+# opwaarts
+
+
+# verlagen
+# neerwaarts
+
+
+# huidige geselecteerde golf? wave-bestand?
+
+
+
+
+# aan te roepen/te gebruiken
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# automatisering beheren?
+
+
+
+
+
+# kleurselectie
+
+
+
+
+
+
+
+
+
+# afkorting for dialog?
+
+
+
+
+
+# bestandbladeraar niet mooi
+
+
+
+
+
+
+
+
+
+
+
+# moet dit vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit de juiste betekenis?
+
+
+
+
+
+
+
+# vrij vertaald, maar wel begrijpelijk
+# of
+# het aantal / de hoeveelheid cellen waarover verschoven wordt nadat....
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# huh?
+
+
+
+
+
+
+
+
+
+
+# plotseling geen meervoud meer?: note ipv notes
+
+
+
+
+
+
+
+
+
+# tact is het duitse woord voor het engelse 'bar' -> maat ?
+# Tact heeft anders geen betekenis
+
+
+
+
+
+# bouderies:
+# op grensen van ... noten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat betekent dit?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+# draad?
+
+
+
+
+
+# gebuikerstijd
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# klopt dit in deze context?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet gespecificeerde duur
+# duur niet gegeven/gespecificeerd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# plotseling geen meervoud meer?: note ipv notes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# een herstart (van het programma)
+
+
+# enigszins vrij vertaald.
+
+
+
+
+
+
+
+# percentage menging van achtergrondafbeelding met achtergrondkleur
+
+
+
+
+
+# geen Tekstkleur ivm consistentie andere 'kleur' termen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moeten we dit vertalen?
+# schuifgrafiek
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ingangen
+
+# uitgangen
+
+
+
+
+
+
+
+
+
+
+# omhullings-generator
+
+
+
+
+
+
+
+
+
+
+# wijzigen/aanpassen
+
+
+
+
+
+
+# wijzigen/aanpassen
+
+# onderdelen ipv delen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beschikbare geluiden
+
+
+
+# bij gelijktijdig afspelen
+
+
+
+
+# uitleg
+
+
+#, fuzzy
+
+# rekeneenheid
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# huh?
+
+
+# huidige geselecteerde golf? wave-bestand?
+
+# golf?
+
+
+
+
+
+
+
+
+
+
+# Gebeurtenissen/signalen
+
+
+
+
+
+
+
+
+
+
+# noten
+
+
+
+
+
+
+
+# golven? of .wav?
+
+
+
+# verhelderen
+
+
+# of gitaar 'distortion'
+
+# verhelderen
+
+
+
+
+
+# Kwantisatie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# attenuate=verzachten, afzwakken, verdunnen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Filtersoort
+# Soort filter
+
+# filteren?
+
+# Filtersoort
+# Soort filter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gedempt
+
+
+
+
+
+
+
+
+
+
+
+
+# uitleg
+
+
+
+
+
+# hoofduitgang
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+# midi-term
+
+
+# toonhoogte buigen
+
+# nootsnelheid
+
+
+
+
+
+
+# klopt dit in deze context?
+
+
+
+
+
+
+
+
+
+
+
+# Bedieningsknop/bedienaar/controller/controleknop
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# adembeheersing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontstemmen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# draad?
+
+
+
+# rekeneenheid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# slagen per minuut
+
+# betere vertaling placeholder?
+# Dict: a person authorized to act for another
+
+# goed verlopen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+# data/gegevens
+
+
+
+
+
+# niet gevonden/geen overeenkomsten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# traagheid
+
+
+
+
+
+
+
+
+# persoonlijk bezit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# frequentie van de toets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beschikbare geluiden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitleg
+
+# beter woord voor postprocesser
+
+
+
+
+
+
+# uitleg
+
+# rekeneenheid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# misschien beter in enkelvoud:
+# openen Midi-apparaat mislukt
+# opgeven/niet meer proberen
+#, fuzzy
+
+
+#, fuzzy
+
+# misschien beter in enkelvoud:
+# openen Midi-apparaat mislukt
+# opgeven/niet meer proberen
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+# snoop: rondneuzen/bemoeial
+# afkijken, afsnoepen
+
+# moet dit vertaald worden?
+
+
+# slagen
+
+
+
+
+
+
+# slagen per minuut
+
+# herhalen
+
+
+
+
+
+
+
+# partij ipv gedeelte
+
+
+
+
+
+# wat betekent dit?
+
+# betere vertaling?
+
+# betere vertaling.
+# Wat betekent het precies?
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitleg
+
+
+
+
+
+
+
+
+
+
+
+
+# uitleg
+
+
+
+# Synth ingang
+
+
+# uitleg
+
+
+# MIDI-ingang dat aan dit kanaal is toebedeeld,...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Follow the instructions to read the message.
+
+# Follow the instructions to read the message.
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wijzigen/instellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# envelope->omhullende?
+
+
+
+# decay: duur ipv lengte?
+
+
+
+
+
+
+# verhelderen
+
+
+
+
+
+
+
+
+
+
+
+# pluk frequentie,
+# maar een snaar pluk je niet, die tokkel je
+# mogelijk: aanslagfrequentie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is een instructie in een dialoog en zegt wat je moet doen
+# om kanaalinfo te bewerken.
+# Infinitief dus beter.
+# (dit krijg je als je met je rechtermuisknop op een kanaal klikt)
+
+
+# was eerst: Ingang.
+# onder dit menuonderdeel zit: 'Markeren als ongelezen' en
+# 'Volgende ongelezen'.
+# Mogelijkheden: item/items/artikel/artikelen/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meest recente/nieuwste
+
+
+# alle/allen/alles
+
+
+
+# is meestal meer dan 1 minuut (en standaard 15 minuten)
+# dus meervoud is beter. 
+
+
+
+
+
+
+
+
+
+
+
+# dit noemen we geen bladerprogramma meer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'Home' als in home directory of als in home page?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afgesloten/gekilled
+# na voltooien van het rapport/na het rapporteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# technische term
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Pad naar -> locatie van, plaats van
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# s/Collapseto/Collapse to/g ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# leverancier
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# webpagina/webstek
+# we moeten maar kijken in hoeverre webstek voeten aan de grond
+# krijgt in het Nederlands.
+
+#, fuzzy
+
+
+# ?
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# todo: same as src/config-error-file-open.c:320
+
+
+
+
+# todo: same as src/config-error-file-open.c:263
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# commentaar
+
+
+# uiterlijk/voorkomen/beeld/weergave
+
+
+
+# pauze/vertaging/wachttijd
+
+# fallback niet vertaald
+
+
+
+# voorafgaand
+
+
+
+
+
+
+
+
+# fallback niet vertaald
+
+
+
+
+# betere vertaling voor slides?
+# dia-show
+
+# betere vertaling voor slides?
+# dia-show
+
+# vrij vertaald. Dit is een verklaring van een gconf-key
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG: mnemonic in tooltip?
+# _Deletes this block from the slide"
+
+# beschadigd/gebroken
+
+# gebruikersbediening/bediening/interface
+
+# betere vertaling voor slides?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# resources is hier ws geheugen
+
+# hulp/hulpdocument
+
+
+# betere vertaling voor slides?
+
+# dit staat een beetje dubbelop
+
+
+
+
+
+# uitleg van save as
+
+
+
+
+
+
+
+
+# betere vertaling voor slides?
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling voor slides?
+
+
+# betere vertaling voor slides?
+
+# weergeven
+
+
+# tonen/afspelen/geven/weergeven
+
+
+# weergeven
+
+
+
+
+# betere vertaling voor slides?
+
+# weergeven/tonen
+
+
+# weergeven/tonen
+
+
+
+
+
+
+#  UTF-8 teken is nu toegevoegd
+
+
+
+# gebruik/toepassen
+
+# betere vertaling voor slides?
+
+
+# video/film
+
+
+# encoder/coderingsprogramma/codeerprogramma
+# audioencoder
+
+
+
+# samplerate/frequentie
+
+
+
+
+
+
+
+
+
+# beeldfrequentie/framerate
+# die van de videobron wordt opgenomen/die wordt opgenomen van de videobron
+# opgevangen/opgenomen/binnengehaald
+# het aantal beelden per seconde dat van de videobron wordt opgenomen
+
+
+
+
+# geluidsbron/audiobron
+
+
+
+
+
+
+# videofrequentie
+
+
+
+# die gebruikt wordt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bps beelden per seconde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# voorkeursbestandsformaat/bestandsformaat.
+# voorkeur weggelaten
+
+
+
+
+# initiele/aanvankelijke/eerste gebruik
+
+# In de volgende stappen zal de assistent u enkele vragen stellen...
+# 'in de volgende onderdelen'
+
+
+
+
+
+# videofrequentie
+
+
+
+# volume/geluidsvolume/geluidssterkte
+
+# schermafdruk/foto/still/pauzebeeld/momentopname maken
+
+
+
+
+
+
+
+
+
+
+# schakelen/wisselen
+
+
+
+
+
+
+
+
+
+
+# opname/opnemen
+
+
+
+# gaf/produceerde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# spreken is ook mogelijk
+# (tekst wordt opgezegd nadat hij is ingevoerd)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geavanceerde/extra
+
+
+
+# enkelvoud
+# knoppenmodus/stijl
+
+
+
+# compasmodus/stijl
+
+
+
+
+
+
+
+
+
+# hier wordt network socket bedoeld,
+# dasher bedienen vanaf/vanuit een netwerkkaart
+
+
+
+
+
+
+
+
+
+
+
+# geavanceerde/extra
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# knoproulatie
+
+
+
+
+
+# voltooid/klaar
+
+
+
+
+# meamo-variant?
+
+
+
+
+# pijltoetsen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# van rechts naar links
+
+# rechter/rechts
+
+
+
+
+
+# geavanceerde/extra
+
+
+
+
+
+
+# spreken
+
+
+
+# starten via spatiebalk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# opnieuw instellen
+
+
+
+# aanpassen/wijzigen
+
+
+# pijltoetsen?
+
+# vertikale bereik ipv y-bereik?
+
+
+
+
+# pijltoetsen?
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# enkelvoud
+# knoppenmodus/stijl
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+# layout/opmaak/indeling
+
+# Geladen niet meevertaald, overbodig
+# andere vertaling:
+# Extra functies/Meer functies/Meer mogelijkheden/Uitbreidingen
+
+
+# slepen en laten vallen is een te letterlijke vertaling.
+# Verslepen is duidelijk genoeg, (je zult toch eens moeten loslaten...)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 5 bestanden meer
+
+
+# in overeenstemming met het paneel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in overeenstemming met evolution terminologie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen idee waarom dit voor gevorderden/experts is
+
+# De programma's in uw $PATH rechtstreeks opstarten/
+# Willekeurig welk programma aanwezig in uw $PATH starten
+
+
+# opstarten/starten
+
+
+
+
+# via een patroon/door een patroon/met gebruik van een patroon
+
+
+
+
+
+# en soortgelijke bronnen/en dergelijke
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# per/voor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# rekening
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# spelfout in engels: Unknows command:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat is dillo?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hier wordt ws de snelhied van het te bewegen vrije punt bedoeld.
+# dus geen animatie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+# gncal/eventedit.c:411
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# indien u voor 'afdrukken annuleren' kiest
+# indien u 'afdrukken annuleren' kiest
+# wanneer u voor 'afdrukken annuleren' kiest
+# wanneer u 'afdrukken annuleren' kiest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bij/tijdens
+# bij is beter (tijdens: foutmelding kan ook door ander programma uitgezonden zijn)
+
+
+
+# voor afdrukken weggelaten
+
+
+# deels/gedeeltelijk
+
+
+
+
+
+
+
+
+
+# documentindeling/documentformaat
+
+
+
+# als standaard instellen
+
+
+
+
+
+
+
+# software telefoon
+
+
+# Bel mensen via het internet/mensen opbellen
+# er staat wel: talk ipv call, maar het is het meest
+# begrijpelijk als er 'opbellen' staat.
+
+
+
+# audio-uitgang/ audio weergave-apparaat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Use ILS
+
+
+
+
+
+
+
+# STUN:
+# Simple Traversal of UDP Through Network Address Translation devices
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wordt echo onderdrukt/wordt echo-onderdrukking gebruikt
+
+
+
+
+# laatste naam/achternaam
+
+
+
+
+
+
+
+
+# tijdslimiet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# traversal wordt meestal (nog) niet vertaald in het Nederlands
+# is hier een goede term voor? doorkruisen/oversteek/doorgeven/doorreis
+# NAT traversal wordt ook wel afgekort met NAT-T
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels fout: STUN is a technic
+
+# abonnementen
+
+
+
+
+
+
+
+# oproepen/bellen/opbellen
+
+
+
+# we kunnen bijna zeggen: de ringtone
+
+
+
+
+
+# dient te worden/wordt
+# wanneer/als het openen is mislukt
+
+
+# zal ipv moet
+
+
+
+
+
+
+# de netwerkkaart/interface
+
+# waarnaar geluisterd wordt
+
+# instant message/expresbericht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# registrar: one who registers; a recorder, a keeper of records
+# gatekeeper/administrateur/sleutelhouder/abonnementadministratie/notaris
+# registratiehouder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'as long as' gewijzigd in 'unless' is duidelijker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Detecteren...|Detectie...|Aan het onderzoeken|Bezig met onderzoek|
+# Detectie is in voortgang
+
+
+
+
+
+
+
+
+# aantreffen/terugvinden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ws mag je alleen MovingLogo en StaticPicture niet vertalen, en Picture wel.
+# (dit wordt verderop namelijk vertaald)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# doorgezet/doorgestuurd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gesprekspartner
+
+
+
+# gesprek/oproep
+
+# is mislukt/heeft gefaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gevraagd/vereist
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Registrar: One who registers; a recorder;
+# registratiehouder/registratieadministratie
+
+
+
+
+
+
+
+
+
+
+
+
+# abonnementsnaam/accountnaam/naam van abonnement
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# credits|
+
+
+
+
+
+
+
+
+
+
+# oproepen
+
+
+
+
+
+
+# u zegt
+
+
+
+
+
+
+
+
+
+
+
+
+
+# echo wordt onderdrukt
+
+# echo wordt niet onderdrukt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# apparaten|beheerder
+
+
+
+
+
+
+
+
+
+
+# videoapparaten/beheerder
+
+
+
+
+
+
+
+
+
+
+
+
+
+# assistent/hulp
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afbreken/beeindigen
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schorsen/pauzeren
+
+
+
+
+
+
+
+
+
+
+
+# wijzigen/bewerken
+
+
+
+# software telefoon
+
+# softfoon
+
+# videofoon
+
+# Het standaard videobeeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# help uzelf door het lezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afkomstig van
+
+
+
+
+# out of order/verkeerde volgorde/heen en weer vertraging.
+# (bij pakketten die in de verkeerde volgorde aankomen, worden
+# er pakketten heen en weer gezonden.
+
+
+
+
+
+
+
+
+# klokfrequentie/snelheid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Use ILS
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tijdslimiet voor het doorsturen van 
+
+
+
+
+
+
+
+
+
+
+
+# luiteren op/luisterpoort
+
+
+# traversal: travel across, or take a zig-zag path on skis
+# doorreis/doorkuisen/doorgeef/oversteek
+# traversal wordt in het Nederlands veelal (nog) niet vertaald
+# wordt ook afgekort met NAT-T
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# die dit ondersteunen/waarbij dat mogelijk is
+
+# echo onderdrukken/echo-onderdrukking inschakelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Webcam Control Frame
+
+# geluiden/geluidjes/geluidsgebeurtenissen
+
+
+#  Webcam Control Frame
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eigenlijk moet de naam erbij want er zijn meer van dit soort
+# programma's: bv. Gthumb afbeeldingviewer
+# viewer ipv weergave om constistent te blijven met evince documentviewer
+
+# tooltip bij het menuonderdeel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Voorkeuren Eye of GNOME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# benaderen/toegang krijgen/bereiken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verzameling afbeelingen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weergever is lelijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weergever is lelijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+
+
+
+# src/menubar.c:150
+
+
+
+# ui/epiphany.glade.h:63
+
+# ui/preferences.glade.h:175
+
+
+# src/main.c:111
+
+# src/main.c:111
+
+
+
+# src/bookmarks_editor.c:981
+
+# src/window_callbacks.c:2194
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# ui/preferences.glade.h:172
+
+# src/menubar.c:416
+
+
+# ui/preferences.glade.h:18
+
+
+
+# src/window_callbacks.c:2194
+
+
+# ui/preferences.glade.h:248
+
+
+# ui/preferences.glade.h:233
+
+
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+# src/menubar.c:473
+
+
+# src/mozilla_i18n.c:121
+
+
+
+
+
+
+
+# ui/preferences.glade.h:176
+
+# ui/preferences.glade.h:175
+
+
+
+# ui/preferences.glade.h:176
+
+# ui/preferences.glade.h:59
+
+
+
+
+
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+
+
+
+
+# src/menubar.c:150
+
+
+# src/menubar.c:401
+
+# src/menubar.c:396
+
+# src/menubar.c:402
+
+# src/menubar.c:397
+
+
+
+
+
+
+
+# src/mozilla_i18n.c:39
+# ui/preferences.glade.h:212
+
+# src/menu_callbacks.c:1286
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+
+
+
+# ui/preferences.glade.h:50
+
+
+
+
+
+
+
+
+# src/menu_callbacks.c:1286
+
+
+# Twijfelgeval: 'Gedownloade bestanden' beter?
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+# src/menubar.c:502
+# ui/epiphany.glade.h:163
+
+# src/prefs.c:385
+# ui/epiphany.glade.h:36
+
+
+# src/menubar.c:502
+# ui/epiphany.glade.h:163
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+# src/menubar.c:473
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+# src/menubar.c:416
+
+# ui/preferences.glade.h:28
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+# ui/preferences.glade.h:105
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+
+
+
+
+# ui/preferences.glade.h:161
+
+# ui/preferences.glade.h:161
+
+
+
+
+# ui/preferences.glade.h:253
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+
+# ui/preferences.glade.h:118
+
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:48
+
+# ui/epiphany.glade.h:121
+
+
+# src/toolbar.c:286
+
+
+
+# ui/preferences.glade.h:157
+
+
+#  Minutes, Seconds
+
+# ui/epiphany.glade.h:103
+
+
+# Twijfelgeval: 'Gedownloade bestanden' beter?
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+# ui/epiphany.glade.h:97
+
+
+# src/mozilla_i18n.c:44
+
+# src/mozilla_i18n.c:46
+
+# src/mozilla_i18n.c:49
+
+# src/mozilla_i18n.c:50
+
+# src/mozilla_i18n.c:52
+
+# src/mozilla_i18n.c:53
+
+# src/mozilla_i18n.c:54
+
+# src/mozilla_i18n.c:51
+# ui/preferences.glade.h:22
+
+
+# src/mozilla_i18n.c:56
+
+# src/mozilla_i18n.c:57
+
+# src/mozilla_i18n.c:58
+
+# src/mozilla_i18n.c:59
+
+# src/mozilla_i18n.c:60
+
+# src/mozilla_i18n.c:61
+
+# src/mozilla_i18n.c:62
+
+# src/mozilla_i18n.c:63
+
+# src/mozilla_i18n.c:61
+
+# src/mozilla_i18n.c:65
+
+# src/mozilla_i18n.c:66
+
+# src/mozilla_i18n.c:67
+
+# src/mozilla_i18n.c:69
+
+# src/mozilla_i18n.c:70
+
+# src/mozilla_i18n.c:71
+
+# src/mozilla_i18n.c:72
+
+# src/mozilla_i18n.c:73
+
+# src/mozilla_i18n.c:74
+
+# src/mozilla_i18n.c:75
+
+# src/mozilla_i18n.c:80
+
+# src/mozilla_i18n.c:81
+
+# src/mozilla_i18n.c:82
+
+# src/mozilla_i18n.c:83
+
+# src/mozilla_i18n.c:84
+
+# src/mozilla_i18n.c:90
+
+# src/mozilla_i18n.c:85
+
+# src/mozilla_i18n.c:87
+
+# src/mozilla_i18n.c:88
+
+# src/mozilla_i18n.c:89
+
+# src/mozilla_i18n.c:119
+
+# src/mozilla_i18n.c:92
+
+# src/mozilla_i18n.c:93
+
+# src/mozilla_i18n.c:94
+
+# src/mozilla_i18n.c:95
+
+# src/mozilla_i18n.c:96
+
+# src/mozilla_i18n.c:97
+
+# src/mozilla_i18n.c:98
+
+# src/mozilla_i18n.c:55
+
+# src/mozilla_i18n.c:91
+
+# src/mozilla_i18n.c:99
+
+# src/mozilla_i18n.c:79
+
+# src/mozilla_i18n.c:68
+
+# src/mozilla_i18n.c:100
+
+# src/mozilla_i18n.c:101
+
+# src/mozilla_i18n.c:102
+
+# src/mozilla_i18n.c:103
+
+# src/mozilla_i18n.c:52
+
+# src/mozilla_i18n.c:54
+
+# src/mozilla_i18n.c:104
+
+# src/mozilla_i18n.c:105
+
+# src/mozilla_i18n.c:106
+
+# src/mozilla_i18n.c:107
+
+# src/mozilla_i18n.c:109
+
+# src/mozilla_i18n.c:76
+
+# src/mozilla_i18n.c:77
+
+# src/mozilla_i18n.c:115
+
+# src/mozilla_i18n.c:116
+
+# src/mozilla_i18n.c:117
+
+# src/mozilla_i18n.c:118
+
+# src/mozilla_i18n.c:120
+
+# src/mozilla_i18n.c:121
+
+# src/mozilla_i18n.c:122
+
+# src/mozilla_i18n.c:123
+
+# src/mozilla_i18n.c:124
+
+
+# src/mozilla_i18n.c:109
+
+# src/mozilla_i18n.c:109
+
+# src/mozilla_i18n.c:109
+
+# src/mozilla_i18n.c:109
+
+# ui/preferences.glade.h:28
+
+
+
+
+
+
+
+
+
+
+# src/mozilla/mozilla.cpp:1993
+# src/prefs.c:1069
+# src/prefs_callbacks.c:237
+# src/prefs_callbacks.c:407
+
+# src/history.c:845
+
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+# src/menubar.c:34
+
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ui/epiphany.glade.h:95
+# ui/preferences.glade.h:139
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+
+# src/history.c:845
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/menubar.c:502
+# ui/epiphany.glade.h:163
+
+
+
+
+
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/mozilla/TOCProtocolHandler.cpp:232
+# src/mozilla/TOCProtocolHandler.cpp:316
+# src/mozilla/TOCProtocolHandler.cpp:415
+
+# src/menubar.c:63
+
+# src/menubar.c:150
+
+
+# src/menubar.c:150
+
+
+# src/menubar.c:150
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/mozilla_i18n.c:28
+# ui/preferences.glade.h:41
+
+
+
+
+
+
+
+# ui/preferences.glade.h:178
+
+
+
+# ui/preferences.glade.h:196
+
+# ui/preferences.glade.h:196
+
+
+
+
+# ui/preferences.glade.h:178
+
+
+
+
+
+
+
+
+
+
+# Twijfelgeval: 'Gedownloade bestanden' beter?
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/menubar.c:63
+
+# ui/epiphany.glade.h:121
+
+
+
+# ui/preferences.glade.h:195
+
+
+
+
+# ui/preferences.glade.h:195
+
+# src/menubar.c:54
+
+
+
+# ui/epiphany.glade.h:103
+
+
+
+
+# src/bookmarks_editor.c:981
+
+
+# src/bookmarks_editor.c:981
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+# src/menubar.c:37
+
+# src/menubar.c:38
+
+# src/menubar.c:39
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# src/menubar.c:150
+
+
+
+
+
+
+
+
+
+# src/bookmarks_editor.c:949
+# src/bookmarks_editor.c:1169
+# src/menubar.c:39
+
+
+# src/menubar.c:571
+
+
+# epiphany.desktop.in.h:1
+# sounds/epiphany.soundlist.in.h:1
+# src/dialog.c:135
+# src/mozilla/PromptService.cpp:666
+# src/window.c:191
+# ui/epiphany.glade.h:50
+
+# src/bookmarks_editor.c:981
+
+
+
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:981
+
+# src/bookmarks_editor.c:981
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+
+# ui/preferences.glade.h:195
+
+# src/window_callbacks.c:2194
+
+
+
+
+# src/menubar.c:477
+
+
+
+# src/bookmarks_editor.c:981
+
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/menubar.c:571
+
+# ui/epiphany.glade.h:83
+
+
+# ui/epiphany.glade.h:83
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+
+
+# src/context.c:66
+
+
+# src/menubar.c:468
+# ui/preferences.glade.h:262
+
+
+
+# ui/preferences.glade.h:248
+
+
+
+
+# ui/epiphany.glade.h:149
+
+# ui/epiphany.glade.h:149
+
+# src/menubar.c:208
+
+
+
+# src/menubar.c:165
+
+
+
+
+# src/menubar.c:571
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+
+
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+
+
+# ui/epiphany.glade.h:109
+
+# src/main.c:102
+
+# src/context.c:60
+
+
+
+
+# src/menubar.c:571
+
+
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+
+
+
+
+# ui/preferences.glade.h:157
+
+
+# ui/epiphany.glade.h:53
+
+# src/bookmarks_editor.c:943
+
+# src/bookmarks_editor.c:943
+
+# ui/epiphany.glade.h:51
+
+
+
+
+# src/menubar.c:468
+# ui/preferences.glade.h:262
+
+
+# ui/preferences.glade.h:170
+
+# src/mozcallbacks.c:424
+
+# src/mozcallbacks.c:400
+
+# src/mozcallbacks.c:405
+
+# src/mozcallbacks.c:410
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+# ui/preferences.glade.h:176
+
+# src/menubar.c:150
+
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+# src/bookmarks_editor.c:1056
+
+# src/bookmarks_editor.c:1056
+
+
+
+
+# src/toolbar.c:143
+
+# ui/preferences.glade.h:172
+
+# src/menubar.c:571
+
+# src/menubar.c:150
+
+# src/menubar.c:54
+
+# src/menubar.c:54
+
+# src/menubar.c:64
+
+# src/menubar.c:73
+
+
+
+
+# src/menubar.c:73
+
+# src/menubar.c:68
+
+# src/toolbar.c:131
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+
+# src/menubar.c:39
+
+# src/window.c:985
+
+
+
+
+# src/persistent_data_manager.c:138
+# ui/epiphany.glade.h:94
+
+
+
+
+# ui/preferences.glade.h:142
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# src/toolbar.c:157
+
+# src/toolbar.c:131
+
+
+
+
+
+
+# src/prefs.c:385
+# ui/epiphany.glade.h:36
+
+
+# src/menubar.c:187
+
+
+# src/menubar.c:571
+
+# src/menubar.c:433
+
+# ui/epiphany.glade.h:85
+
+# src/toolbar.c:170
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/epiphany.glade.h:78
+# ui/preferences.glade.h:88
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+# src/menubar.c:208
+
+
+# ui/preferences.glade.h:272
+
+
+
+# src/menubar.c:73
+
+
+# src/menubar.c:73
+
+# ui/preferences.glade.h:272
+
+# src/menubar.c:73
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+# src/menubar.c:150
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# src/menubar.c:160
+
+
+# src/menubar.c:165
+
+# src/main.c:111
+
+# src/menubar.c:416
+
+
+# ui/preferences.glade.h:7
+
+# src/menubar.c:571
+
+
+# src/context.c:71
+
+# ui/epiphany.glade.h:91
+
+# src/context.c:60
+
+# src/context.c:60
+
+# src/context.c:60
+
+# src/context.c:61
+
+# src/context.c:61
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+# src/menubar.c:63
+
+
+# src/context.c:64
+# src/history_callbacks.c:165
+# src/misc_callbacks.c:412
+
+# src/menubar.c:68
+
+
+# src/context.c:1075
+
+# src/context.c:67
+
+# src/context.c:68
+
+
+
+
+
+
+
+
+
+
+# src/mozilla/mozilla.cpp:996
+# src/persistent_data_manager.c:374
+# src/persistent_data_manager.c:609
+
+
+# src/menubar.c:416
+
+# src/context.c:1075
+
+# src/context.c:68
+
+# src/context.c:67
+
+
+
+
+# src/menubar.c:63
+
+# src/context.c:64
+# src/history_callbacks.c:165
+# src/misc_callbacks.c:412
+
+
+
+
+# src/menubar.c:68
+
+
+
+# ui/preferences.glade.h:249
+
+# ui/epiphany.glade.h:126
+# ui/prompts.glade.h:3
+
+# src/menubar.c:502
+# ui/epiphany.glade.h:163
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+# src/menubar.c:63
+
+# src/context.c:67
+
+
+# ui/preferences.glade.h:172
+
+# src/context.c:83
+# src/window_callbacks.c:1149
+# src/window_callbacks.c:2884
+
+# ui/preferences.glade.h:172
+
+
+
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+
+
+
+
+
+
+
+
+# GNOME_epiphany_Automation.oaf.in.h:1
+# epiphany.desktop.in.h:2
+
+#, fuzzy
+
+# src/main.c:134
+# ui/bookmarks.glade.h:41
+# ui/epiphany.glade.h:125
+#, fuzzy
+
+
+
+
+
+# korte label (is net zo duidelijk om 'passend' weg te laten)
+
+# Misschien Evince documentenviewer
+# viewer is ook nederlands
+
+# multipagina-documenten
+
+
+
+
+
+
+# dit zegt bijvoorbeeld: PDF-1.4
+
+
+# gewijzigd/aangepast
+
+
+
+
+
+
+
+
+
+
+# ongeldig/onjuist/foutief
+
+
+
+
+
+
+
+
+
+# was eerst: geen
+
+# deel/onderdeel
+
+
+
+
+# papierformaat heet ook letter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in uw pad/op uw pad
+
+# niet in staat/kon
+
+
+# kleine letters
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+# misschien beter: uit (ipv van): pagina 1 uit 5
+
+# misschien beter: uit (ipv van): pagina 1 uit 5
+
+
+
+# invoeren hier met opzet weggelaten
+
+# niet in staat/kon
+
+# invoeren hier met opzet weggelaten
+
+
+
+
+
+
+
+# Wat wordt hier precies bedoeld?
+
+
+
+
+# overeenkomsten/gevonden/maal/keer gevonden
+
+
+# niet in staat/kon
+
+
+
+
+
+
+# beschikbaar zijn/werken
+# in dit document kan niet worden gezocht
+# De zoekmogelijkheid zal niet in dit document werken
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+# zinsdeel/zin/frase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hele/gehele/complete document
+
+# Duaal is zo'n raar woord
+
+
+
+
+
+# was eerst _best passend, maar gewoon passend is beter.
+# _P wordt gebruikt voor _Presentatie
+
+# de pagina laten passen in het venster
+
+
+# de breedte van de pagina laten passen in het venster
+
+# in overeenstemming met Nautilus: Ga naar
+
+
+
+
+# knoptekst?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# niet in staat/kon
+#, fuzzy
+
+#, fuzzy
+
+# Ctrl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kennis ipv contact?
+# contactadres?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# actie/bewerking/operatie?
+
+
+
+
+
+
+
+
+
+
+# opslaan onder/bewaren in
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mailprogramma?
+
+# Verkiest HTML-mail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Naamloze lijst?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zelfde als Clear?
+
+
+
+
+# ?
+
+
+
+# Motregen/druilerig
+
+
+
+
+
+
+
+
+# Dict:
+# To snow or hail with a mixture of rain.
+# Hail or snow, mingled with rain, usually falling, or driven
+# by the wind, in fine particles.
+
+
+# Dict:
+# A gale of piercingly cold wind, usually accompanied with fine
+# and blinding snow; a furious blast. U. S.
+
+
+# nevel/waas/zweem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'wil ipv verwacht?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit moet kort, anders zie je de aantallen niet meer
+
+
+
+
+
+
+
+# zoekvraag/zoekuitdrukking/zoekopdracht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwerkingsfout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kon geen verbinding maken/kon niet verbinden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# doelbron?
+# mogelijk weglaten: niet in staat om 's' te plannen voor...
+
+# ... is bezet in de geselecteerde periode
+# ... is bezet tijdens 
+
+
+
+
+
+
+
+
+# controleren!
+# Windows gebruikers_naam:
+
+# hierom niet vertaald
+
+
+
+
+
+# postvak in of 'inbox'
+
+
+# hoofdletters omdat het een programmanaam is van MS
+
+
+
+
+# bloot wachtwoord
+# platte tekst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# socket is een technische term
+
+
+
+
+
+
+
+# een dergelijke map bestaat niet
+
+
+
+# verkrijgen
+# ophalen is begrijpelijker
+
+# legen ipv leegmaken?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lokaliseren/vinden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit wordt mijn standaard account
+# dit mijn standaard account maken
+# maak dit mijn standaard account
+
+
+
+
+# De knop heet waarschijnlijk 'Vooruit' als vertaling van 'Forward' (dit
+# halen ze uit gtk+ ?)
+
+
+# uit...halen/van...gebruiken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bespreker
+# recencist
+
+
+
+
+
+# worden gemigreerd (is niet mooi)
+# migreren ook niet
+
+
+
+
+
+
+
+# verzonden/verstuurd
+
+
+
+# wijzigen/veranderen/aanpassen
+
+
+
+
+# zal binnen 7 dagen verlopen
+
+
+
+
+
+
+
+
+# taalfout Engels?:
+# Delete any items
+# (moet zijn Delete any item
+# of Delete all items)
+
+
+
+
+# wat betekent dit?
+
+
+
+# waarschijnlijk: de rechten om te mogen lezen
+
+
+
+
+# Dit is de titelbalk
+
+
+
+# berekenen/verkrijgen/ophalen/lezen/opvragen
+
+
+
+
+# tonen of wijzigen/tonen of aanpassen/tonen of veranderen
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wekkers/alarmen
+
+
+
+
+
+# is dit goed?
+
+# aandacht grijpen/betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+# agendainformatie
+
+
+
+
+
+
+
+
+
+
+# agendanotities/notities
+
+
+
+# agendainformatie
+
+
+
+
+
+
+
+# expand/collapse
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verkleinen ipv herschalen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was eerst: auto-afmaken,
+# maar het gaat er om welke adresboeken worden gebruikt bij het
+# automatisch aanvullen van een adres (als je 3 of meer letters hebt getypt)
+
+
+
+
+
+
+
+
+# vertaling van control hier?
+
+
+# Fout in het Engels: Manager ipv Manage
+
+
+
+
+
+# een nieuwe contactenlijst aanmaken
+
+
+
+# upgraden/opwaarderen
+
+
+
+
+# zoekende/bezig met zoeken/zoeken...
+
+# bezig met downloaden/downloaden...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# onderscheiden naam?
+
+
+
+
+
+
+
+
+
+
+
+
+# wat een technobabble!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was eerst: berichten versturen
+
+
+
+
+
+
+
+
+
+
+# e-mail adres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beheerder
+
+
+
+
+
+# echtgenoot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# foto is beter
+
+# foto is beter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# naar/aan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# berichtenbron/opslagplaats
+
+
+
+# contact niet gevonden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kaart verplaatsen naar
+
+
+
+
+
+
+
+
+
+# contact/kaart
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het gaat om een adresboek, dus alleen boek is wat raar.
+# eigenlijk: adresboek openen is mislukt
+
+
+
+
+
+
+
+
+
+
+
+
+# In normale stand zou er geen optie voor grootte hoeven te zijn.<
+
+# niet letterlijk vertaald
+
+
+
+
+# samenvatting/onderwerp
+
+# samenvatting/onderwerp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bewaren
+# Download in voortgang/bezit met downloaden
+
+
+
+
+
+
+
+
+
+# Als/indien u geen annuleringsbericht (ver)stuurt....dat de bijeenkomst geannuleerd is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels bug. (zie bug 325831)
+
+
+
+
+# bericht versturen/zenden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of: kalender-/taakbeheer
+
+
+
+
+
+
+
+# uur is beter: 5 uur en 10 minuten
+
+
+
+
+
+
+
+# wekkers/alarmen/alarmeringen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ?
+
+
+
+
+
+
+
+
+
+
+
+# wekkertijd/alarmtijd
+
+
+
+
+
+
+
+
+
+
+
+
+# wat een rotzin!
+
+# engels: zin klopt niet:
+# Position of the horizontal pane, between the view and the date navigator
+# calendar and task list in the month view, in pixels.
+
+
+
+
+# Programma's die kunnen fungeren als deel van een alarm
+
+
+
+
+
+
+
+# FIXME: dit moet duidelijker
+# weergavepaneel/voorbeeldpaneel
+
+# BUG, betere vertaling
+
+
+
+
+
+
+
+
+# tijdverdeling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# onderwerp/samevatting
+
+
+
+
+
+
+
+
+
+
+
+# maken ipv aanmaken hier beter
+
+
+
+
+
+
+
+# Combinatietoets is Shift+Ctrl+E
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wekker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meervoudsvorm?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# standaard wordt dit aangevuld tot:
+# Herinnering geven [15] [minuten] voor het begin van elke afspraak
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weggooien beter dan vergeten
+
+
+
+
+
+
+# verloopdatum?
+
+
+
+
+
+
+
+
+# sneltoets moet k zijn
+
+
+# bijlage toevoegen/bestand bijvoegen
+
+
+# te tonen/verbergen | aan/uit te zetten
+
+
+
+
+
+
+
+# samenvatting/onderwerp
+
+
+
+
+
+
+
+
+
+
+
+
+# u geen recht hiertoe heeft
+
+
+
+
+
+
+
+
+
+
+
+# wekkers/alarmen
+
+
+
+# delegatee: One to whom something is delegated.
+# Meervoud: gedelegeerden (zelfde als delegates)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangepast alarmeringsgeluid?
+
+
+
+
+
+# de a wordt gebruikt voor _annuleren, de m bij omschrijving
+
+
+
+# delegatee: One to whom something is delegated.
+
+
+# bezoeker/aanwezige/persoon
+
+
+
+
+
+
+
+
+
+
+
+# meervoud beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Er wordt hier 'welke' bedoeld en niet wat.
+# Verderop staan de mogelijkheden:
+# 'Only this instance, all instances etc.
+# gebeurtenis/agendanotitie
+# een .. die herhaaldelijk voorkomt
+# die zich herhaalt
+# terugkerende ..
+
+# Er wordt hier welke bedoeld ipv wat
+# overdragen/delegeren
+
+# Er wordt hier welke bedoeld ipv wat
+
+# Er wordt hier welke bedoeld ipv wat
+
+# alleen deze keer/instantie/(weglaten)
+
+# deze keer en vorige keren/instanties
+# deze, en die in het verleden
+
+# deze en die in de toekomst
+# deze en de komende keren
+
+# alle instanties/allen/alle keren
+
+
+
+
+
+# enkelvoud van seconden (dus niet 'tweede')
+
+
+
+
+
+
+
+
+
+
+# agendanotities/gebeurtenissen/instanties
+
+
+
+
+
+
+
+
+
+
+
+
+# overige/diversen
+
+
+
+
+
+
+
+
+
+# taken/taak
+
+# takendetails/taakdetails
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# instantie/gebeurtenis
+
+
+
+
+
+
+# hoe laat/tijd/wanneer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Lees/beschouw/bekijk
+
+
+
+# afgezegd/geweigerd/afgewezen
+
+# met punt op het einde
+
+# met punt op het einde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toevoegen als komt/aanwezige/aanwezig
+
+
+
+
+
+
+
+
+# afzeggen/weigeren/afwijzen
+
+
+
+
+
+
+
+
+
+# melding/bericht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bezig/in uitvoer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geselecteerde memo's verwijderen/verwijder de ..
+
+
+
+
+
+
+
+
+
+
+
+
+# de/een
+
+
+
+
+
+# enkelvoud is mooier (voor het label)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# a=afgekorte weekdag, b=afgekorte maandnaam d=dag vd maand als getal
+
+
+
+
+
+
+
+
+# samenvatting/onderwerp
+
+
+# urgentie/prioriteit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 1 uitroepteken is voldoende
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verzenden/versturen
+# aan/naar
+
+
+
+
+
+
+
+# sneltoets moet k zijn
+
+# sneltoets moet k zijn
+
+
+
+
+
+
+# een nieuw bericht opstellen/stel een nieuw bericht op
+
+# # Het origineel heeft <b> in plaats van </b>
+
+#  waarschijnlijk: a few ipv few
+# BUG extra spatie aan begin en einde van zin
+
+
+
+
+# vanwege
+
+
+
+
+
+# terugvinden
+
+
+
+# was eerst: terugkrijgen;
+# maar dan zou je kunnen denken dat ze naar je worden teruggezonden
+
+# download is in voortgang.
+
+
+
+
+
+
+# adresselectievenster
+# adresselectiepaneel
+
+
+
+
+
+
+
+
+
+
+
+# agendainformatie
+
+
+
+
+
+# leesbevestiging
+
+# het bericht/een bericht
+# altijd een leesbevestiging terugsturen
+# Altijd terugmelden dat het bericht is gelezen
+
+# Mij vragen of ik wil terugmelden dat het bericht is gelezen
+# Eerst vragen (aan wie dan?)
+# Toestemming vragen (zelfde probleem)
+# het bericht/een bericht
+
+
+
+# leesbevestiging
+
+# Engels: not to me personally (moet ws zijn not to an individual person oid)
+
+# ontvangstbevestiging/leesbevestiging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ouders/referenties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# E-mailaccounts / E-mail-accounts / E-mail accounts
+
+
+# mail?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was eerst Taal / Talen
+# maar dat is niet mooi, gewoon Taal van gemaakt, is duidelijk genoeg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# map wordt gekopieerd
+
+
+
+
+
+
+# mappen in %s worden gescannd/doorzocht/gelezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Niet ondertekend of positief getal?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# overtijd
+
+
+
+
+
+# in moeten worden opgeslagen / worden opgeslagen
+
+# "selectie opslaan" is in principe fout, maar we kijken aan of het problemen oplevert.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'vorige versie' gebruikt ipv 'vorige installatie'
+
+
+
+
+# verzenden naar...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# manier van doorsturen
+
+
+
+
+# standaard manier van antwoorden
+
+
+
+
+
+
+
+
+# cursor modus aan/uit
+# activeren/deactiveren
+# (de)activeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Logbestand waarin filteracties worden gelogt
+
+
+
+
+
+
+
+
+
+
+
+# Nieuwe mail melding geluidsbestand
+# geluid voor/bij nieuw bericht
+
+
+
+
+
+
+
+
+
+
+
+
+
+# arriverende/binnenkomende
+
+# standaard email als HTML versturen
+
+
+# filmpjes weergeven
+
+
+
+
+
+
+
+
+
+# console ipv terminal?
+
+
+
+
+
+# boomstructuur voor berichtenlijst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# In menu Nieuw
+# _b wordt gebruikt voor adres_boek
+# _e voor bij_eenkomst
+
+
+
+
+
+# upgraden/vernieuwen/bijwerken
+
+
+
+
+
+
+
+
+# enkelvoud is beter hier.
+# het gaat om een stukje tekst of een plaatje onderaan je e-mail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# leesbevestiging/ontvangstbevestiging
+
+
+
+
+
+
+
+# enkelvoud is beter.
+# Dit is het tab-label bij voorkeuren->bericht opstellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Afbeeldingen ophalen als de afzender in het adresboek staat
+# Afbeeldingen laden in e-mail van bekenden
+# (let op dat er ook een gconf-sleutel is waar dezelfde termen in voorkomen)
+
+
+
+
+
+
+
+
+
+# filmpjes weergeven
+
+
+
+
+
+
+# Digitaal != Electronisch
+# Electronisch wordt meer gebruikt
+
+
+
+
+
+# aanmerken/vlaggen/markeren
+
+
+
+
+
+
+
+
+# verloopt/verloopdatum
+
+
+
+
+
+
+
+# bezig met %s pingen
+# %s wordt nu gepingd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit moet kort anders wordt het afgekort met ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wachtwoord invoeren
+
+
+
+
+# spool/wisselmap/tijdelijke opslagmap/doorgeefmap
+
+# klopt de engelse zin wel?
+
+
+
+
+
+# actualiseren/bijwerken
+
+
+
+
+
+
+
+
+
+
+
+
+
+# remove hier 'weggooien' omdat er anders twee keer verwijderen staat
+
+
+
+
+
+# vanwege
+
+# vanwege
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of uw wachtwoord juist is ingevoerd/juist is/correct is
+# (gespeld is lelijk en onnodig hier)
+
+
+
+
+
+
+# deactiveren/uitzetten
+
+
+
+
+# wachtwoord invoeren
+
+
+
+
+
+# regulier/normaal
+
+
+
+# als/indien
+# doorgaat/verdergaat/doorzet
+
+# als
+
+# als
+
+
+
+
+
+
+
+
+# gegeven/geselecteerd
+
+
+
+# vrij vertaald
+# misschien nog tussenvoegen: probeer _het bericht_ via een ander...
+
+
+
+# een naam die niet eerder is gebruikt/niet ergens anders is gebruikt
+
+
+
+
+# bevraagd voor/gevraagd om
+
+
+
+
+# is dit de juiste betekenis?
+
+
+
+
+
+
+# postvak uit/outbox
+
+
+
+# niet actief is/niet is geactiveerd/niet is aangezet
+
+# vrij vertaald, was eerst: omdat u geen geadresseerden heeft opgegeven.
+# maar het is duidelijker als er staat dat het adresveld leeg is.
+# verzendadres/adres
+
+
+
+# worden aangemerkt/beschouwd/gemarkeerd
+
+
+
+
+
+
+
+
+
+
+# opgeven/aangeven/geven
+
+
+# BUG? twee keer "{0}" in bericht?
+
+
+
+
+# Opschonen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# allen is korter dan iedereen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hier kalender ipv agenda?
+
+# hier kalender ipv agenda?
+
+
+
+# kopieren-tool/kopie-tool
+
+
+
+
+# standaard manier van antwoorden
+
+
+
+
+
+
+
+
+
+
+
+# assistent delegeren/delegeren assistent
+
+
+
+
+
+
+
+
+
+# dat soort dingen wilt doen/dat soort bewerkingen wilt uitvoeren
+
+
+
+# op map van anderen/andermans map
+
+# mapabonnement opzeggen
+
+
+
+
+
+
+
+
+
+# kon niet aanmelden bij server.
+
+
+
+
+
+
+
+
+
+
+
+# BUG: extra spatie op einde?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# quotum verbruikt/bereikt
+
+
+
+
+# verzenden/versturen
+
+# verzenden/versturen
+
+
+
+
+
+# op taken van anderen/andermans taken
+
+
+# opzeggen van abbonnement op map s
+
+
+# Abonnement afmelden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# alarmering/wekker/alarmmelding
+
+# herinnering/alarmering/aandachtvestiging
+
+
+
+
+
+
+# ingesteld/actief gemaakt/geactiveerd/aangezet
+
+# ingesteld/actief gemaakt/geactiveerd/aangezet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# todo/te doen/actielijst
+
+
+
+# Deze bijeenkomst conflicteert met een afspraak in de agenda %s/
+# Een afspraak in de agenda %s conflicteert met deze bijeenkomst
+# valt gelijk met/conflicteert met
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#   : ipv .
+
+
+
+
+
+
+
+
+# ":" ipv "."
+
+# ":" ipv "."
+
+
+# ":" ipv "."
+
+
+
+
+
+
+
+
+
+
+
+
+# bv: a krijgt nu taak T1 en b krijgt taak T2
+# verdelen van taken/toewijzen van taken/taakverdeling
+
+
+
+
+
+# afzeggen/weigeren/afwijzen
+
+
+
+
+
+
+
+
+
+# op ieder geval/elk geval/alle keren   toepassen
+
+
+# itip-formatteringsprogramma
+
+
+
+
+
+# toestaan/mogelijk maken
+
+
+
+
+
+
+
+# e-mail op afstand
+# Externe e-mail
+
+
+
+# e-mail -> bijeenkomst
+# e-mail wordt bijeenkomst
+#        maakt
+
+
+
+# e-mail naar taak
+#        wordt
+#        ->
+
+
+
+
+
+
+
+
+
+
+# abonnement op lijst opzeggen
+
+
+
+
+
+
+# mogelijkerwijs/mogelijk/misschien/wellicht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# offline weergave/gebruik
+
+
+
+
+
+
+
+
+
+# beheerder
+
+# of/en (of is beter)
+# activeren/deactiveren
+
+
+
+
+
+# modus weglaten?
+
+# liever gewone tekst
+# heeft voorkeur voor gewone tekst
+# voorkeur voor gewone tekst
+
+
+
+# ooit eens?
+
+
+
+
+# betere vertaling: profileren/
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Windows share wel of niet vertalen.
+
+
+
+
+
+
+
+
+# Engels fout: spatie tussen einde zin en ...:
+# Save Attachments ...
+
+
+# huh?
+
+
+# T is de huidige tijd (H M S)
+# F is format?
+
+
+
+
+
+
+
+
+
+
+
+# bijsluiten/invoegen
+
+# letterlijk: waardebegrenser, maar het gaat om het teken
+# waarmee de variabelen worden gescheiden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Forward wordt in gtk+ vertaald met Volgende
+
+
+
+
+
+# discussieweergave/boom
+
+# als/met
+# discussieweergave op onderwerp/per onderwerp
+
+
+
+
+
+
+
+
+# zijpaneel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# te werken/te gaan werken
+# met een netwerkverbinding/online
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bah: importeerder
+
+
+# Een bestand selecteren
+
+
+
+
+
+
+
+# geforceerd laten stoppen/doen stoppen
+
+# Geforceerd migreren van Evolution 1.4
+
+
+
+
+
+
+
+
+
+
+
+# kunnen we niet gewoon de hele map 'evolution' verwijderen ipv de inhoud?
+
+
+
+
+
+# weggooien is wellicht beter dan vergeten?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# volgens wikiepedia is encipherment hetzelfde als encryptiealgoritme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geadresseerden
+
+# naar contact
+
+# naar een ander
+
+
+# stop/stoppen
+
+
+
+
+
+
+
+# kaart verplaatsen naar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beschikbare niet meevertaald
+
+
+
+
+
+# Classificeren/aanmerken
+
+# open/openlijk/publiek/doorzichtig/openbaar
+
+
+
+# Maak deze gebeurtenis herhalend/een (zich) herhalende gebeurtenis
+# Deze gebeurtenis herhalen/laten herhalen/laten terugkomen
+
+
+
+
+# bezet mooier dan bezig
+# periode tonen/weergeven als bezet
+
+
+
+
+
+
+
+
+
+# ingeplande tijd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meervoud is beter hier
+
+# berichtenweergave/berichten weergeven/bericht weergeven/
+# berichtweergave
+
+
+
+
+# beter dan berichtvoorbeeldvenster
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanmerken als ongelezen/Berichten als _gelezen markeren<
+
+
+# Bug: kan dit beter? twee keer 'verwijderen'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# _o wordt gebruikt voor V_olgende
+
+
+
+
+# voor redactiewerk/om te bewerken
+
+
+
+# in map plaatsen/naar map versturen/naar map posten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# volledige/complete
+
+
+
+
+
+
+
+# de _v wordt gebruikt voor _voorkeuren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de memo kopieren
+
+# de memo kopieren
+
+# de memo verwijderen
+
+# de memo plakken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geef hoge prioriteit/prioriteit instellen/berichtprioriteit instellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# post uit / in
+# postbezorging
+# post bezorgen
+
+# post uit / in
+# postbezorging
+# post bezorgen
+
+
+
+
+
+
+# opsturen/insturen
+
+
+
+
+
+
+
+
+
+# Reeds gebruikte sneltoetsen:
+# _Nieuw
+# Nieu_w venster
+# V_ersturen
+# Afdruk_voorbeeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was: Alle keren<
+
+
+
+
+
+
+# enkelvoud is mooier (voor het label)
+
+
+
+
+
+
+
+
+
+# hier kalender ipv agenda?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kalender, geen agenda
+
+
+
+
+
+
+
+
+
+
+
+
+# bewaren/opslaan
+# bewaren is hier mooier
+
+
+
+
+
+
+
+# synchroniseren is waarschijnlijk te lang?
+
+# synchroniseren is waarschijnlijk te lang?
+
+# was: Categorien actualiseren (best mooi maar is het de juiste betekenis?)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Berzorgingsmelding
+
+
+
+
+
+
+
+# Niets/Geen
+
+
+
+
+
+# Indien ge_accepteerd:
+# bij acceptatie/accepteren/aannemen/aanname
+
+# voltooiing/voltooien
+
+# bij afwijzing
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertalen of niet?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# naar beneden/neerwaarts/neerwaarts verplaatsen
+
+
+
+
+
+
+# dan op/daarna op
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tekens gebruikt, omdat een + wel een expander is maar een - niet.
+
+
+
+
+# actieverwerking
+
+
+
+
+
+
+
+
+
+
+# is dit de juiste betekenis?
+
+
+
+
+
+
+# verschuiving/afwijking
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# rechten/toegangsrechten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# rechten: mag dit wel/niet doen
+# mogelijkheid: kan dit wel/niet doen
+
+# vergadering/bijeenkomst/afspraak
+
+
+
+
+
+
+
+# toegangsrechten/rechten/toegang
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# 'trying to' niet meevertaald
+
+
+
+# ongeldig/onjuist
+
+
+
+
+
+
+# een beetje vrij vertaald.
+
+# al geabonneerd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# actieve/aangemeldde/?
+
+
+
+
+
+
+
+# aangemeld/ingelogd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is s hier de naam van het scherm, of de foutmelding die verschijnt?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kon niet worden/werd
+
+
+# zijn/worden niet ondersteunden
+
+
+
+
+
+# gestuurd/verstuurd
+
+
+
+
+# indicator = pictogram?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ui/galeon.glade.h:63
+
+
+# ui/galeon.glade.h:51
+
+
+
+
+# src/context.c:87
+
+# src/context.c:87
+
+
+# src/bookmarks_editor_dnd.c:481
+# src/bookmarks_menus_callbacks.c:296
+# src/bookmarks_menus_callbacks.c:314
+
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+# src/context.c:64
+# src/history_callbacks.c:165
+# src/misc_callbacks.c:412
+
+# src/menubar.c:571
+
+# src/bookmarks_editor.c:970
+
+# src/bookmarks_menus.c:495
+
+# src/bookmarks_menus.c:507
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# src/bookmarks_editor.c:1033
+# src/bookmarks_menus.c:529
+
+# ui/bookmarks.glade.h:30
+
+# src/bookmarks_editor_dnd.c:481
+# src/bookmarks_menus_callbacks.c:296
+# src/bookmarks_menus_callbacks.c:314
+
+# ui/bookmarks.glade.h:16
+# ui/galeon.glade.h:45
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+
+# ui/bookmarks.glade.h:30
+
+# src/bookmarks_editor.c:1024
+# src/bookmarks_editor.c:1171
+# src/bookmarks_menus.c:559
+
+# ui/bookmarks.glade.h:6
+
+# src/window.c:985
+
+# src/context.c:75
+
+
+# ui/bookmarks.glade.h:18
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1106
+
+# src/bookmarks_editor.c:1106
+
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+
+# src/newuser_callbacks.c:537
+
+
+
+
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1111
+
+
+# ui/bookmarks.glade.h:18
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1106
+
+# src/bookmarks_editor.c:1106
+
+
+# ui/galeon.glade.h:146
+
+# src/bookmarks_editor.c:981
+
+# src/bookmarks_menus_callbacks.c:648
+
+# ui/bookmarks.glade.h:14
+
+
+# ui/preferences.glade.h:29
+
+
+# ui/galeon.glade.h:34
+
+# ui/bookmarks.glade.h:14
+
+
+# src/newuser_callbacks.c:537
+
+
+# src/newuser_callbacks.c:537
+
+
+
+# src/bookmarks_editor.c:1111
+
+# src/bookmarks_editor.c:1111
+
+# src/netscape.c:155
+
+# src/netscape.c:393
+
+# src/bookmarks_editor.c:1106
+
+
+# src/newuser_callbacks.c:537
+
+# src/context.c:75
+
+# ui/preferences.glade.h:34
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+
+
+
+
+
+
+
+# ui/galeon.glade.h:120
+
+
+
+# src/context.c:1075
+
+# src/context.c:67
+
+# src/context.c:67
+
+# src/context.c:80
+
+
+# ui/preferences.glade.h:184
+
+
+
+# src/menubar.c:518
+
+# ui/preferences.glade.h:207
+
+
+
+
+# GNOME_Galeon_Automation.oaf.in.h:1
+# galeon.desktop.in.h:2
+
+# src/menubar.c:406
+
+# src/menubar.c:406
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+# ui/bookmarks.glade.h:45
+
+
+# ui/preferences.glade.h:15
+
+# ui/preferences.glade.h:217
+
+# ui/preferences.glade.h:18
+
+# ui/preferences.glade.h:218
+
+
+
+
+
+
+
+# ui/galeon.glade.h:25
+
+# src/menubar.c:494
+# ui/galeon.glade.h:143
+
+
+# ui/preferences.glade.h:232
+
+# ui/preferences.glade.h:232
+
+
+
+
+
+
+# ui/preferences.glade.h:134
+
+
+# ui/preferences.glade.h:137
+
+
+
+# ui/preferences.glade.h:275
+
+
+# ui/galeon.glade.h:146
+
+
+
+
+# ui/preferences.glade.h:236
+
+# ui/preferences.glade.h:236
+
+# ui/preferences.glade.h:227
+
+
+# src/downloader.c:206
+
+
+# src/toolbar.c:248
+
+
+
+# ui/galeon.glade.h:76
+
+# ui/galeon.glade.h:76
+
+# ui/preferences.glade.h:83
+
+
+
+
+# ui/galeon.glade.h:157
+
+
+
+
+# ui/preferences.glade.h:245
+
+# ui/preferences.glade.h:245
+
+
+
+# ui/preferences.glade.h:107
+
+
+# src/bookmarks_menus.c:442
+
+# ui/preferences.glade.h:278
+
+# src/menubar.c:54
+
+
+# ui/preferences.glade.h:19
+
+# ui/preferences.glade.h:129
+
+# src/bookmarks_menus.c:569
+# src/history_callbacks.c:153
+# src/misc_callbacks.c:404
+
+
+
+
+# src/toolbar.c:287
+
+
+
+
+
+
+
+
+# src/bookmarks_menus.c:442
+
+
+
+
+
+# ui/preferences.glade.h:131
+
+# src/menubar.c:332
+
+
+
+
+# ui/preferences.glade.h:176
+
+# ui/preferences.glade.h:176
+
+# src/main.c:111
+
+# src/main.c:111
+
+
+
+
+# src/main.c:111
+
+# src/main.c:111
+
+# src/main.c:111
+
+# src/main.c:111
+
+
+
+# src/main.c:111
+
+# src/main.c:111
+
+
+# ui/preferences.glade.h:64
+
+
+
+# ui/preferences.glade.h:199
+
+# ui/preferences.glade.h:199
+
+
+
+# src/downloader.c:206
+
+
+
+# src/menubar.c:54
+
+# ui/galeon.glade.h:126
+# ui/prompts.glade.h:3
+
+# ui/galeon.glade.h:126
+# ui/prompts.glade.h:3
+
+
+
+# src/menubar.c:519
+
+# src/menubar.c:519
+
+
+
+
+
+
+
+# src/menubar.c:243
+
+
+
+
+# src/menubar.c:79
+
+
+
+# src/menubar.c:443
+
+
+
+
+# src/netscape.c:393
+
+
+
+# src/menubar.c:41
+
+
+
+
+
+
+
+
+# src/mozilla/ExternalProtocolService.cpp:129
+
+# bestanden  is hier overbodig
+# ui/galeon.glade.h:157
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet in staat te
+# kon niet
+# kan niet
+# ...is mislukt
+
+
+# src/mozilla/FilePicker.cpp:323
+# src/mozilla/FilePickerGfs.cpp:514
+# src/mozilla/FilePickerGfs.cpp:603
+
+# src/mozilla/MyportalProtocolHandler.cpp:221
+
+# src/misc.c:144
+
+# src/bookmarks_editor.c:1056
+
+
+
+
+# src/toolbar.c:286
+
+# src/mozilla_prefs.c:61
+
+# src/mozilla_i18n.c:44
+
+# src/mozilla_i18n.c:46
+
+# src/mozilla_i18n.c:49
+
+# src/mozilla_i18n.c:50
+
+# src/mozilla_i18n.c:54
+
+# src/mozilla_i18n.c:51
+# ui/preferences.glade.h:22
+
+
+# src/mozilla_i18n.c:56
+
+# src/mozilla_i18n.c:57
+
+# src/mozilla_i18n.c:58
+
+# src/mozilla_i18n.c:59
+
+# src/mozilla_i18n.c:60
+
+# src/mozilla_i18n.c:61
+
+# src/mozilla_i18n.c:62
+
+# src/mozilla_i18n.c:63
+
+# src/mozilla_i18n.c:61
+
+# src/mozilla_i18n.c:65
+
+# src/mozilla_i18n.c:66
+
+# src/mozilla_i18n.c:67
+
+# src/mozilla_i18n.c:69
+
+# src/mozilla_i18n.c:70
+
+# src/mozilla_i18n.c:71
+
+# src/mozilla_i18n.c:72
+
+# src/mozilla_i18n.c:73
+
+# src/mozilla_i18n.c:74
+
+# src/mozilla_i18n.c:75
+
+# src/mozilla_i18n.c:80
+
+# src/mozilla_i18n.c:81
+
+# src/mozilla_i18n.c:82
+
+# src/mozilla_i18n.c:83
+
+# src/mozilla_i18n.c:84
+
+# src/mozilla_i18n.c:90
+
+# src/mozilla_i18n.c:85
+
+# src/mozilla_i18n.c:87
+
+# src/mozilla_i18n.c:88
+
+# src/mozilla_i18n.c:89
+
+# src/mozilla_i18n.c:119
+
+# src/mozilla_i18n.c:92
+
+# src/mozilla_i18n.c:93
+
+# src/mozilla_i18n.c:94
+
+# src/mozilla_i18n.c:95
+
+# src/mozilla_i18n.c:96
+
+# src/mozilla_i18n.c:97
+
+# src/mozilla_i18n.c:98
+
+# src/mozilla_i18n.c:55
+
+# src/mozilla_i18n.c:91
+
+# src/mozilla_i18n.c:99
+
+# was eerst Farsi
+# src/mozilla_i18n.c:79
+
+# src/mozilla_i18n.c:68
+
+# src/mozilla_i18n.c:100
+
+# src/mozilla_i18n.c:101
+
+# src/mozilla_i18n.c:102
+
+# src/mozilla_i18n.c:103
+
+# src/mozilla_i18n.c:52
+
+# src/mozilla_i18n.c:54
+
+# src/mozilla_i18n.c:104
+
+# src/mozilla_i18n.c:105
+
+# src/mozilla_i18n.c:106
+
+# src/mozilla_i18n.c:107
+
+# src/mozilla_i18n.c:109
+
+# src/mozilla_i18n.c:76
+
+# src/mozilla_i18n.c:77
+
+# src/mozilla_i18n.c:115
+
+# src/mozilla_i18n.c:116
+
+# src/mozilla_i18n.c:117
+
+# src/mozilla_i18n.c:118
+
+# src/mozilla_i18n.c:120
+
+# src/mozilla_i18n.c:121
+
+# src/mozilla_i18n.c:122
+
+# src/mozilla_i18n.c:123
+
+# src/mozilla_i18n.c:124
+
+# src/mozilla_i18n.c:78
+
+# src/mozilla_i18n.c:110
+
+# src/mozilla_i18n.c:111
+
+# src/mozilla_i18n.c:112
+
+# src/mozilla_i18n.c:113
+
+# src/mozilla_i18n.c:90
+
+# src/mozilla_i18n.c:114
+
+# ui/preferences.glade.h:196
+
+# src/mozilla_prefs.c:284
+# ui/preferences.glade.h:56
+
+# sounds/galeon.soundlist.in.h:2
+
+
+# src/toolbar.c:170
+
+# src/toolbar.c:170
+
+
+
+# naar mijn startpagina gaan
+# ui/preferences.glade.h:172
+
+# ui/preferences.glade.h:172
+
+# ui/preferences.glade.h:172
+
+# src/toolbar.c:143
+
+
+# src/context.c:60
+
+# ui/preferences.glade.h:161
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+
+
+
+# achterwaards
+
+# woorwaards
+# src/context.c:57
+# src/toolbar.c:117
+
+
+# src/main.c:102
+
+# ui/galeon.glade.h:90
+
+
+
+
+# ui/preferences.glade.h:172
+
+# src/toolbar.c:221
+# ui/preferences.glade.h:183
+
+
+
+
+# src/menubar.c:50
+
+
+# 'eigen stijl' ipv gebruikers-stijl?
+
+
+
+# ui/preferences.glade.h:184
+
+
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+# src/main.c:102
+
+# src/main.c:105
+
+# src/main.c:108
+
+# src/main.c:111
+
+# src/main.c:114
+
+# src/main.c:125
+
+# src/main.c:136
+
+# src/main.c:140
+
+# src/main.c:143
+
+
+# ui/galeon.glade.h:63
+
+
+
+
+
+# src/menubar.c:38
+
+# src/context.c:67
+
+# src/menubar.c:64
+
+
+
+# src/toolbar.c:131
+
+# src/context.c:80
+
+# ui/preferences.glade.h:134
+
+# src/menubar.c:34
+
+# src/context.c:71
+
+# src/context.c:71
+
+# src/main.c:102
+
+# src/context.c:72
+
+# src/main.c:102
+
+# src/context.c:73
+
+# src/toolbar.c:131
+
+# src/toolbar.c:131
+
+# src/main.c:102
+
+# src/main.c:102
+
+# src/context.c:62
+# src/history_callbacks.c:159
+# src/misc_callbacks.c:408
+
+
+
+# src/menubar.c:433
+
+# src/menubar.c:68
+
+# mogelijk:
+# een mail versturen met uw...
+# een bericht versturen met uw...
+
+
+
+# src/context.c:1075
+
+# src/context.c:65
+
+# src/context.c:65
+
+# src/main.c:102
+
+# src/context.c:66
+
+# src/main.c:102
+
+# src/context.c:1075
+
+# src/context.c:68
+
+# src/menubar.c:64
+
+
+
+
+
+
+
+# src/context.c:1075
+
+
+
+
+# ui/preferences.glade.h:63
+
+# src/prefs.c:363
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+
+
+# ui/preferences.glade.h:29
+
+
+
+
+# src/menubar.c:54
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+# ui/galeon.glade.h:123
+
+# ui/galeon.glade.h:80
+
+
+
+
+
+
+
+
+# ui/galeon.glade.h:109
+
+# src/mozcallbacks.c:405
+
+# src/window.c:1237
+
+# src/mozcallbacks.c:400
+
+# src/mozcallbacks.c:405
+
+# src/mozcallbacks.c:410
+
+
+# src/menubar.c:498
+
+# src/prefs.c:385
+# ui/galeon.glade.h:36
+
+
+# src/menubar.c:494
+# ui/galeon.glade.h:143
+
+# ui/preferences.glade.h:14
+
+# src/context.c:60
+
+# src/main.c:102
+
+# src/main.c:102
+
+# src/menubar.c:203
+
+# src/menubar.c:68
+
+# src/toolbar.c:131
+
+# ui/galeon.glade.h:157
+
+# src/menubar.c:73
+
+# src/menubar.c:37
+
+# src/menubar.c:39
+
+# ui/galeon.glade.h:171
+
+
+
+# src/persistent_data_manager.c:138
+# ui/galeon.glade.h:94
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# ui/galeon.glade.h:80
+
+
+
+
+
+
+
+
+# src/menubar.c:518
+
+
+# src/menubar.c:518
+
+# src/menubar.c:518
+
+
+
+
+
+
+
+# src/mozilla/MyportalProtocolHandler.cpp:221
+
+# src/mozilla/MyportalProtocolHandler.cpp:221
+
+
+
+# src/menubar.c:433
+
+
+
+# src/menubar.c:443
+
+# src/menubar.c:208
+
+
+
+
+# ui/preferences.glade.h:272
+
+# src/bookmarks_menus.c:462
+
+# src/main.c:102
+
+
+# src/context.c:71
+
+# src/menubar.c:540
+
+
+
+# src/menubar.c:43
+
+# ui/preferences.glade.h:272
+
+# src/menubar.c:73
+
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# src/menubar.c:571
+
+# src/menubar.c:443
+
+
+# src/bookmarks_toolbars.c:877
+# src/bookmarks_toolbars.c:961
+
+
+# src/menubar.c:406
+
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+# src/menubar.c:416
+
+
+# ui/preferences.glade.h:218
+
+
+# ui/preferences.glade.h:249
+
+# ui/preferences.glade.h:249
+
+# ui/preferences.glade.h:118
+
+
+# ui/preferences.glade.h:218
+
+# ui/preferences.glade.h:217
+
+# ui/preferences.glade.h:6
+
+
+# ui/preferences.glade.h:255
+
+# ui/preferences.glade.h:254
+
+
+
+
+
+
+
+
+
+# src/menubar.c:443
+
+# src/menubar.c:443
+
+
+
+
+# src/context.c:60
+
+# ui/galeon.glade.h:83
+
+# ui/galeon.glade.h:46
+
+# ui/galeon.glade.h:120
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# quirks?
+
+# ui/preferences.glade.h:131
+
+
+
+# src/menubar.c:64
+
+
+# src/menubar.c:64
+
+
+
+
+
+
+
+# src/menubar.c:416
+
+
+
+
+
+# src/menu_callbacks.c:399
+
+# src/menu_callbacks.c:405
+
+# src/menu_callbacks.c:428
+
+# src/newuser_callbacks.c:537
+
+# ui/preferences.glade.h:144
+
+# ui/bookmarks.glade.h:26
+
+# ui/bookmarks.glade.h:31
+
+# ui/bookmarks.glade.h:48
+
+
+# ui/bookmarks.glade.h:12
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# src/menubar.c:380
+
+# ui/preferences.glade.h:50
+
+# tekensetsrc/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+
+# ui/preferences.glade.h:50
+
+# tekensetsrc/menu_callbacks.c:1286
+
+
+# ui/galeon.glade.h:85
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# ui/bookmarks.glade.h:48
+
+# ui/bookmarks.glade.h:2
+
+# ui/bookmarks.glade.h:17
+
+# src/newuser_callbacks.c:537
+
+# src/menubar.c:571
+
+# ui/preferences.glade.h:207
+
+# src/bookmarks_menus.c:462
+
+# ui/preferences.glade.h:50
+
+
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+# ui/galeon.glade.h:83
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+# src/menubar.c:494
+# ui/galeon.glade.h:143
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+# src/menubar.c:494
+# ui/galeon.glade.h:143
+
+
+
+
+
+
+# src/menubar.c:150
+
+# beschrijving toegevoegd aan 8859-15 omdat de meesten niet weten wat het is.
+
+# ui/bookmarks.glade.h:17
+
+# ui/bookmarks.glade.h:45
+
+
+
+# ui/preferences.glade.h:50
+
+# src/context.c:64
+# src/history_callbacks.c:165
+# src/misc_callbacks.c:412
+
+
+
+
+# ui/bookmarks.glade.h:5
+
+# src/bookmarks_menus.c:462
+
+# ui/bookmarks.glade.h:7
+
+# ui/bookmarks.glade.h:8
+
+# src/menubar.c:54
+
+# src/menubar.c:54
+
+# ui/bookmarks.glade.h:7
+
+# src/bookmarks_editor.c:1024
+# src/bookmarks_editor.c:1171
+# src/bookmarks_menus.c:559
+
+
+# src/menubar.c:442
+
+
+
+
+
+# ui/galeon.glade.h:82
+
+# src/context.c:999
+
+# src/bookmarks_editor.c:1046
+
+# ui/bookmarks.glade.h:6
+
+
+# ui/galeon.glade.h:81
+
+# ui/galeon.glade.h:82
+
+
+
+
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# ui/galeon.glade.h:81
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# ui/galeon.glade.h:82
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# src/bookmarks_editor_callbacks.c:708
+# ui/bookmarks.glade.h:36
+
+# src/bookmarks_editor.c:965
+
+# src/bookmarks_editor.c:1042
+
+# src/bookmarks_editor.c:1038
+
+# ui/bookmarks.glade.h:23
+
+# ui/bookmarks.glade.h:24
+
+# src/bookmarks_editor.c:974
+
+# src/bookmarks_editor.c:970
+
+# src/bookmarks_editor.c:974
+
+# src/bookmarks_editor_dnd.c:481
+# src/bookmarks_menus_callbacks.c:296
+# src/bookmarks_menus_callbacks.c:314
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# src/bookmarks_editor_dnd.c:481
+# src/bookmarks_menus_callbacks.c:296
+# src/bookmarks_menus_callbacks.c:314
+
+# src/bookmarks_editor.c:970
+
+# src/bookmarks_editor.c:1007
+
+# src/bookmarks_editor.c:998
+
+# src/downloader.c:86
+
+# src/bookmarks_editor.c:1011
+
+# src/menubar.c:38
+
+
+# src/bookmarks_editor.c:1056
+
+# src/bookmarks_editor.c:1033
+# src/bookmarks_menus.c:529
+
+# src/bookmarks_editor.c:1033
+# src/bookmarks_menus.c:529
+
+
+# ui/preferences.glade.h:172
+
+# ui/preferences.glade.h:172
+
+# ui/preferences.glade.h:177
+
+
+# ui/preferences.glade.h:177
+
+# src/bookmarks_editor.c:1007
+
+# src/bookmarks_editor.c:1002
+
+
+
+
+# src/bookmarks_editor.c:1011
+
+# src/bookmarks_editor.c:1056
+
+# src/bookmarks_editor.c:1011
+
+
+# galeon.desktop.in.h:1
+# sounds/galeon.soundlist.in.h:1
+# src/dialog.c:135
+# src/mozilla/PromptService.cpp:666
+# src/window.c:191
+# ui/galeon.glade.h:50
+
+# src/menubar.c:571
+
+
+# src/bookmarks_editor.c:1029
+
+# src/bookmarks_editor.c:1002
+
+# src/bookmarks_editor.c:950
+# src/bookmarks_editor.c:1150
+# src/menubar.c:567
+
+# tekensetsrc/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# ui/galeon.glade.h:53
+
+# src/menubar.c:380
+
+# ui/preferences.glade.h:123
+
+# ui/galeon.glade.h:85
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+# ui/galeon.glade.h:118
+
+# ui/galeon.glade.h:119
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:123
+
+
+# ui/preferences.glade.h:50
+
+
+# ui/preferences.glade.h:272
+
+# src/menubar.c:494
+# ui/galeon.glade.h:143
+
+
+# src/persistent_data_manager.c:138
+# ui/galeon.glade.h:94
+
+
+
+# ui/galeon.glade.h:44
+
+# ui/galeon.glade.h:51
+
+# ui/galeon.glade.h:157
+
+# ui/galeon.glade.h:157
+
+# ui/galeon.glade.h:157
+
+
+
+# ui/galeon.glade.h:85
+
+# ui/galeon.glade.h:44
+
+# src/bookmarks.c:975
+# src/embed.c:263
+# src/history.c:457
+# src/misc.c:354
+# src/mozcallbacks.c:225
+# src/window.c:2279
+
+# src/menubar.c:502
+# ui/galeon.glade.h:163
+
+# src/menubar.c:502
+# ui/galeon.glade.h:163
+
+
+
+
+# galeon.desktop.in.h:1
+# sounds/galeon.soundlist.in.h:1
+# src/dialog.c:135
+# src/mozilla/PromptService.cpp:666
+# src/window.c:191
+# ui/galeon.glade.h:50
+
+
+
+
+# ui/galeon.glade.h:27
+
+# ui/galeon.glade.h:102
+
+# ui/preferences.glade.h:157
+
+# ui/galeon.glade.h:153
+
+# src/mozilla/mozilla.cpp:1982
+
+# src/mozilla/ContentHandler.cpp:908
+# ui/galeon.glade.h:17
+
+# src/window.c:985
+
+
+# src/menubar.c:468
+# ui/preferences.glade.h:262
+
+# ui/galeon.glade.h:102
+
+# src/menubar.c:322
+
+
+# src/context.c:75
+
+
+# src/context.c:69
+
+# src/context.c:69
+
+# src/menubar.c:38
+
+# src/menubar.c:37
+
+# src/menubar.c:34
+
+# src/context.c:71
+
+# src/context.c:1075
+
+# src/context.c:1075
+
+# src/context.c:65
+
+# src/context.c:60
+
+# src/menubar.c:39
+
+# src/menubar.c:73
+
+# ui/galeon.glade.h:171
+
+# src/window.c:985
+
+# src/context.c:68
+
+# src/menubar.c:380
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:123
+
+# src/menubar.c:473
+
+# src/menubar.c:380
+
+# src/menu_callbacks.c:1286
+
+# ui/galeon.glade.h:30
+
+# src/menubar.c:473
+
+# ui/preferences.glade.h:50
+
+
+# ui/preferences.glade.h:123
+
+# src/menubar.c:502
+# ui/galeon.glade.h:163
+
+# src/menu_callbacks.c:1286
+
+
+# ui/preferences.glade.h:50
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+
+
+
+
+# ui/preferences.glade.h:18
+
+# ui/preferences.glade.h:280
+
+
+# ui/preferences.glade.h:46
+
+
+# ui/bookmarks.glade.h:45
+
+
+
+# ui/preferences.glade.h:232
+
+
+
+# src/prefs.c:385
+# ui/galeon.glade.h:36
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+
+
+
+# ui/preferences.glade.h:131
+
+# ui/preferences.glade.h:14
+
+# src/bookmarks_menus.c:442
+
+
+
+# ui/preferences.glade.h:129
+
+
+# src/bookmarks_menus.c:442
+
+# ui/preferences.glade.h:152
+
+# ui/galeon.glade.h:110
+
+# ui/preferences.glade.h:152
+
+
+
+# ui/preferences.glade.h:268
+
+# ui/preferences.glade.h:170
+
+# ui/preferences.glade.h:172
+
+# ui/preferences.glade.h:173
+
+# ui/preferences.glade.h:217
+
+# ui/preferences.glade.h:28
+
+# ui/preferences.glade.h:232
+
+# ui/preferences.glade.h:59
+
+# ui/preferences.glade.h:280
+
+
+
+# ui/galeon.glade.h:103
+
+# ui/preferences.glade.h:245
+
+
+
+# src/mozilla/TOCProtocolHandler.cpp:173
+
+# ui/preferences.glade.h:253
+
+# ui/preferences.glade.h:19
+
+# ui/preferences.glade.h:263
+
+
+# ui/bookmarks.glade.h:38
+
+
+
+# ui/preferences.glade.h:268
+
+
+# src/mozilla_i18n.c:29
+# ui/preferences.glade.h:43
+
+# src/mozilla/MyportalProtocolHandler.cpp:221
+
+# ui/bookmarks.glade.h:50
+
+# ui/preferences.glade.h:50
+
+
+# ui/preferences.glade.h:123
+
+# src/menu_callbacks.c:1286
+
+# ui/preferences.glade.h:50
+
+
+
+# ui/galeon.glade.h:30
+
+# ui/galeon.glade.h:121
+
+# ui/galeon.glade.h:95
+# ui/preferences.glade.h:139
+
+# src/mozilla/TOCProtocolHandler.cpp:232
+# src/mozilla/TOCProtocolHandler.cpp:316
+# src/mozilla/TOCProtocolHandler.cpp:415
+
+# ui/preferences.glade.h:94
+
+
+# src/menubar.c:73
+
+# src/toolbar.c:286
+
+# src/menubar.c:73
+
+# ui/preferences.glade.h:7
+
+# ui/preferences.glade.h:195
+
+
+# ui/preferences.glade.h:87
+
+
+# ui/preferences.glade.h:157
+
+# src/downloader.c:224
+
+# src/downloader.c:284
+
+# ui/preferences.glade.h:50
+
+
+
+
+
+
+
+
+# ui/preferences.glade.h:150
+
+
+# src/prefs.c:1082
+# src/prefs_callbacks.c:239
+# src/prefs_callbacks.c:463
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vaste mantisse?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afkorting van backspace
+
+
+
+
+
+# getal wissen mooier?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Resultaat berekenen is heel raar. het resultaat wordt getoond
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit goed?
+
+
+
+
+
+
+# is dit goed?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit moet kort zijn voor accessability
+
+
+
+
+
+
+
+
+# Dit moet kort zijn voor accessability
+
+
+
+
+
+# ik vind x! duidelijker dan !
+# x! wordt bijna op alle rekenmachines gebruikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# deze moeten denk ik niet vertaald worden
+
+
+# deze moeten denk ik niet vertaald worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verkeerd gevormd
+
+
+
+
+
+
+
+
+
+
+
+
+# calculator beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Als je duizendtallen toont, gebruik je automatisch het scheidingsteken
+# voor duizendtallen
+
+# Als je duizendtallen toont, gebruik je automatisch het scheidingsteken
+# voor duizendtallen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# calculator?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# significante cijfers/decimalen/plaatsen
+
+
+# calculator?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de vermenigvuldiging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Aftrekken eenvoudig/eenvoudige aftrekkingen
+
+
+
+
+
+
+
+# voortzetten
+
+# voortzetten
+
+
+
+
+
+
+
+
+# floppy/diskette
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# brein/hersens
+
+
+# oefeningen in logica/training in logica
+
+
+# balk/cafe?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tijd?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de hetelucht-ballon van de broers Montgolfier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet de muis kunnen bewegen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 4 op een rij/4 verbinden
+
+
+
+
+
+
+
+
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat betekent dit in deze context?
+#, fuzzy
+
+# ?
+
+
+
+
+
+
+
+
+
+
+
+# opnieuw te maken/te maken
+
+
+
+
+
+
+
+
+# continenten
+
+
+
+
+
+# engels taalfout: united state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# laatste niveau/level
+
+
+
+
+
+
+
+
+# Bouw/reproduceerbaar
+
+
+
+
+
+
+# zeskant?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Aftrekken eenvoudig/eenvoudige aftrekkingen
+
+
+# Aftrekken eenvoudig/eenvoudige aftrekkingen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# voorwerpen ipv elementen.
+# is dit correct?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Probeer de parachutist op de boot te laten landen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vormen ipv objecten
+
+
+
+# vormen ipv objecten
+
+# gespiegeld weergeven
+
+
+# 2 x engels taalfout: Click the dict with the right mouse button to coun backwards
+
+
+
+
+
+# uit het geheugen rekenen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# navigeren ipv manoeuvreren
+
+
+
+
+
+
+
+# unieke/afzonderlijke
+# plaats/zet
+
+# uniek/mogen maar 1 keer voorkomen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# watervoorziening beter?
+
+# watervoorziening beter?
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+# tooltip voor de desktop
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# modus/weergave
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# engels: bellonging
+
+
+
+
+
+
+
+
+
+
+# engels: bellonging
+
+
+
+
+
+# wit rusland
+
+
+
+
+
+
+
+# engels: bellonging
+
+
+
+
+
+
+
+# dit is aanmeldnaam hier, niet 'aanmelden' of 'inloggen'
+# het gaat dus hier om de gebruikersnaam/aanmeldnaam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# priemfactoren/factoren
+
+# priemfactoren/factoren
+
+
+
+
+
+
+
+
+
+# return zit niet op een toetsenbord
+
+
+# return zit niet op een toetsenbord
+
+
+
+
+
+
+
+
+# dit is aanmeldnaam hier, niet 'aanmelden' of 'inloggen'
+# het gaat dus hier om de gebruikersnaam/aanmeldnaam
+
+# huh? Enter login to log
+
+
+
+
+
+
+# kleur van de lijn/lijnkleur
+
+
+# cirkels gebruiken/gebruik cirkels
+
+
+
+# coördineren ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Beter: schermvullend?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herlezen/opnieuw inlezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet beinvloed/gewijzigd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beschrijfbaar/overschreven
+
+
+
+
+
+
+
+
+
+# boolese
+
+# Float: getal met drijvende komma....maar dat is te lang.
+
+
+
+
+# waarde in lijst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling root-node?
+
+
+
+# DN=domain-name?
+
+# DN=domain-name?
+
+
+# zoeken naar velden/items/resultaten
+# of gewoon: Zoeken via filter s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# heeft (nog) geen waarde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwijderen van s is mislukt: s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# failed to return?
+# failed, return?
+
+# is missing a required?
+# is missing, it required?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# (j/n) of (y/n) ?
+
+
+
+
+
+# resolved -> gevonden
+# rosolved to -> getraceerd naar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of toch <auto> ipv <car> ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weerstoestand
+
+
+
+
+
+
+
+
+
+
+
+
+
+# enkelvoud is hier mooier en beter
+
+
+
+
+
+
+
+
+
+
+# zweeftoestand
+
+
+
+# instellen/configureren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geïnstalleerd
+
+
+# enkele tabs gebruikt ipv dubbele
+
+
+
+
+# displays hier desklets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat is dit?
+
+
+
+
+
+
+
+
+
+# dankuwel/bedankt/met dank aan
+# Dit verschijnt in de aftiteling in het infovenster.
+
+
+# configureren beter?
+
+
+
+
+
+
+
+
+
+
+
+
+# interface vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# op bediening
+
+
+
+
+
+
+
+# sorteren op...
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# pakket wordt binnengehaald
+
+
+
+# onjuist/ongeldig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Goto-to?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moeten we dit wel vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wanneer/terwijl
+
+
+
+
+
+
+
+
+
+# CONFIGURATIEBESTAND
+
+
+
+
+
+# wil -> mag
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# c-format
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# u zult zich/ u zult uzelf:
+# Als u onderwerp is en gecombineerd wordt met de persoonsvorm van de
+# tweede persoon van een van de werkwoorden hebben, zijn, kunnen, willen
+# en zullen (u hebt, u bent, u kunt, u wilt, u zult), dan kan u(zelf) de
+# voorkeur hebben voorzover men consequentie nastreeft
+
+
+
+
+
+
+
+
+
+
+# c-format
+
+
+
+
+
+
+
+# c-format
+
+
+
+# c-format
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# autorisatie/identificatie-bestand
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geef uw gebruikersnaam
+
+
+
+
+
+
+
+
+
+
+
+# vernieuwd ipv veranderd/aangepast gebruikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# om deze functie aan te zetten/om deze te installeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# GDM Hostkiezer<
+
+
+
+
+
+
+
+
+
+# it hung up on us...
+
+# wij zeggen maandag 12 feb ipv maandag feb 12
+
+# a=verkorte weekdag
+# b=verkorte maand
+# d=dag van de maand
+# l=
+# p=lokaal equivalent van AM/PM
+# H=uur
+# M=minuut
+
+
+
+
+# Beeldscherm?
+
+# Beeldscherm?
+
+# Beeldscherm?
+
+
+
+
+
+
+# gedurende/tijdens/ondanks/na/zelfs na/
+
+
+
+# Beeldscherm?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# belarussisch
+# wit-russisch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# User niet meevertaald
+# zinsconstructie niet lekker doordat de devs de zin in
+# stukjes hebben geknipt.
+
+
+# is de H goed of wordt die voor Hulp gebruikt?
+
+
+
+
+# pauzestand/pauzeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# sessiemap/sessiesmap
+
+
+
+
+
+
+
+
+# foto ipv afbeelding
+
+
+
+# uzelf/zichzelf
+# Als het wederkerend voornaamwoord meteen volgt op het persoonlijk
+# voornaamwoord u, dan kan zichzelf de voorkeur hebben voor wie een
+# opeenvolging van twee keer u, niet goed vindt klinken.
+
+
+
+
+
+
+
+
+# toevoeglijst/toegevoegde lijst/lijst
+
+
+
+
+# met geluid/geluid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# TCP-verbindingen met de X-server nooit toestaan (schakelt alle
+# verbindingen op afstand uit (xforwarding), maar heeft geen effect
+# op XDMCP)
+
+
+
+
+#  er onder staat een lijst met programmas die niet in de gezichtenlijst
+# moet worden getoond zoals bin/nobody/rpm etc.
+
+
+
+
+
+# afbeelding is goed hier
+# het is het logo voor de gtk-kiezer
+
+# users to include: gebruikers/programma's die worden getoond.
+# Tonen/weergeven
+# bij exclude staat een lijst zoals: bin daemon lp sync etc...
+
+
+
+# wachttijd na foutieve aanmelding
+
+# uitvoeren/opstarten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lokaal <-> niet lokaal/extern/op afstand
+
+
+# resolutie/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de _S wordt gebruikt in _Stijl
+
+
+
+
+
+
+# afbeelding is goed hier
+# het is het logo voor de gtk-kiezer
+
+#  Niet van toepassing bij gebruik van NIS
+
+# klaar voor gebruik/gereed
+
+# bekeken/behandeld
+
+# pauzeren voor aanmelding/aantal seconden wachttijd voor aanmelden
+
+
+# de _T wordt gebruikt in _Toevoegen
+
+
+# voorbeeld/dummy
+
+
+
+
+
+
+
+
+
+
+
+
+# wisselen/wijzigen
+
+
+
+
+
+
+# pauzestand/pauzeren
+
+
+
+
+# Dit horen eigenlijk standaard gtk-knoppen te zijn
+
+
+
+
+
+
+
+
+
+
+# uitschakelen/uitzetten/afzetten/afsluiten
+
+
+# geen 'uw'
+
+
+# geen 'uw'
+# misschien wordt hier wel 'hibernate' bedoeld ipv suspend.
+
+
+
+
+
+
+
+# wat opvallend is is de zonnebloem,
+# dit thema is hetzelfde als 'Blije GNOME' maar dan met zonnebloem
+
+
+
+# GNOME blauw wil al zeggen dat er curven bij zitten.
+# De zin wordt anders te lang.
+
+
+
+
+# Blije GNOME is heel lame.
+# Het is overwegend een blauw thema
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Alle overeenkomsten met de gezochte tekst sytaxkleuring geven.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# deze opdracht werkt alleen binnen een woord/wanneer u zich in een
+# woord bevindt/wanneer de cursor zich binnen een woord bevindt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Wazige string, juiste vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Help, wat moet dit zijn?
+# Er is een tag genaamd 'clear' die bepaalt hoe tekst bij plaatjes gezet wordt.
+# clear="left"  zet plaatjes aan de linkerkant
+# clear="right" zet plaatjes aan de rechterkant
+# bij clear="all" komt de tekst onder het plaatje
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de download-performance van een pagina kan worden verbeterd
+# als de browser het attribuut niet eerst hoeft te verwerken
+# en kan doorgaan met het downloaden en verwerken met de rest
+# van de pagina, dus: uitstel van executie
+# uitstelen/uitstel attribuut
+
+
+
+
+
+# Juiste vertaling?!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Juiste vertaling?!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+# Dit schijnt al een 'deprecated' tag te zijn
+# Creates a single-line text input control.
+
+
+
+
+
+
+
+
+
+
+# This attribute contains a text message to be displayed while the object is loading.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# inline?!
+
+
+# Referentie-referentie?!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hmm: the limit for continuity and limits?
+
+
+
+
+
+
+
+
+
+
+
+
+# gaussian moet zijn? Guassian
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# de factorisatie van een getal als een matrix
+
+
+
+# Controleren of een rationeel getal een perfecte macht is (a^b)
+
+
+
+
+
+
+
+
+# Engels spelfout: compund
+# Calculate the kth compund matrix of A
+
+
+
+
+# dit is waarschijnlijk een vraag
+# Is deze matrix diagonaal?
+# Is de matrix diagonaal?
+# is een matrix diagonaal?
+
+# is dit een onderdriehoeksmatrix
+# dit is een ...
+
+
+
+
+
+# van een matrix/in een matrix
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# convoluerende/?convolutie
+
+# uitwendig product
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+# hermitische matrix
+# matrix hermitiaan
+# is een matrix hermitisch?
+
+# ligt/valt
+
+
+
+
+
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+#, fuzzy
+
+#, fuzzy
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+# Get betekent hier 'bereken'
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+#, fuzzy
+
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+
+
+# huh? wat betekent dit precies?: around origin, around x-axis?
+
+
+
+#, fuzzy
+
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# engels spelfout: fibbonachi
+
+
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# stack onvertaald, alleen als je een coder bent, begrijp je wat het is,
+# en kun je er wat mee. De coders zouden alleen maar in de war raken als
+# het vertaald zou worden.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangemaakt is niet helemaal juiste vertaling.
+# creation - schepping is lelijk.
+# foutief ipv verkeerd?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanwijzer?
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# is dit goed?
+
+
+
+
+
+
+
+
+# moet dit aan elkaar?
+
+
+
+
+# op ipv bij?
+
+
+
+
+
+
+
+# vinden ipv localiseren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beter woord voor print?
+# er wordt hier niets op papier afgedrukt
+
+
+
+
+# betere woord voor globaal?
+
+
+
+
+
+
+
+
+
+# engels fout: latex ipv LaTeX
+
+
+# dit kan beter!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# teller
+
+# noemer
+
+
+
+
+
+
+
+
+
+
+
+# goed opletten of n en m niet omgewisseld zijn!
+
+#, fuzzy
+
+
+
+
+# het is Riemann, niet Reimann
+
+
+# wat betekent dit?
+
+
+# was eerst:
+# Het Jacobi-symbool (a/b) berekenen (b moet oneven zijn)
+# ivm consistentie omgezet naar:
+# bereken het Jacobi-symbool....
+#
+
+
+
+
+
+
+
+
+
+
+# dit is waarschijnlijk een vraag:
+# Is deze matrix vierkant?
+
+
+
+# vertaling echelon? rang/niveau/laag/echelon
+
+
+# tonen ipv geven of krijgen. bij geven zou de gebruiker denken dat
+# hij zelf iets moet geven.
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herstellen kan ook, maar lijkt net of er eerst wat stuk was.
+
+# helicopterperspectief
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+# waarde buiten bereik<
+
+# waarde buiten bereik<
+
+
+#, fuzzy
+
+# waarde buiten bereik<
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Map succesvol naar %s veranderd
+# map s wordt (nu) weergegeven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# voltooid/klaar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# overeenkomsten/resultaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# op knop klikken
+# knop indrukken
+# knop aanklikken
+
+
+
+
+
+# bronbericht: extra ':' achter %s overbodig?
+
+
+
+
+
+
+# wat wordt hier mee bedoeld?
+
+
+
+
+
+
+
+
+
+
+
+# %ld/%ld frames verwijderen
+
+
+
+# vergroten ipv verhogen?
+
+# verkleinen ipv verlagen?
+
+
+
+
+
+
+
+
+
+# vergroten?
+
+
+
+
+# ld/ld frames dupliceren
+
+
+
+
+
+# Framebereik dupliceren
+# Duplicaten maken van het frame-bereik
+# Duplicaten maken voor het frame-bereik
+
+# uitwisselen?
+# wisselen?
+# omwisselen?
+# verwisselen?
+
+
+
+
+
+
+
+# ld frames hernummeren
+
+
+
+
+
+
+
+# bluebox plug-in makes selected color transparent
+# blauwe wand?
+
+
+
+
+
+
+
+# engels?: fully opaque ipv full opaque
+
+
+# doorzichtig
+
+# wazige rand
+
+# straal ipv radius?
+# zachtheid-straal
+
+
+
+# wassen ipv groeien?
+
+
+# Animatievooruitblik
+
+
+
+
+
+
+
+# Drempelwaarden in het RGB kleurmodel toepassen
+
+
+
+# moet dit vertaald worden?
+
+
+# moet dit vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# opdeling/deling
+
+
+#, fuzzy
+
+# trying to, niet vertaald
+#, fuzzy
+
+
+# selectie verschil?
+# selectie kruising?
+# selectie samenkomst?
+#, fuzzy
+
+#, fuzzy
+
+# beginpunt/begintijd/startpunt/starttijd
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Selecteren
+# Instellen 
+# Gebruiken
+#, fuzzy
+
+
+
+
+# What is the Dutch translation of the term 'Saturation'?
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+# trying to, niet vertaald
+
+
+
+
+
+
+# extraheren?
+
+
+# extraheren?
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is 'end-settings' a name?
+
+
+# kennelijk wordt het filter 'live' toegepast
+# zodat je het geanimeerd ziet gebeuren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# allemaal wissen
+
+
+
+
+# drawable
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# locking betekent hier?
+
+# moet <image> vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+# Vertaling 'stel A in op B' veranderd in
+# 'A B maken'
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Vertaling 'stel A in op B' veranderd in
+# 'A B maken'
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Vertaling 'stel A in op B' veranderd in
+# 'A B maken'
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+# Heeft dit wel zin in enkelvoud?
+# Kan je een enkele laag samenvoegen?
+
+# Heeft dit wel zin in enkelvoud?
+# Kan je een enkele laag samenvoegen?
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+# 'Selectie alles' klinkt raar.
+# Selectie samen?
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# enigszins woordvolgorde veranderd om consistent te blijven
+# met de overige termen
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# la(a)g(en)?
+
+
+
+
+# laag-basisnaam
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de toplaag betekent
+
+
+
+
+
+
+# formaat aangepast om consistent te zijn met de andere berichten
+
+#, fuzzy
+
+
+
+# bronbericht: extra ':' achter %s overbodig?
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwisselen
+
+
+
+# vervormingsintensiteit
+# mate van vervorming
+
+
+# vergroten?
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# to exact = eisen
+# vertaling was eerst 'nauwkeurig object op frames'
+
+# is dit te lang?
+
+
+
+# frame-frequentie
+
+# frame-frequentie
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bronbericht: extra ':' achter %s overbodig?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Hue'?
+
+# What is the Dutch translation of the term 'Saturation'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ondoorzichtigheid
+
+
+
+
+# opacity: Dekking?
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# verwijderen
+
+
+
+
+
+
+
+
+
+# bijsnijden
+
+
+# percentage?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hoe om te gaan met
+
+
+
+
+
+
+
+
+
+
+
+# De kleur selecteren die wordt gebruikt om padlijnen
+# mee te tekenen in de vooruitblik
+
+
+
+
+
+# onmiddellijk toepassen
+# gelijk toepassen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# engelse spelfout: iqnore
+
+
+
+
+
+
+
+# grootste compressie
+# hoogste compressie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# huh?
+
+
+
+
+
+
+
+
+
+
+# VCR navigator
+
+
+
+#, fuzzy
+
+# Engels spelfout: operaton
+
+
+
+
+
+
+# wissen
+
+
+
+
+# slechts elk n-de frame tonen
+# om de n frames tonen
+
+
+
+
+
+
+
+# Spellingsfout in Engels: Bidiriectional
+
+
+#, fuzzy
+
+
+
+# oplopende dekking
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# instellen op?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# audiolib: geluidsbibliotheek/geluidsprogramma
+
+# audiobron
+
+
+
+# resampelen?
+
+
+
+
+
+
+
+# synchroniseren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of this phrase?
+# Geluidssterkte
+
+
+# of: video zonder geluid
+
+
+
+
+
+
+
+
+
+
+# bitratio
+
+
+
+
+
+
+# Wordt bedoeld?
+# The number of the currently diplayed frame?
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# snijden
+# allemaal
+
+# oorspronkelijk
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'dithering'?
+
+# What is the Dutch translation of the term 'dithering'?
+
+# What is the Dutch translation of the term 'dithering'?
+
+# What is the Dutch translation of the term 'dithering'?
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Dither'?
+
+
+
+
+# What is the Dutch translation of the term 'dithering'?
+
+
+
+
+
+
+
+
+
+
+# engels taalfout: can not handle RGB en requires convert to indexed imagetype
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# initiële frame
+# aanvankelijke frame
+
+
+
+
+
+# laag-basisnaam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# scaling-resizing
+# herschalen, op grootte aanpassen
+
+
+
+
+
+# 'position' of 'frame position'?
+
+
+
+
+
+
+
+
+# verhouding/ratio
+
+
+
+# Horizontaal centrum?
+# Horizontaal cetreren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wissen
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# bronbericht: extra ':' achter %s overbodig?
+#, fuzzy
+
+# bronbericht: extra ':' achter %s overbodig?
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# frame-frequentie
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# FILMPJE
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+# selectie verschil?
+# selectie kruising?
+# selectie samenkomst?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+# What is the Dutch translation of the term 'Saturation'?
+#, fuzzy
+
+# 'position' of 'frame position'?
+#, fuzzy
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Saturation'?
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Value'?
+
+
+
+# What is the Dutch translation of the term 'Saturation'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# bronbericht: extra ':' achter %s overbodig?
+#, fuzzy
+
+# bronbericht: extra ':' achter %s overbodig?
+#, fuzzy
+
+# bronbericht: extra ':' achter %s overbodig?
+#, fuzzy
+
+
+
+
+
+# klaar
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# frame-frequentie
+#, fuzzy
+
+# frame-frequentie
+
+#, fuzzy
+
+
+# moet dit vertaald worden?
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+# frame-frequentie
+
+# onmiddellijk toepassen
+# gelijk toepassen
+#, fuzzy
+
+
+#, fuzzy
+
+# beeldverhouding/verhouding
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Saturation'?
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+# extra instellingen
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+# gebruiken
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+# extraheren?
+#, fuzzy
+
+# What is the Dutch translation of the term 'Dither'?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# muisaanwijzer/pointer
+#, fuzzy
+
+# Dokbaar/aanlegbaar/aankoppelbaar
+
+# Dokbaar/aanlegbaar/aankoppelbaar
+
+
+
+
+
+
+
+
+
+
+
+# proefpunten/controlepunten/sample-punten/monsterpunten
+# bemonsterpunten/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# naar/binnen/in
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+# omhoog/verhogen
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+# afhalen
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# Attention! Singular in Dutch!
+
+
+
+
+
+
+
+
+
+
+# aspect/gedeelte/verhouding
+
+
+
+#, fuzzy
+
+# verwisselen/wisselen
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# werkbalk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verlopen/verloop
+# verlopen ziet er uit als werkwoord
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# overzicht ongedaan maken wissen/documentgeschiedenis
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# afdeling: Colormanagement
+# opties zijn: Color manged display, No color mangement, print simulation
+#, fuzzy
+
+# wissen/leegmaken
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ophalen/binnenhalen/verkrijgen/importeren
+# Letterlijk verkrijgen, maar dat is minder duidelijk
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+# terughalen
+
+
+# terugdraaien/terugzetten/herstellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Krom/Rond
+
+
+
+
+# wisselend/gevarieerd/
+
+
+
+
+# volledig/alles zoomen/zoom alles/compleet/alles/geheel/alles tonen
+
+# dit is de tooltip
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# label van de knop
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# frame for Comment
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+# Image niet meevertalen?
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# image niet meevertaald
+
+#, fuzzy
+
+# image niet meevertaald
+
+#, fuzzy
+
+
+
+
+
+# bovenop/omhoog
+
+# bovenop/omhoog
+
+
+
+
+
+
+
+
+# maskeren
+
+
+
+# Attention! Singular in Dutch!
+# Tool niet meevertaald
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+# de N wordt gebruikt voor Nieuwe laag
+
+
+
+# begrenzing/grens
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# Bij selectie optellen/toevoegen aan selectie
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+# overeenkomstig de overige vormen van 'zoom all' (bijv. Zoom all)
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# de F was nog ongebruikt
+
+
+
+
+
+# verbeteren/versterken/verscherpen
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# maskerondoorzichtigheid/ondoorzichtigheid van masker
+
+# Monsterpuntmenu
+
+
+#, fuzzy
+
+
+
+# drijvend/zwevend/los/losgemaakt/
+
+#, fuzzy
+
+# gevederd/zacht/
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# links naar rechts
+
+
+
+
+
+
+
+# opslaan in/opslaan naar
+
+# vanaf/vanuit/uit
+
+
+
+
+# opnieuw instellen/herstellen
+
+# beginwaarden/standaardwaarden
+
+# herstellen/opnieuw instellen/resetten
+
+
+
+
+
+
+
+
+
+
+# Selectiegereedschap
+# het is hier duidelijker om 'tools' niet mee te vertalen
+
+# het zijn penselen en potloden/stiften.
+# schilderen en tekenen kan dus allebei.
+# tekenen vond ik net iets duidelijker
+
+# Transformatie/transformeren
+# is niet consequent met 'tekenen' of 'schilderen'
+# maar het is hier mooier dan Transformeren
+
+# kleur/kleuren
+
+# Optillen/verhogen/naar boven verplaatsen/
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# tool niet meevertaald
+
+
+
+
+
+
+
+
+
+
+
+
+# verhogen
+
+
+
+
+
+# verlagen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+# Shrink wrap is the phenomenon of fitting the image window to the image dimensions
+
+#, fuzzy
+
+# wat betekent dit, wat doet dit in het programma?
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eigen/aangepaste
+
+
+#, fuzzy
+
+
+
+
+
+# glad
+
+
+
+
+
+
+
+# What does 'grain' refer to?
+#, fuzzy
+
+# What does 'grain' refer to?
+#, fuzzy
+
+# What does this mean?
+
+
+
+
+
+
+
+#  Not all strings defined here are used in the user interface
+#  *  (the preferences dialog mainly) and only those that are should
+#  *  be marked for translation.
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bug: twee keer een negatief: not saved, not changed
+# Beter: only save when it has been changed
+# Als dit aanstaat, slaat de GIMP een afbeelding niet op als deze niet 
+# gewijzigd is sinds hij werd geopend.
+
+
+
+
+
+
+
+
+# kleurbenadering
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Connection style of a path
+
+# Path end style
+
+
+
+
+
+# Normaal aantal (stippen weglaten?)
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# aanhangen/vastmaken/bijvoegen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# vertalers/interpretatieprogramma's
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Klopt dit?
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# onscherpe selectie
+
+
+
+
+
+
+
+
+
+
+
+
+#  push an undo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Netwerkafbeelding/extern bestand/bestand op afstand
+# Image on a remote file system
+
+
+#, fuzzy
+
+
+
+# niet meer recent/verouderd
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Geïndexeerd
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# omzetten
+
+
+
+
+
+# gebruiken/inschakelen
+
+# omzetten naar geindexeerd
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#  Scaling
+
+
+
+
+# instellen/configureren
+
+# Typ een nieuwe sneltoets, of geef Backspace om te wissen<
+
+
+
+
+
+# Laagnaam/naam laag
+
+
+# naam vormen uit tekst/Naam uit tekst instellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+# types/typen/soorten
+
+# verschuiven/verspringen
+
+# verschuiven/verspringen
+
+
+
+
+
+#  The by half height and half width option
+
+
+
+
+
+
+
+
+
+
+
+
+# naam van palet/paletnaam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is hoe de venster rond de afbeelding wordt getoond
+# (bv bij uitzoomen als het venster groter is als de afbeelding)
+# mogelijkheden zijn: van thema/lichte vakjes/donkere vakjes/aangepaste kleur)
+
+# aangepaste/zelfgemaakte/eigen
+
+
+
+
+
+
+
+
+# processors/processoren
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+# menu-toegangstoetsen tonen
+# (dit zijn de onderstreepte letters?)
+
+
+
+
+
+#  Themes
+
+
+
+# What's the Dutch translation for tooltip?
+# scherminfo/tooltip
+#, fuzzy
+
+
+
+
+
+
+
+# bij het verlaten/afsluiten
+
+
+
+#  Snapping Distance
+
+
+
+#  Global Brush, Pattern, ...
+
+
+
+
+
+
+
+# Nieuwe standaardafbeelding/Standaard nieuwe afbeelding
+
+
+# image niet meevertaald voor duidelijkheid
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+# image niet meevertaald voor duidelijkheid.
+# formaat/indeling/informatie
+
+
+# format/formaat
+
+
+
+
+
+
+# vakjes
+
+# grootte van vakjes
+
+
+# beeldpunten
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# beeldbuis/beeldscherm/monitor
+
+
+
+
+# afdeling: Colormanagement
+# opties zijn: Color manged display, No color mangement, print simulation
+
+# tooltip: sets how colors are managed for your display
+# opties: gevoelsmatig, relative colorimetric, Verzadiging,
+#  absolute colorimetric
+
+# Tooltip: sets how colors are converted from workspace to the print
+# simulation device.
+# afdrukvoorbeeld/softproof/
+
+# dit is een keuzerondje
+
+
+#  Input Device Settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+# H, O G en T worden al gebruikt als sneltoets
+
+
+
+
+
+
+
+# de tekenreeks is hier een tijdspanne
+#, fuzzy
+
+
+
+# laagafmeting
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+# doorzoekt ipv controleert, zie overige beschrijvingen
+
+
+
+
+
+
+
+
+
+
+
+
+# omzetten/overzetten/migreren
+
+
+
+# overzetten/overnemen
+
+# verse/nieuwe
+# versie is niet echt mooi/duidelijk hier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#  The name entry hbox, label and entry
+
+# werkbalkpictogram
+
+
+
+# dit mag een wat langere tekst zijn
+
+# BUG? toont lichtgrijze kleur rond afbeelding, geen vakjes?
+
+# BUG? idem, egaal donkergrijs, geen vakjes?
+
+
+
+
+
+# de tekenreeks is hier een tijdspanne
+#, fuzzy
+
+# de tekenreeks is hier een tijdspanne
+
+# Drag and drop
+
+# drag and drop
+
+#, fuzzy
+
+
+
+
+# zoomniveau/zoomverhouding
+
+
+
+
+
+
+
+
+# wissen 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+# klad/omtrek
+
+
+
+# rasterlijnafstand/spatiering
+
+
+
+
+# snelheid/mate/frequentie
+
+
+# herhalen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  fill selection
+
+
+# gelijkende/gelijkaardige/gelijkwaardige/eendere
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the translation for 'Luminosity'?
+
+
+
+
+
+
+
+
+# bemonsteringsgemiddelde/monstergemiddelde
+#, fuzzy
+
+#  the pick FG/BG frame
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# gereedschap wisselen
+# gereedschap aan/uit
+#, fuzzy
+
+# enkel huidige laag/alleen de huidige laag
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+# lezen/laden
+
+
+
+
+#, fuzzy
+
+
+# opnieuw instellen/herstellen
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# spiegelen/omkeren
+
+
+
+#, fuzzy
+
+
+
+# component niet meevertaald
+
+
+
+#, fuzzy
+
+# aanmerken/selecteren/markeren
+
+
+# dun/klein/smal
+
+# dik/groot/breed
+
+# toont een shuifknop waarmee de zachtheid van de 
+# selectie kan worden ingesteld.
+# glad
+
+#, fuzzy
+
+
+# voorgrondselectie/sleceteer voorgrond
+
+# uitlichten/oplichten/extraheren/eruit halen/uitnemen
+
+
+
+# op het object dat moet worden geextraheerd
+
+
+
+
+
+
+
+
+
+
+# de schuif die alles bedient/hoofdschuif
+
+
+
+
+
+
+
+# belangrijkste/primaire kleur
+#, fuzzy
+
+
+# Overheen leggen/overlapping
+
+
+
+# miniatuur/vooruitblik
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lezen/laden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aantal/hoeveelheid
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# schalingsinfo
+
+
+
+
+
+# zachte/vage/onscherpe randen
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+# Helgrootte/helling
+
+# Helgrootte/helling
+
+
+
+
+
+
+
+
+# gebruik/gebruiken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  the clip resulting image toggle button
+#, fuzzy
+
+
+
+
+
+
+# transformeren/transformatie (bezig)
+#, fuzzy
+
+# veelhoeken/polygonen/polygonalen
+
+
+# veelhoek / polygon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+
+
+
+# spaken
+
+
+
+
+# What does this mean?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# action=opdracht event=actie
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gedetecteerd/opgemerkt
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  add the information fields
+
+
+
+
+# aantal stappen
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+# What does this mean?
+
+
+# What does this mean?
+
+
+# Dokbaar/aanlegbaar/aankoppelbaar
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# opvullen
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+# vooruitblik laden/bezig met laden vooruitblik
+#, fuzzy
+
+
+
+
+# wat is XDS (moet de gebruiker dit wel weten?)
+
+
+
+
+# klik om de kleurenkiezer te openen
+
+
+
+
+
+
+# de verwerking/het verwerken
+
+
+# What does this mean?
+
+# pad legen/leeg pad
+
+
+
+
+# Dit is een chekbox waarmee een kleurverloop wordt omgedraaid.
+# omgekeerd/omgedraaid/terugdraaien/teruggedraaid
+
+
+
+
+
+# beeldpunten
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zichtbaar houden/bovenaan houden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gereedschapkist/toolset/toolbox
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  the headline
+
+
+
+
+# zonder schreef/schreefloos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'voor uw zoekopdracht' weggelaten
+
+
+
+# verzetten/verplaatsen
+
+
+
+
+
+
+# schaakbord
+
+
+
+
+
+
+
+# lichtgevendheid/lichtheid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# monitor/display  heeft kleurbeheer/met kleurbeheer
+
+# Simulatie afdrukken
+
+# waarneembaar?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'Schaalt'? 'Schubben'? Weegschalen
+# Misschien gaat het over kleurbereik
+
+# Huidige kleur
+# (niet huidig kleur)
+
+# Vorige kleur
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# transparantietype
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Husselen zou misschien kunnen, maar willekeurig maken is wel goed zo.
+
+# Deze letters moeten eigenlijk overeenkomen met de Nederlandse vertaling
+# Hue-kleurtoon
+
+# Saturation-verzadiging
+
+# Value-waarde
+
+# Alpha-alfa
+
+# Is 'Protanopia' called the same in Dutch?
+
+
+# Is 'Tritanopia' called the same in Dutch?
+
+
+# kleurblindheid
+
+# Kleur_deficientietype:
+
+
+
+
+
+# omwentelingen
+
+
+
+
+
+
+# Simulatie afdrukken
+
+
+
+# Feitelijk
+
+# kiezen / uitkiezen 
+
+
+# Zwart compensatie?
+# Zwartpunt compensatie
+
+
+
+# Zwart-onttrekking (%):
+
+
+# Driehoekige kleurkiezer in schilderstijl
+
+
+
+
+# toets 1
+
+
+
+# vooruit/heen/voorwaarts
+#, fuzzy
+
+
+
+# How should 'Realtime' be translated?
+# :Actuele?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'Color density' and 'color function' or 'color density' and 'function'? 
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of 'corrupt' here?
+
+
+
+
+
+
+# What is the Dutch translation of 'corrupt' here?
+
+
+
+
+
+
+
+
+# belichtingseffecten/lichteffecten
+
+
+
+# What is the Dutch translation of 'bump'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# Tekstuureigenschappen<
+
+
+
+# helder/helderheid
+
+
+
+
+# gepolijst/opgepoetst
+
+
+
+
+# aan- of uitzetten/ aan/uitzetten
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the correct Dutch translation of this phrase?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is meant with 'Cap' here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of header?
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# transformeren/omvormen
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# How to translate 'stepped'?
+
+
+# How to translate 'stepped'?
+
+
+# How to translate 'stepped'?
+
+
+# How to translate 'stepped'?
+
+
+# How to translate 'stepped'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'reverse' as in 'turned around' or as in 'mirrored'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# What is 'to evolute'
+#, fuzzy
+
+
+
+# BUG: fixed ipv fix?
+
+
+# What is the Dutch translation of the term 'Hue'?
+
+# What is the Dutch translation of the term 'Saturation'?
+
+# What is the Dutch translation of the term 'Value'?
+
+# What is 'independed'?
+
+# beginwaarde/initiele waarde/aanvankelijke waarde
+# beginwaarde wordt al voor seed value gebruikt
+
+# What does 'scale' mean in this context?
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# overige/verschillende
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# What is the difference between mutation and modification?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# What is the Dutch translation of the term 'HSV'?
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# How to translate 'bumpmap'?
+
+# knobbelprojectie?
+
+# How to translate 'bumpmap'?
+
+
+
+# How to translate 'bumpmap'?
+
+# How to translate 'bumpmap'?
+
+
+
+
+
+
+
+# omgeving/ambient
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+#  set up the dialog
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  The monochrome toggle
+
+
+
+
+# vakjes/schaakbord
+
+# Bezig met genereren...<
+
+
+
+
+
+# bijkleuren/inkleuren/verkleuren/kleuren
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# opnieuw samenstellen
+#, fuzzy
+
+# What is the Dutch translation of the term 'Compose'?
+
+# What is the Dutch translation of the term 'Compose'?
+#, fuzzy
+
+#, fuzzy
+
+# What is the Dutch translation of the term 'Compose'?
+# What is the Dutch translation of the term 'drawable'?
+
+# What is the Dutch translation of the term 'Compose'?
+
+# What is the Dutch translation of the term 'Compose'?
+
+# What is the Dutch translation of the term 'Compose'?
+
+# What is the Dutch translation of the term 'Compose'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the translation of 'convolution'?
+#, fuzzy
+
+# What is the translation of 'convolution'?
+
+# What is the translation of 'convolution'?
+
+# What is the translation of 'convolution'?
+
+# What is the translation of 'convolution'?
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+# What is the Dutch translation of Saturation?
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#  Rotate spinbutton
+
+#  The smoothing toggle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of this phrase?
+
+# What is the Dutch translation of this phrase?
+
+# What is the Dutch translation of this phrase?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Decompose'?
+#, fuzzy
+
+# What is the Dutch translation of the term 'Decompose'?
+#, fuzzy
+
+# What is the Dutch translation of the term 'Decompose'?
+
+
+# What is the Dutch translation of the term 'Decompose'?
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# What is a radian?
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+# Plukken/knijpen
+
+
+# Kolken/draaikolk
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#  compression
+
+
+
+
+# What is the Dutch translation for bumpmap?
+
+
+
+
+#, fuzzy
+
+
+
+# uitwisseling/verwisseling
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#  Keep maximum image height
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# tussenruimte
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+# What is the Dutch translation of 'lens flare'?
+#, fuzzy
+
+#, fuzzy
+
+# What is the Dutch translation of 'lens flare'?
+#, fuzzy
+
+#, fuzzy
+
+# What is the Dutch translation of 'lens flare'?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+# FP=filterpak
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the term 'Saturation'?
+
+
+
+
+#, fuzzy
+
+# What is the Dutch translation of this phrase?
+
+# What is the Dutch translation of the term 'Saturation'?
+
+# What is the Dutch translation of the term 'Value'?
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+# Bedankt dat u voor GIMP kiest/
+# dank u voor het werken met GIMP
+# gebruiken van
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# What is the Dutch translation for this phrase?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# raster/hulplijnen
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# header voor C-broncode
+
+
+# Is there a Dutch translation for 'hot scanning'?
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#  Inform the user that we couldn't losslessly save the
+#  * transparency & just use the full palette
+#  Inform the user that we couldn't losslessly save the
+#  * transparency & just use the full palette
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+# What does this mean?
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+# What is the Dutch translation of this phrase?
+
+
+
+
+
+
+
+# What is the correct translation of 'solid' in this context?
+# What is the correct translation of 'solid' in this context?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# What does 'Ins' mean?
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#  Aie! Unknown type
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# verspringing/verschuiving/draaing
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Kept the PS terminology intact
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+# What is the Dutch translation of 'aspect ratio'?
+# vormverhouding/verhouding
+
+# What is the Dutch translation of 'aspect ratio'?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# Paint Shop Pro-afbeelding
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# gelaagd RGB
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Onderste<
+
+# Bovenste
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# What does 'sample' stand for in this context?
+#, fuzzy
+
+# What does 'sample' stand for in this context?
+
+#, fuzzy
+
+
+#  Add extra menu items for Inverted Gradient
+#, fuzzy
+
+#  Add extra menu items for Gradient
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# What is the correct translation of 'solid' in this context?
+# What is the correct translation of 'solid' in this context?
+#, fuzzy
+
+#, fuzzy
+
+
+# What does this mean?
+
+# What is the Dutch translation of this phrase?
+
+
+# Mouse pointer? File pointer? Data pointer?
+
+
+
+
+
+
+# What is being referred to with 'Decorations'?
+#, fuzzy
+
+#, fuzzy
+
+# gedeelte/regio/gebied
+#, fuzzy
+
+
+
+
+# ...dat gewacht wordt na het maken van... voordat de schermafdruk wordt gemaakt.
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# What is the correct translation of 'solid' in this context?
+# What is the correct translation of 'solid' in this context?
+#, fuzzy
+
+# What is the correct translation of 'solid' in this context?
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# What is the Dutch translation for Hue?
+#, fuzzy
+
+# Is there a Dutch word for the phrase 'hue'?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation for bumpmap?
+
+
+#, fuzzy
+
+
+
+# What is the Dutch translation for bumpmap?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#  Scalable Vector Graphics is SVG, should perhaps not be translated
+
+#, fuzzy
+
+#, fuzzy
+
+#  Path Import
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# ondoorzichtiger
+#, fuzzy
+
+# transparanter
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# What is the Dutch translation of 'dither'?
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# How to translate 'flow' in this instance?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+# Is there an accepted Dutch phrase for 'header'?
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# What does 'Hot Spot' mean here?
+#, fuzzy
+
+# What does 'Hot Spot' mean here?
+#, fuzzy
+
+# What does 'Hot Spot' mean here?
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+# What is 'oversample' in Dutch?
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# What does this word mean here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#  Do not rely on librsvg setting GError on failure!
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch phrase for 'aspect ratio'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of "Drop shadow"
+
+
+
+
+# What is the Dutch translation of "Drop shadow"
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch phrase for hue?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is meant with 'Vortex' here?
+
+# What is meant with 'Vortex' here?
+
+# What is meant with 'Vortex' here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of the word 'hue'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# Gimp Hulp browser
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+# No idea what this does. Ask Maurits.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+# Is there a Dutch phrase for this?
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# afsluiten/sluiten
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation for the word "dither"?
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is a 'scaling'?
+
+
+# What is the Dutch translation of the word 'hue'?
+
+
+
+
+
+
+
+
+
+
+#  * The "image size" button
+
+
+
+
+#, fuzzy
+
+
+# felle kleuren/vaste kleuren
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+# What is a radian?
+
+# What is a radian?
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+# What is being referred to with 'Decorations'?
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# windingen/cirkels
+
+
+
+
+
+
+# What is the Dutch translation of this term?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# html-term
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herhaald
+
+
+# vloeien/samenvloeien/mengen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# corona/kroon/krans
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# kerven/gekerfd/gekrast/uitgesneden
+
+
+
+# krijt/kalk
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# afzonderlijke laag
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# kleurenschema
+
+
+
+# berijpt/bevroren/vriezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# buis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 3d-verloop
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beginwaarde
+
+
+
+# nova met lijnen
+
+# regels/lijnen
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of this phrase?
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# kleur verlagen/lage kleur
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# cirkeltekst
+
+
+
+
+
+
+
+
+
+
+
+# What is the correct translation of the verb 'tile'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geweefte/weefgetouw/weven/geweefsel
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ik zou dit willen herschrijven in de trant:
+# Als u de toets Shift indrukt wordt bij een selectie een perfecte
+# cirkel of vierkant gemaakt. Als u de Ctrl toets indrukt wordt het
+# startpunt het middelpunt van de selectie 
+
+
+
+
+
+# gebruikers-interface
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# ui/galeon.glade.h:157
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# verlagen
+# neerwaarts
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Herstellen?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# alloceren/reserveren
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# steen/object
+#, fuzzy
+
+#, fuzzy
+
+# de widget is eigendom van de groep van het keuzerondje
+# de radioknop van de groep waartoe dit widget behoort.
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+# ui/galeon.glade.h:18
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+# muisaanwijzer/pointer
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# zwevende tip/werktip/uitlegtip/tooltip
+# bij discussie vonden veel mensen 'zwevende tip' mooi
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# Kleefrooster horizontaal
+# Rooster horizontaal kleven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# een kleur kiezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bestandselectie
+
+
+
+# wat is het verschil met de 'file chooser dialog'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vensterbeheer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vensterbeheer
+
+
+
+
+
+# letterlijk zwaartekracht
+
+
+
+# vensterbeheer
+
+#, fuzzy
+
+# vensterbeheer
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bestandselectie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# conversieprogramma/omzet-programma/omzetter
+# kon converteerder van %s naar %s niet openen
+# Openen van converteerder van '%s' naar '%s' mislukt
+# Openen van het programma voor het omzetten van s naar s is mislukt
+# (tekenreeks komt verderop nog een keer voor)
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Allocatie van %lu bytes om bestand "%s" te lezen is mislukt<
+
+
+
+
+
+
+
+
+
+
+
+# bestaand bestand is een beetje dubbelop
+
+
+
+
+
+# Openen van converteerder van '%s' naar '%s' mislukt: %s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet geoorloofd/toegestaan/ongeoorloofd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# werkmap/huidige map
+
+
+
+
+
+
+# fork is een functienaam, mag niet met hoofdletter beginnen
+
+
+# was eerst: herleiden
+
+
+
+
+
+
+
+
+
+# hulp-opties zijn opties voor de hulp
+# hulp opties zijn die opties van hulp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# integer-double
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# relatie?
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+# relatie?
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# verbinding/relatie/verhouding
+#, fuzzy
+
+# verbinding/relatie/verhouding
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# geselecteerd veld?
+
+# verbinding/relatie/verhouding
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# relatie?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# verbinden met/verbinding leggen/verbinding maken
+
+
+#, fuzzy
+
+
+# verbinden met/verbinding leggen/verbinding maken
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# verbondene/degene die een verband hebben
+
+# verbondene/degene die een verband hebben
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+# verbondene/degene die een verband hebben
+#, fuzzy
+
+
+
+
+
+
+# toets?
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+# hmm dit kan beter
+
+
+# hmm dit kan beter
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# verbondene/degene die een verband hebben
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# verbondene/degene die een verband hebben
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+# hier ook mengpaneel?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toepassingen/programma's
+
+# introductie/inleiding
+
+
+
+
+
+
+
+
+
+
+
+# verlenen/verkrijgen 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# installeren/toevoegen
+
+
+# pakketbeheerder/pakkettenbeheer
+
+
+
+
+
+
+
+
+# c-format
+
+# c-format
+
+
+
+
+
+
+
+# weergeven/tonen/in de gaten houden
+
+
+
+
+
+
+
+
+
+# Niveau rode waarde
+
+
+
+
+
+
+
+
+
+
+
+
+# onbepaalde
+# onbekende
+# onbepaalde dekt de lading beter?
+
+
+
+
+
+
+
+
+
+
+# er staat oorspronkelijk niet : weer, maar het kan wel hier vind ik
+
+
+
+
+
+
+
+
+
+
+
+
+# weergavevorm/uiterlijk/weergave
+
+
+
+
+
+
+
+
+# de U conflicteert met de gtk-label sl_uiten
+
+
+
+# terugloopt naar/minder is dan/teruggevallen is naar/onder de grens komt van/
+# /onder de grens is gekomen van/
+
+
+
+
+
+
+
+
+
+
+
+# hoofdletter? (ontbreekt in het engels)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tekenpalet/tekenspalet/letterpalet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aankoppelingsfout/koppelfout/aankoppelfout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het gaat om de toetsenbord-indeling
+
+
+
+
+# wisselt ipv wijzigt of verandert
+# en enkelvoud omdat bedoeld wordt: de combinatie van beide toetsen wisselt
+# de indeling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# indicator?
+
+
+# indeling hier ws beter dan wisselaar
+
+
+# Toetsenbord-indeling
+
+
+
+
+
+# omschrijving?
+
+
+
+
+
+
+
+
+# indicator?
+
+
+
+
+
+
+
+# indicator?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# terug/achteruit
+
+
+
+# verandering hier beter dan wijziging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weather.com bezoeken
+
+
+
+
+
+
+
+
+
+
+
+# temperatuureenheid
+# eenheid kan ook weggelaten worden
+# eenheid van temperatuur
+# verderop wordt ook Temperature units  gebruikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eenheid moet natuurlijk in enkelvoud zijn
+# (engels taalfout: meters)
+
+
+# eenheid is enkelvoud
+
+
+# de _a wordt al gebruikt voor Automatisch verversen
+
+# 'een locatie kiezen' is hier minder mooi
+# het is het kopje bij het venster met de locatie
+
+
+
+
+# Het relevante veld in gweather/Locations voor Nederland is:
+# [EU_NL]
+# name=Netherlands
+# loc0=Amsterdam EHAM ------ ---
+# loc1=Deelen EHDL ------ ---
+# loc2=Den\\ Helder/De\\ Kooy EHKD ------ ---
+# loc3=Eindhoven EHEH ------ ---
+# loc4=Gilze-Rijen EHGR ------ ---
+# loc5=Groningen EHGG ------ ---
+# loc6=Leeuwarden EHLW ------ ---
+# loc7=Maastricht EHBK ------ ---
+# loc8=Rotterdam EHRD ------ ---
+# loc9=Twenthe EHTW ------ ---
+# loc10=Utrecht/Soesterberg EHSB ------ ---
+# loc11=Valkenburg EHVB ------ ---
+# loc12=Vlieland EHVL ------ ---
+# loc13=Volkel EHVK ------ ---
+# loc14=Woensdrecht EHWO ------ ---
+
+
+
+# dit MOET dus zijn km/h en niet km/u
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen meervoud hier
+# zicht is 5 mijl
+
+
+# spatie na getal?
+# zicht is 50m
+# zicht is 50 m
+
+
+
+
+
+
+# eenheid voor afstand
+# eenheden voor afstand
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# c-format
+
+
+# het paneel behoeft geen volumeregeling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# buffer ipv cache?
+# cache is het duidelijkst hier
+
+
+# belasting/gebruik
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vastpinnen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Kiezen of..
+# Beslissen of..
+# weggelaten
+
+
+
+
+
+
+
+
+
+
+# naam/titel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen omgeving
+
+
+# is %s de foutmelding of de map?
+
+
+# propjes in de prullenbak :) beetje humor, en het is nog juist ook.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is geen waarschuwing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# luchtmachtschool?
+
+
+
+
+# vliegveld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is geen waarschuwing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gemeente Arlington
+
+
+
+
+
+
+
+
+
+
+# A met rondje?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit spaans voor provincie?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# camp niet vertaald naar kamp
+# denk: Camp David
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit het plaatsje Canadian of gewoon het adjectief Canadees
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# cape hier niet vertalen
+
+
+# cape niet vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# begraafplaats?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# van welke stad?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# continentale scheiding?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Duivelseiland
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Suriname
+
+
+
+
+
+
+
+# taalfout in engels?
+# Dnipropetrovs'k
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# east hier vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gemeente Edmonton, stedelijk?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Noorwegen, geen frederiksburg?
+
+
+# Noorwegen, geen frederiksburg?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Waarom staat 'the' achter Gambia?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Geneve?
+
+
+
+
+
+
+
+
+# Radames?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gerona?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# groenendaal?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# binnenhaven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# je moet er wat van maken he?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schrijf je dit met een trema?
+# ook gezein in bosatlas: Kiew
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# taalfout in engels?
+# Dnipropetrovs'k
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mayaguana
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ja, is het nou een airport of een airfield
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mykonos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hoe schrijf je dat eigenlijk?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in Australie
+
+
+
+
+
+
+
+# ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# petersburg?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in de bosatlas staat Ar Riaad
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# met streepje
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# oost/west
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lookout=...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Luchthaven South? /Zuid?
+
+# engels laten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# rif/reef?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Soerabaja?
+
+# Soerabaja?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# headland vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schateiland?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Troje?
+
+# Troje?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# baai van Tukialik?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# carthago?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# puntjes op de aa?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vereniging?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# universiteit van Victoria?
+
+
+
+
+# Wenen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# warchau
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# West Vlaanderen
+
+
+
+# Engels laten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is geen kiezelstrand maar een foto van grassprietjes
+# groen gras (naar analogie van gele/oranje bloem) of:
+# grasveld/groen grasveld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Includes/bevat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# moet zijn: determining ipv corresponding to wheter or not
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moetend de waarden vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# fout in de oorspronkelijke engelse tekst: must have to be displayed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangezet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# onderstrepen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# "server messages from the server" is dubbelop.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit kan beter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bartje!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weergeven als vertaling van show (vanuit het programma bekeken), ipv view (vanuit de gebruiker)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# deze vormt een zin met het volgende bericht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Fout in originele Engelse tekst: Twee sneltoetsen:
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bezig met
+
+
+
+
+
+
+
+
+
+
+
+
+
+# statuspaneel?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meervoud van byte is ook byte
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eindigen/voltooien/afsluiten/afmaken/klaar/af
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is this message about?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling nodig?
+
+
+
+
+# betere vertaling nodig?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het wijzigen van cursors mogelijk te maken/te kunnen wisselen van cursor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen/zonder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# taken/opdrachten/printopdrachten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gedetecteerde printer?
+
+
+
+
+
+
+
+
+
+# aangeraden
+
+
+
+
+
+
+# vanwege
+
+
+# leverancier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het logo van GNOME/het GNOME-logo
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# waarschijnlijk wordt hier de stijl beschreven
+# waarmee je de kaarten verplaatst.
+
+
+
+
+
+
+
+
+# BUG: Twee keer dezelfde zin, een keer met een punt een een keer zonder.
+
+
+
+
+# een uitroepteken is voldoende
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat moet een gebruiker nou met de term rule-based solitaire card engine?
+
+# wat voor context?
+
+
+
+
+
+# weergeven/tonen ipv bekijken/inzien oid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# stapel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebiedende wijs hier mooier
+
+
+
+
+
+# stapel
+
+
+
+
+
+
+
+
+
+
+
+# haal kaart van gebruikte stapel/haal gebruikte kaart
+
+
+
+
+
+
+
+
+
+# ~a word gevuld met een kaartnaam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kleur bekennen?
+# Gebruik/...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Ok, dit is dus geen werkwoord.
+# maar het aantal gewonnen<
+
+
+
+# Ok, dit is dus geen werkwoord.
+# maar het aantal gewonnen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Koningspubliek?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG, twee keer dezelfde zin, een keer met, een keer zonder punt.
+
+
+
+
+
+
+
+
+
+
+# Overslaan/Pas
+
+
+# opgeven/overgeven/passen
+
+
+
+
+
+# hands hier handen?
+
+
+
+
+# hand/kaart
+
+
+
+
+# Deal a hand: kaarten delen of geven?
+
+
+
+
+
+
+
+
+
+
+# vertalen of niet?
+
+
+
+# Moet dit vertaald worden?
+
+
+
+# is dit goed?
+
+# Is dit goed?
+
+
+
+
+
+
+
+
+
+
+# ook mooi: het betreffende bestand
+
+
+# om te passen/passen
+
+
+
+
+
+
+
+
+
+
+
+# bepalen/bepaling
+# dit wordt getoond tijdens het splashcreen
+
+# Je bent over de 21 en je verliest je inzet.
+
+
+
+
+# inzet wordt niet ingenomen of uitbetaald (bank en speler hebben beiden blackjack)
+# wordt over het algemeen niet vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# De bestandsnaam van het thema
+
+# de gevraagde hoogte/de hoogte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gaat het om de plaatjes op de stenen of de stapelwijze?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# komende/volgende/hierna
+# volgende knikkers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'computer' ipv 'ik' zou hier beter zijn denk ik.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG
+
+
+# BUG
+
+
+# BUG
+
+
+# BUG
+
+
+
+
+
+
+
+
+
+
+# BUG
+
+
+# BUG
+
+
+# stenen/tegels
+
+# stenen/tegels
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ongeldige zet
+
+
+
+
+
+
+
+
+
+
+
+
+
+# begin-level
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vinden ipv laden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG
+
+
+
+
+# Moet waarschijnlijk zijn 'collided'?
+
+
+
+
+
+
+
+
+
+
+# BUG
+
+
+
+
+
+
+# BUG
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+# Of de blokken willekeurige kleuren krijgen/een willekeurige kleur krijgen
+
+
+# of een vooruitblik op het volgende blok wordt gegeven/
+# of het volgende blok wordt getoond
+
+
+
+# target is waarschijnlijk de landingsplaats
+
+
+
+
+
+
+# samen/gevoegd
+# wat is de goede vertaling
+
+
+
+
+
+
+# Operatie
+
+
+# 'gebruiken' kan eventueel worden weggelaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mijnenjager?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# plaatjes/afbeeldingen
+
+
+# gaat het om de plaatjes op de stenen of de stapelwijze?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# idioot/stommeling
+
+
+
+
+
+
+
+
+
+
+
+# verkeersopstopping
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebruikt/weergegeven/gerenderd
+
+
+
+
+
+# dit is de tooltip, en geen menuonderdeel
+
+
+
+
+
+
+# play hier niet vertaald
+
+
+
+
+
+# lekker duidelijk :(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet dit wel vertaald worden?
+
+
+
+
+
+# moet dit wel vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# play hier niet vertaald
+
+
+
+
+
+
+
+
+
+
+# huh? Wat is stagger?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# games ipv spel, omdat spellen dubbelzinnig is (toegegeven in de context
+# valt het wel mee)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herstellen/ongedaan maken
+
+
+
+
+
+
+
+
+# hoe je het ook vertaald, het blijft altijd een beetje dubbelzinnig.
+# maar zo, op z'n simpelst is het voor iedereen toch wel duidelijk
+
+
+# topscores bekijken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gaat het om de plaatjes op de stenen of de stapelwijze?
+
+
+
+
+# na bugreport van Jeroen vd Vegt de vertaling gewijzigd in Stapelwijze.
+# Het frame-label: "Maps" behandelt de manier waarop de stenen
+# op elkaar worden gelegd.
+
+
+
+# na bugreport van Jeroen vd Vegt veranderd in Stapelwijze.
+# Het frame-label: "Maps" behandeld de manier waarop de stenen
+# op elkaar worden gelegd.
+
+# hoort bij frame "Maps"
+# Je moet kiezen voor een stapelwijze.
+# Je kunt hierna kiezen voor moeilijk of eenvoudig, dus het
+# geeft een moeilijkheidsgraad aan.
+
+# na bugreport van Jeroen vd Vegt veranderd in Stapelwijze.
+# Het frame-label: "Maps" behandeld de manier waarop de stenen
+# op elkaar worden gelegd.
+
+
+
+# een patience-spel/strategisch spel/...
+
+
+
+
+
+
+
+
+# het gedeelte voor de | moet niet worden vertaald
+
+
+# Woordenboek: confound: verwarrden, beschamen, verijdelen
+# Confounded: verduiveld
+
+
+
+
+
+
+
+
+
+
+# spel/bord
+# bordgrootte/spelgrootte
+
+
+
+# eigen/aangepaste
+
+
+
+# De bestandsnaam van het thema
+
+
+
+
+# tussen 3 en 101
+
+
+
+# snelle zetten/animatie
+
+# eigen/aangepaste
+
+
+
+
+
+
+
+
+
+
+
+
+# wat moet een gebruiker nou met de term rule-based solitaire card engine?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bureabladachtergrond/achtergrond bureablad
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toetsenindeling beheer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# balk/kader/venster
+# (zijbalk/zijkader)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# stapjes/stappen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+# 48x48/emblems/emblem-art.icon.in.h:1
+# 48x48/emblems/emblem-art.icon.in.h:1
+# 48x48/emblems/emblem-art.icon.in.h:1
+# 48x48/emblems/emblem-art.icon.in.h:1
+# 48x48/emblems/emblem-art.icon.in.h:1
+
+# 48x48/emblems/emblem-certified.icon.in.h:1
+
+# 48x48/emblems/emblem-cool.icon.in.h:1
+# 48x48/emblems/emblem-cool.icon.in.h:1
+# 48x48/emblems/emblem-cool.icon.in.h:1
+# 48x48/emblems/emblem-cool.icon.in.h:1
+
+
+
+
+
+
+
+# betere vertaling?
+# plaklabel?
+
+# 48x48/emblems/emblem-danger.icon.in.h:1
+# 48x48/emblems/emblem-danger.icon.in.h:1
+# 48x48/emblems/emblem-danger.icon.in.h:1
+# 48x48/emblems/emblem-danger.icon.in.h:1
+
+# 48x48/emblems/emblem-distinguished.icon.in.h:1
+
+# 48x48/emblems/emblem-marketing.icon.in.h:1
+# 48x48/emblems/emblem-marketing.icon.in.h:1
+# 48x48/emblems/emblem-marketing.icon.in.h:1
+# 48x48/emblems/emblem-marketing.icon.in.h:1
+
+
+# 48x48/emblems/emblem-favorite.icon.in.h:1
+# 48x48/emblems/emblem-favorite.icon.in.h:1
+# 48x48/emblems/emblem-favorite.icon.in.h:1
+# 48x48/emblems/emblem-favorite.icon.in.h:1
+
+# 48x48/emblems/emblem-ohno.icon.in.h:1
+# 48x48/emblems/emblem-ohno.icon.in.h:1
+# 48x48/emblems/emblem-ohno.icon.in.h:1
+# 48x48/emblems/emblem-ohno.icon.in.h:1
+
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+
+# 48x48/emblems/emblem-plan.icon.in.h:1
+# 48x48/emblems/emblem-plan.icon.in.h:1
+# 48x48/emblems/emblem-plan.icon.in.h:1
+# 48x48/emblems/emblem-plan.icon.in.h:1
+
+# 48x48/emblems/emblem-presentation.icon.in.h:1
+# 48x48/emblems/emblem-presentation.icon.in.h:1
+
+# 48x48/emblems/emblem-sales.icon.in.h:1
+# 48x48/emblems/emblem-sales.icon.in.h:1
+# 48x48/emblems/emblem-sales.icon.in.h:1
+# 48x48/emblems/emblem-sales.icon.in.h:1
+
+
+# 48x48/emblems/emblem-generic.icon.in.h:1
+
+# 48x48/emblems/emblem-urgent.icon.in.h:1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels: het woord 'coordinate' ontbreekt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanvraag ipv verzoek?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# De toetsen control en enter hebben in het nederlands dezelfde naam.
+
+
+
+
+# de naam van de toets enter is enter
+
+
+
+
+
+
+# engels spellingfout: mesage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# andere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# creating a new window and displaying it
+# Dit is devel-talk. De gebruiker ziet gewoon een nieuw venster verschijnen.
+# Deze hoeft niet te weten dat de software-ontwikkelaar eerst een venster
+# moet aanmaken en vervolgens de opdracht moet geven dit venster te tonen.
+
+
+
+
+
+# verbinding gelegd?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# enigszins vrij vertaald
+
+
+
+# beter: overzicht weergeven?
+
+
+
+
+
+
+
+# is dit de goede vertaling? of bedoelen ze dit:
+# Edit (the groups using the list below) for:
+
+
+
+# reden fout
+
+# vertaling?
+
+
+
+
+# kanaal ipv kamer?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Contactpersoon<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanmelden
+
+# afmelden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uit suske en wiske
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# have presence? are present?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# huh?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'has been requested to you' is fout
+# has been sent to you
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of gewoon chat...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# date of birth?
+
+
+
+
+
+
+
+
+# zet in werking?
+
+
+
+
+
+
+
+
+# Vieuwer hier niet meevertaald
+# Gebeurtenisweergave
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit goed?
+
+
+
+
+# bezig met
+# bezig te
+# aan het
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# fout in plaats van bug?
+
+# of:
+# (een) verzoek
+
+
+# omdraaien
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bevolkt?
+
+
+
+
+
+
+
+# 'if selected' niet meevertaald, verwarrend
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat betekent dit?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# besloten/gesloten/beveiligd
+# sleutelring/sleutelbos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Sleutelbosbeheer heeft iets met bomen te maken? hehe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ...is nog niet opgestart.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# menu weglaten
+
+
+
+
+
+
+
+
+
+# was eerst monitoring, vervangen door controle
+
+
+
+
+
+
+# in de gaten houden/controleren op/monitoren voor 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hmmm...
+
+
+
+# verbinding leggen
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Tekenset?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verbinding krijgen met netwerkverbinding... (2 x verbinding)
+# misschien kan interface gewoon weg worden gelaten
+
+
+
+
+# bezig met is overbodig hier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 
+
+
+# 
+
+
+
+
+
+
+# draadloos, maar wireless wordt inmiddels beter begrepen dan draadloos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling prefix?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# netwerk programma's 
+# netwerk hulpjes
+# netwerk toepassingen
+
+
+
+
+# netwerk programma's 
+# netwerk hulpjes
+# netwerk toepassingen
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Betere vertaling van 'specifier'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Ik denk dat hier processor time ipv compilation time bedoeld wordt.
+# Het applet is namelijk gecompileerd!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Roteren hier vervangen door Kantelen
+
+
+
+
+
+
+
+
+# Roteren hier vervangen door Kantelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meestal zal een andere gebruiker zich aanmelden en niet jezelf onder een andere naam.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Elders 'lock' als 'vergrendelen' vertaald, 'vastzetten' lijkt hier beter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meestal zal een andere gebruiker zich aanmelden en niet jezelf onder een andere naam.
+
+
+
+
+
+
+
+
+
+# Hoe is Unlock elders vertaald?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# http://home.o2w.net/~ivo/wiki.pl?Solid_Color
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is deze vertaling juist?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# juiste vertaling?!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Roteren hier vervangen door Kantelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Postvak in?
+
+
+
+# e-mail ipv berichten?
+
+
+
+
+
+
+
+
+
+
+# in overeenstemming met de entry "files mode" verderop
+
+
+
+
+
+
+
+
+
+# moet memo_file wel vertaald worden?
+
+
+
+
+
+
+
+
+
+# capplet is een verschrikkelijk woord.
+# wat doen we hier mee?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Herstellen of Terugzetten?
+
+
+
+
+
+
+
+
+
+
+
+# gezien het code-voorbeeld: misschien moet dit zijn: installerens als, 
+# ipv installeren naar.
+
+
+# vernietigen klink heftig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# inschakelen/uitschakelen? ipv aan/uitzetten?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# "bij" ipv "tijdens". De fout heeft te maken met het ophalen.
+# Bij 'tijdens' suggereer je dat het toevallig gelijktijdig gebeurd
+#, fuzzy
+
+#, fuzzy
+
+
+# opgewekt bij? ipv op?
+
+# opgewekt bij? ipv op?
+#, fuzzy
+
+
+
+
+# wat een nare zin om te vertalen. zo dubbelzinnig als't maar kan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangeven ipv specificeren
+
+
+
+
+# weergeven ipv opsommen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gncal/calobj.c:879
+
+
+
+# gncal/eventedit.c:405
+
+# gncal/prop.c:279
+
+# gnomecard/dialog.c:516
+
+# gncal/prop.c:279
+
+# gncal/eventedit.c:413
+
+# gncal/eventedit.c:1233
+
+# gncal/eventedit.c:1233
+
+
+# gncal/eventedit.c:412
+
+
+
+
+# gncal/eventedit.c:275
+
+
+
+# gncal/eventedit.c:291
+
+# gncal/eventedit.c:391
+
+
+# gnomecard/dialog.c:1716
+
+# gncal/eventedit.c:291
+
+# gncal/eventedit.c:291
+
+# gncal/eventedit.c:393
+
+# gncal/eventedit.c:1430
+
+# gncal/eventedit.c:809 gncal/gncal-todo.c:109
+
+# gncal/eventedit.c:249
+
+# gnomecard/dialog.c:539
+
+
+# gnomecard/dialog.c:539
+
+
+
+
+# gncal/prop.c:251
+
+
+
+
+
+
+
+# gncal/prop.c:317
+
+
+
+
+
+
+
+
+
+
+# gncal/gnome-cal.c:58
+
+
+# gncal/gncal-day-view.c:135 gncal/gncal-full-day.c:495
+# gncal/gncal-full-day.c:504 gncal/gncal-full-day.c:1671
+
+# gnomecard/dialog.c:1407 gnomecard/dialog.c:1408
+
+# gncal/gnome-cal.c:60
+
+
+# gncal/main.c:409
+
+
+# gncal/main.c:180
+
+# gncal/goto.c:264
+
+
+# gncal/eventedit.c:862
+
+# gncal/main.c:543
+
+# gncal/main.c:369
+
+# gncal/main.c:369
+
+# gncal/main.c:442
+
+# gncal/main.c:462
+
+# gncal/main.c:465
+
+# gncal/main.c:466
+
+# gncal/main.c:499
+
+# gncal/main.c:500
+
+# gncal/main.c:501
+
+# gncal/main.c:505
+
+# gncal/main.c:505
+
+
+# gncal/main.c:543
+
+
+# gncal/main.c:717
+
+# gncal/main.c:719
+
+
+
+
+# gncal/calobj.c:879
+
+
+# gncal/prop.c:317
+
+
+
+
+
+
+
+
+
+# gncal/getdate.y:428
+
+# gncal/prop.c:279
+
+# gncal/prop.c:290
+
+# gncal/prop.c:306
+
+# gncal/prop.c:317
+
+
+# gnomecard/dialog.c:960
+
+
+
+
+# gnomecard/dialog.c:516
+
+
+
+
+
+
+
+# gncal/eventedit.c:380
+
+# gncal/eventedit.c:249
+
+# gncal/eventedit.c:392
+
+# gncal/eventedit.c:393
+
+# gncal/eventedit.c:359
+
+
+
+
+# gncal/prop.c:251
+
+# gncal/gncal-todo.c:241
+
+
+
+
+
+# gncal/main.c:543
+
+
+
+# gncal/prop.c:317
+
+# gncal/prop.c:306
+
+
+
+
+
+
+
+
+# gncal/eventedit.c:362
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gncal/prop.c:290
+
+# gncal/prop.c:290
+
+# gncal/getdate.y:411
+
+
+
+
+
+# gncal/main.c:495 gnomecard/gnomecard.c:400
+
+
+
+
+
+
+
+
+
+
+
+# gncal/eventedit.c:894 gncal/prop.c:269
+
+# gnomecard/dialog.c:569
+
+
+# gncal/getdate.y:437
+
+
+# gncal/eventedit.c:1067
+
+
+
+
+
+# gncal/prop.c:255
+
+
+# gnomecard/columnhdrs.c:33
+
+# gnomecard/dialog.c:469
+
+# gnomecard/dialog.c:508
+
+# gnomecard/dialog.c:566
+
+
+# gnomecard/columnhdrs.c:39 gnomecard/dialog.c:411
+
+
+# gnomecard/dialog.c:569
+
+# gnomecard/columnhdrs.c:44
+
+
+# gnomecard/phonelist.c:268
+
+# gnomecard/addresslist.c:318
+
+# gnomecard/addresslist.c:38
+
+
+# gnomecard/phonelist.c:40
+
+# gnomecard/dialog.c:324
+
+
+# gnomecard/phonelist.c:42
+
+
+# gnomecard/addresslist.c:37
+
+# gnomecard/phonelist.c:41
+
+# gnomecard/addresslist.c:38
+
+# gnomecard/addresslist.c:37
+
+# gnomecard/addresslist.c:37
+
+# gnomecard/phonelist.c:39
+
+# gnomecard/dialog.c:608
+
+
+# gnomecard/phonelist.c:268
+
+# gnomecard/phonelist.c:40
+
+
+
+# gnomecard/addresslist.c:329
+
+# gnomecard/columnhdrs.c:35
+
+# gnomecard/addresslist.c:267
+
+# gnomecard/dialog.c:539
+
+# gnomecard/columnhdrs.c:35
+
+# gncal/eventedit.c:291
+
+# gnomecard/phonelist.c:42
+
+# gnomecard/addresslist.c:38
+
+# gnomecard/dialog.c:99
+
+
+
+# gnomecard/columnhdrs.c:35
+
+# gncal/eventedit.c:291
+
+# gnomecard/columnhdrs.c:39 gnomecard/dialog.c:411
+
+# gnomecard/dialog.c:626
+
+# gnomecard/dialog.c:384
+
+# gnomecard/dialog.c:327
+
+# gnomecard/phonelist.c:42
+
+# gnomecard/columnhdrs.c:42
+
+# gnomecard/dialog.c:101
+
+# gnomecard/dialog.c:633
+
+# gnomecard/columnhdrs.c:33
+
+# gnomecard/columnhdrs.c:35
+
+
+# gnomecard/dialog.c:1657
+
+
+
+# gnomecard/addresslist.c:255
+
+
+# gnomecard/dialog.c:1722
+
+# gncal/prop.c:440
+
+
+# gnomecard/dialog.c:1707
+
+# gnomecard/addresslist.c:255
+
+# gnomecard/dialog.c:1520
+
+
+# gnomecard/addresslist.c:255
+
+# gnomecard/gnomecard.c:400
+
+# gnomecard/gnomecard.c:410
+
+# gnomecard/gnomecard.c:566
+
+# gnomecard/gnomecard.c:566
+
+# gnomecard/gnomecard.c:443
+
+# gnomecard/columnhdrs.c:33
+
+# gnomecard/columnhdrs.c:32
+
+# gnomecard/columnhdrs.c:36
+
+# gnomecard/gnomecard.c:451
+
+# gnomecard/dialog.c:446
+
+# gnomecard/gnomecard.c:455
+
+# gnomecard/gnomecard.c:455
+
+# gnomecard/gnomecard.c:430 gnomecard/gnomecard.c:598
+
+# gnomecard/gnomecard.c:576
+
+# gnomecard/gnomecard.c:584
+
+# gnomecard/gnomecard.c:480
+
+# gnomecard/gnomecard.c:489
+
+# gnomecard/addresslist.c:255
+
+# gnomecard/addresslist.c:255
+
+
+# gnomecard/dialog.c:960
+
+# gncal/prop.c:509
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# diepslaap/slaapstand
+
+
+
+
+
+
+
+# betere vertaling van 'blank screen'
+# schermbeveiliging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# van het vaste stroomnetwerk af is/niet meer op netstroom loopt/
+# /geen netstroom meer gebruikt/de oplader is verwijderd/
+# /de ac-adapter is verwijderd
+
+
+
+
+
+
+
+
+
+
+
+
+# instellen/configureren
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# beeldscherm in slaapstand is onzinnig, het beeldscherm wordt
+# gewoon zwart en staat dus 'uit'
+# Beelscherm op zwart zetten (zwartmaken is dubbelzinnig)
+
+
+
+# loopt/draait
+
+
+
+
+# kritiek laag/laag
+# wanneer accu bijna leeg is
+
+# kritiek laag/laag
+# wanneer accu bijna leeg is
+
+
+
+
+
+
+
+
+# de laptop blijft nog 5 uur werken (ipv 5 uren)
+
+
+
+#, fuzzy
+
+# diepslaap/slaapstand
+
+#, fuzzy
+
+
+
+
+
+# diepslaap/slaapstand
+
+# diepslaap/slaapstand
+
+
+
+
+# low/very low/critically low
+# laag/bijna leeg/leeg
+#
+# bijna lege accu/accu is bijna leeg
+# accu is leeg (oeps, dan wil je snel wat gaan doen...)
+
+
+
+
+
+# onder het kritieke niveau/bijna leeg
+
+# onder het kritieke niveau/bijna leeg
+
+# onder het kritieke niveau/bijna leeg
+
+# onder het kritieke niveau/bijna leeg
+
+# vrij vertaald
+# onder het kritieke niveau/bijna leeg
+
+# loopt nu op batterijen/gebruikt nu accustroom
+# computer ipv systeem
+
+
+# onder het kritieke niveau/bijna leeg
+#, fuzzy
+
+# onder het kritieke niveau/bijna leeg
+#, fuzzy
+
+# onder het kritieke niveau/bijna leeg
+#, fuzzy
+
+# draait/loopt op batterijen/gebruikt batterijen/batterijstroom
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# draait/loopt op batterijen/gebruikt batterijen/batterijstroom
+
+
+
+
+
+
+
+
+# Zet computer in een slaapstand/pauzeer de computer
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# hoogste ipv laatste?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+# B=volledige maand
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# was/werd niet verwerkt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in stapjes/in stappen van/
+
+
+# op welke uren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# sjabloon/voorinstelling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is niet de schermbeveiliging maar de screensavers zelf
+# dus niet vertalen
+
+# aanzetten/instellen
+# (het is zo cryptisch dat het weer leuk wordt)
+
+
+# gebruikers wisselen toestaan
+
+
+
+# thema niet meevertalen
+
+
+
+
+# na een bepaalde tijd zou dubbelzinnig zijn
+
+
+
+
+
+# tussen wisselen van screensaver/voordat gewisseld wordt/nadat gewisseld wordt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# image niet vertalen dus!
+
+
+
+
+# LOCATIE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen geldige schermbeveiliging/screensaver
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+# infinitief hier mooier
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# infinitief hier mooier
+#, fuzzy
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+# zijn ook geldig/mogen ook
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ?
+
+# achtergrondkleur standaardgrafiek
+
+# kleur cpu standaardgrafiek
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bewaart: zorgt dat de volgende keer dezelfde tab wordt getoond
+
+
+
+# draden/threads
+
+
+# omdat dit in .schemes staat, killen gebruiken ipv vernietigen?
+
+
+
+
+
+
+# beëindigen/stoppen
+# (Edit-menu item)
+
+# stoppen/beëindigen
+
+# continueren/voortzetten
+# _V wordt gebruikt voor _Voorkeuren
+# Sneltoets is Ctrl+C
+
+# melding verschijnt in de statusbalk
+
+# sneltoets is CTRL+E
+
+# af te sluiten/stoppen
+
+# V wordt gebruikt voor _Voorkeuren
+
+
+# sneltoets is CTRL+R
+
+# (Statusbalkmelding)
+# Wijzig de prioriteit ('nice'-waarde) van dit proces.
+# prioriteitsvolgorde/prioriteitswaarde
+
+
+# melding verschijnt in de statusbalk
+
+# de sneltoets is Crtl-P
+
+
+# geheugenprojectie/geheugenverdeling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# history niet meevertalen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bestandsbeschrijving
+
+# bij proces %s in gebruik zijnde bestanden
+
+
+
+# je kunt meerdere processen tegelijk verbergen
+
+
+
+
+
+
+# (label van knop)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tabelkop
+
+# tabelkop
+
+
+
+# status: zombie
+
+# status: ononderbreekbaar
+
+
+
+
+
+
+# extern systeembeheer/systeembeheer op afstand
+
+
+# bootloader zou kunnen worden vertaald met opstartlader
+# dit moet dan wel overal worden gedaan
+
+
+# tooltip
+
+
+
+
+
+
+# selecteer welke van deze u wilt configureren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# selecteer een kernel-image
+
+# selecteer een initrd-image
+
+
+# toegevoegd aan het menu
+
+
+
+# BUG: het is geen pad, gewoon en naam van een image
+
+# BUG: het is geen pad, gewoon en naam van een image
+
+
+
+# _Root bestandssysteem apparaat:
+# het laat keuzemenu van /dev/hda1 etc zien
+
+# geef uw systeembeheerderswachtwoord
+
+
+
+
+
+
+
+# Zonder wachtwoord kunt u geen wijzigingen in de systeemconfiguratie aanbrengen.<
+
+# verbindingsgegevens?
+
+# verbindingsinstellingen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geluidssterkte modem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geluidsterkte/volumeniveau
+
+# extra instellingen
+
+
+# hosts toestaan
+
+
+# niet: eigenschappen delen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebruiker toestaan om te/gebruiker toestaan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# image/opstartbestand
+
+# Ongeldig opstartbestand
+
+# partitie/station/schijf/
+
+# Map ipv pad gebruikt
+
+# onjuist/niet juist
+# wat bedoelen ze hier mee?
+
+# modificeren/aanpassen/wijzigen
+
+# is titel van menuitem
+
+
+
+
+
+
+
+
+
+
+
+# verbinding krijgen/leggen
+
+# toestemming voor dit netwerk
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Welkom bij de %s probeerversie
+# (eerste tweede enz?)
+
+
+
+
+
+# aanzetten?
+
+
+
+# netwerkkaart ipv apparaat?
+# controleer of het . niet bezet is. (niet erg mooi; controleer of het bezet is ja of nee)
+# zorg dat het . niet bezet is.
+
+# aangepast
+
+# Reden: de computernaam is gewijzigd
+
+
+
+
+
+
+
+
+
+
+
+
+
+# netwerkverbinding
+
+
+
+
+
+
+
+
+
+
+
+# deactiveren/uitschakelen
+
+# wijzen/manieren
+# meerdere/verschillende
+
+
+
+
+
+
+# verwisselbare media/volumen
+
+# plannen/inplannen
+# plannen zou verwarrend kunnen zijn (bijv/ acties en plannen)
+
+
+
+
+
+
+
+# via/over
+# deelt mappen/mappen delen
+
+
+# toegangkelijk maken via het internet.
+
+
+# agent/assistent/
+# gaat hier om sendmail/postfix
+
+
+# agent/assistent/
+# gaat hier om sendmail/postfix
+# E-mail programma/ mail-verzendprogramma
+
+# bezorgt/verzendt
+# bezorgt is de postbode die het brengt.
+
+# klok/tijd
+
+
+
+# van printers/van een printer
+
+
+# ssh er tussen haakjes achter zetten?
+
+
+
+
+# uw webpagina's/webstek vanaf uw eigen computer beschikbaar/toegankelijk maken voor het internet
+
+
+
+
+
+
+# deel deze map met...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat een onzin in het geval van d=1: groepsnaam korter dan 1 teken?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# "as soon as" ipv "after" 
+
+
+
+
+
+
+# opgegeven?
+
+
+
+
+
+
+
+
+# kies ipv selecteer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontsnappingsteken/stuurcode
+
+
+
+
+
+
+
+# een pictogram voor het profiel
+
+
+
+
+
+
+
+
+
+# komt onder: '_Achtergrondafbeelding' te staan is dus duidelijk dat het
+# om een afbeelding gaat.
+
+
+# tabbladpositie?
+# geen tabbladen/tabs/uit
+
+
+
+
+
+
+
+# hieronder komt een schuifbalk [Geen----Maximimum] te staan
+# Bij geen is er geen effect, bij maximum zie je alleen nog de kleurtint
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de tekst wordt:
+# Dynamische titel [vervangt de begintitel/komt voor de begintitel/etc]
+
+
+
+
+# tekst wordt:
+# Schuifbalk staat [Aan de rechterkant/linkerkant/uitgeschakeld]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geen idee wat S/Key challenge is
+
+# geen idee wat OTP challenge is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebonden/verbonden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de GNOME-werkomgeving/voor GNOME
+# terminal-emulator/terminalvenster
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vlakblauw
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ingelogd/aangemeld
+# aangemeld bij wat, zou je je kunnen afvragen
+
+
+
+
+
+
+
+
+
+# persoonlijk/uw
+
+
+
+
+
+
+
+
+
+
+
+# Dit is subtiel anders dan het origineel. Betere vertaling?
+
+
+# beschadigde/foutieve/onbetrouwbare
+
+
+
+# moet overeenkomen met de ...Done versie
+# disk hier vertaald met diskette (het gaat om gfloppy)
+# als gfloppy ook harde schijven kan formatteren is het misschien
+# beter om "schijf" te gebruiken
+
+# hehe, grappig
+
+
+
+# moet overeenkomen met de versie zonder '...Done'
+
+
+# hij?
+
+# diskette-apparaat? floppydisk?
+
+
+# disketteapparaat?
+
+
+
+
+
+# idem aan versie zonder ...'Done'
+
+# Bij vertaling: Fout bij schrijven naar ..., zou je kunnen denken dat
+# er wel geschreven is, maar dat er een fout is opgetreden
+
+
+
+
+
+
+
+
+
+
+
+
+# aanmaken ipv maken (maken kan ook repareren betekenen)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# terggegeven/doorgegeven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontvanger?/socket/contactdoos
+
+
+
+
+
+
+
+# naam van lettertype/lettertypenaam/lettertype
+
+
+
+
+# internetverwijzingen/hyperlinks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat een techno-babble!
+
+
+
+
+
+
+# enkelvoud van woordenboek staat beter, meestal doorzoek
+# je maar 1 woordenboek tegelijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in woordenboeken/ in een woordenboek
+
+# spellingscontrole/programma
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# klikken/klik hier/klik/
+
+
+# dat/wat/welke
+
+
+
+
+
+
+
+
+# hint/mededelingen/indicatie/
+
+# hint/mededelingen/indicatie/
+
+
+
+
+
+
+# gebiedende wijs
+
+# stel in/geef
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zoekopdracht/opzoeken
+
+
+
+
+
+
+
+
+
+
+
+
+# "Een plaatje schieten"
+
+
+
+
+
+# opties voor schermafdrukken/schermafdruk
+
+#
+
+# "Een plaatje schieten"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Ietwat cryptische Engelse omschrijving, maar er wordt bijv
+# gezocht naar bestanden die minder dan 5 dagen geleden zijn veranderd
+#
+# Gewijzigd minder dan (dagen) geleden
+# In de laatste (dagen) gewijzigd
+# Wijzigingsdatum minder dan (dagen) geleden
+
+
+
+
+
+
+
+
+
+# bekend klinkt beter dan herkend, komt op hetzelfde neer?
+
+
+
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Ietwat cryptische Engelse omschrijving, maar er wordt bijv
+# gezocht naar bestanden die minder dan 5 dagen geleden zijn veranderd
+#
+# Gewijzigd minder dan (dagen) geleden
+# In de laatste (dagen) gewijzigd
+# Wijzigingsdatum minder dan (dagen) geleden
+
+
+
+# enkelvoud gemaakt: (wij zeggen 15 kilobyte)
+
+
+
+
+# bekend klinkt beter dan herkend, komt op hetzelfde neer?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# we weten niet wat de reden is (afgebroken, voltooid, fout)
+
+
+
+
+
+
+# dit zijn de tooltips?
+
+
+
+
+
+
+
+
+
+
+
+
+# Fout bij verwerken van zoekopdracht
+
+# Fout bij uitvoeren van zoekopdracht
+
+
+
+
+
+
+
+
+# drop-down vertalen? vallijst/expansielijst?
+
+
+# beschikbare niet meevertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# agenda?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beeldpunten/pixels
+
+
+
+
+# doorbladeren is hier wel heel toepasselijk
+
+
+
+
+
+#, fuzzy
+
+# initialiseren?
+
+
+
+
+# eindmarkering/eindemarkering
+
+
+
+
+
+
+
+# ontdekt/bepaald/gedetecteerd
+# auto-gedetecteerd
+# determined/detected
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwerken/ontleden
+
+# komende/volgende/hieropvolgende
+
+
+
+
+
+
+
+
+
+
+
+# bewerking/opdracht
+
+
+# Circulaire koppelingen gevonden/kringverwijzing
+
+
+
+
+
+
+
+
+# verwijzingen/koppelingen/links
+
+
+
+
+
+
+
+
+
+
+# analyseren/verwerken/ontleden
+
+
+# vertaling voor timeout?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# compact-flash
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# externe computer/computer op afstand
+
+# absoluut zeker wilt weten of/er absoluut zeker van wilt zijn dat
+# /zeker wilt weten of/absulute zekerheid wilt hebben dat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG: machine name. Dit is erg lelijk, moet zijn host/computer/server
+
+
+
+
+
+
+# het poortnummer
+
+# Het poortnummer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# brandopdracht/programma
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bij/voor weinig harde schijfruimte
+
+
+
+
+
+
+# Video-VCD is dubbelop
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beter tablet? (tablet is ook pilletje)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gedetecteerd/ontdekt/aangetroffen/gevonden/
+
+
+
+# foto's importeren
+
+
+
+
+# muziekapparaat/speler
+
+
+
+
+
+
+
+
+
+
+
+# geheime/onzichtbare/achtergrond
+
+# niet herkend/ongeldig
+
+
+
+# 1 volumen, 2 volumina
+
+
+
+
+# controleer of/dat
+
+# bepalen/verkrijgen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kan kleur niet begrijpen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# grootte van kruisdraad verkleinen/kruisdraad verkleinen
+
+# kruisdraad vergroten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Muis naar huidige object brengen
+
+# Muis naar huidige object brengen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# teken `
+
+
+
+
+
+
+
+# niveautoetsen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# attributen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# plaatjes/afbeeldingen
+
+
+
+
+
+
+
+# was eerst _Werkomgeving
+
+
+
+
+
+
+
+
+
+
+
+
+# Muis naar huidige object brengen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# display is hier (waarschijnlijk) geen werkwoord
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betekent seperate hier: independant?
+
+# vloeiend type/soort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Betere term?
+# breedsprakig, woordenrijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Say: noemen, opnoemen, zeggen opzeggen
+
+
+
+
+
+
+# opzeggen?
+
+# opzeggen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was eerst: aangepaste lijst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Nato-spellingsalfabet
+# Phonetic| moet niet worden meevertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# capital - hoofdletter
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wazig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat is het verschil met accelerator?
+# toetscombinatie?
+
+
+
+# gaan naar/wisselen naar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# met geen naam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# key-pad -> pijltoetsen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is de escape toets
+
+
+
+
+# srcore is screenreader-core
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kleurselectie
+# kleurkiezer
+
+
+
+
+
+
+
+
+
+# was eerst _Werkomgeving
+
+
+
+# was eerst _Werkomgeving
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gespleten beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schakelaar beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Goede afkorting van pijl?
+
+
+
+
+
+
+
+
+
+
+# Tekenvenster?
+
+
+
+
+
+
+
+
+
+
+# console beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# teken ~
+
+
+# teken !
+
+
+# teken @
+
+
+# teken #
+
+
+# teken $
+
+
+
+
+
+# teken *
+
+
+# teken (
+
+
+# teken _
+
+
+# teken +
+
+
+# teken =
+
+
+# teken -
+
+
+
+# teken [
+
+
+
+
+# teken {
+
+
+
+
+# teken ;
+
+
+# teken :
+
+
+# teken "
+
+
+# teken '
+
+
+# teken #: srcore/srspc.c:920
+
+
+# teken |
+
+
+# teken >
+
+
+# teken <
+
+
+# teken ,
+
+
+# schuine streep? teken /
+
+
+# teken ?
+
+
+# haktabel?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Was eerst * Het gegeven resultaat is uitgedrukt als de mate van verandering
+# van de optiewaarde, per eenheid van verandering in koerswaarde @koers.
+
+
+
+
+
+
+
+# weggehaald:
+# * De resultaatwaarde zal worden uitgedrukt als het tempo 
+# van verandering van de optiewaarde, per 100% volatiliteit
+
+
+
+
+
+# onderliggende waarde of onderliggende?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# onderliggende waarde of onderliggende?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# onderliggende waarde of onderliggende?
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Alle database functies moeten in principe dezelfde beschrijving van de argumenten bevatten.
+# Soms staat er in het Engels alleen: 'a value from a column'.
+# Hier wordt wel degelijk ook gewoon bedoeld: aan waarde uit een lijst of uit een database'
+# Mogelijk moet hier een Bugrapport voor geschreven worden.
+
+
+
+
+
+
+
+
+
+
+# condities->voorwaarden
+# John->jan
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+# het is niet mogelijk om de conventie te kiezen?
+# Bugrapport?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# De tabulatie van de elementen ziet er hier in een teksteditor misschien
+# wat vreemd uit, maar het eindresultaat geldt (dus de versie zoals die in
+# gnumeric zichtbaar is)
+
+
+
+
+
+
+
+
+# gos=grade of service
+# servicekwaliteit?
+# (ik ga voor kwaliteitsgraad)
+# Grade Of Service. The definition of service on telecommunications 
+# transmission facilities. Grade of service is typically defined as a
+# "P" factor - the probability of encountering a busy signal on a trunk
+# or group of trunks. For example, a P01 grade of service means that one
+# percent of calls will encounter a busy signal.
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# De functie zou een #WAARDE foutmelding moeten geven ipv #GETAL 
+# net als bij EUROCONVERT
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+# prorated: betekent per rente, dus lineair afhankelijk
+
+
+
+
+
+
+
+# pv = present value? Par value, principal value?
+
+# controleer of beschrijving klopt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG:
+# De engelse versie heeft het over values terwijl argumenten hier beter is
+# (en tevens ook standaard). 
+# Daarnaast beschrijven ze een van de voorwaarden in het meervoud:
+# If the values contain strings....
+# Het is beter en meer standaard om daar enkelvoud te gebruiken.
+
+# zie commentaar bij OR
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# Engels: twee keer ABS (moet waarschijnlijk 1 keer MOD zijn)
+# @SEEALSO=CEIL, CEILING, FLOOR, ABS, INT, ABS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lower tail- linker staart
+
+
+
+# quantile/kwantiel/kwartiel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# mediaan?/gemiddelde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# data set -> verdeling ipv verzameling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+# BUG: de engelse versie voldoet niet aan het formaat: na de beschrijving begint het met: The
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG hoofdletters voor de functienaam
+#, fuzzy
+
+
+
+
+
+
+
+# verwerkingsfout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# DIF =? csf
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# werkblad? blad is hier beter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwerken/behandelen/in behandeling nemen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tijdtekst?
+
+
+
+
+
+
+
+
+
+
+# gos=grade of service
+# servicekwaliteit/kwaliteitsgraad
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afkorting?
+
+
+
+
+
+
+
+
+# matrix/array/reeks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wisk. functies
+
+# wiskundige functies/wiskundefuncties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was eerst Database functies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# alloceren/reserveren
+
+
+
+
+
+
+
+
+
+
+
+
+
+# rekenblad/spreadsheet
+# is versleuteld met een wachtwoord
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# engels taalfout: whether print grid lines
+#   moet zijn:     whether to print grid lines
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herhaald/herhalend
+
+# herhaald/herhalend
+
+
+# schalingssoort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# printerconfiguratie?
+
+
+# automatische opmaak
+
+
+
+# bewerken/veranderen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eenvoudiger gemaakt:
+# Deze waarde bepaalt of pagina's standaard horizontaal moeten
+# worden gecentreerd. Gebruik het dialoog Afdrukinstellingen om
+# deze instelling te wijzigen.<
+
+
+
+# van een werkboek, of voor een werkboek?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tonen/zichtbaar
+
+
+
+
+
+
+# Realtime meeschuiven?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zichtbaar weghalen? tonen/zichtbaar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# van een werkboek, of voor een werkboek?
+
+
+# lijsten ipv ketens ivm constistentie vorige msg
+
+
+
+
+
+
+
+
+# mogen deze waarden vertaald worden?
+# waarschijnlijk niet. Het zijn key values voor Gconf
+
+# geen idee wat deze toetsen doen
+
+
+
+
+
+
+
+
+
+
+
+
+# gegroepeerd door:
+
+
+
+
+
+# kleine letters?
+
+
+# Te veel hoofdletters?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# apply wordt hier het beste vertaald met weergeven.
+# in de gui staat een lijst met items die aangevinkt kunnen worden
+# en die dan direct de opmaak van de voorbeeldtabelen aanpast.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# horizontale uitlijning instellen
+
+
+
+# sample is hier niet steekproef
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verbindingsstreepje?
+
+
+
+
+
+# Dubbele hoofdletters?
+# Berichtinvoer?
+
+
+
+
+# uitlijning
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Uitvullen?
+
+
+
+
+
+
+
+
+
+
+# Het geselecteerde veld...verplaatsen
+
+# Het geselecteerde veld...verplaatsen
+
+# het selecteerde veld ...verwijderen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beeldtaal/UI/bediening
+
+
+
+
+# pakketten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Het uitvoerbereik is ongeldig.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# interne verwijzing
+
+
+# externe verwijzing
+
+
+# verwijzing
+
+
+# verwijzing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# was: manier van plakken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is een item van het voorkeurs-venster
+
+
+# dit is een dropdown waarbij de gebruiker kan kiezen uit
+# verschillende sjablonen. Dus misschien beter:
+# voettekst kiezen
+
+
+
+# gelijkwaardig/gelijkmatig/gelijk/uniform
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zichtbaarheid/zichtb/tonen/toon
+
+# richting/kant/volg(orde)/orde/
+
+
+
+# naam hebben/krijgen
+
+
+
+
+
+
+
+
+
+
+
+# looptijd / uitvoeringstijd
+
+
+
+
+
+
+
+
+
+
+# Getallen-voorwaarden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# exporteerformaat kiezen
+
+
+# bladen kiezen om te exporteren
+
+
+
+
+
+
+
+
+
+# bladen/werkbladen
+
+
+# Woordenboek: Overzetten in lettertekens van een andere taal
+# Escape overzetten?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Comma seperated file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tekstaanwijzer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het % teken is hier overbodig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangepast/gewijzigd
+
+
+
+
+
+
+# verwijzing/doel/link
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# matrix is denk ik beter hier.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# waarschijnlijk geen invoegmethode omdat er ook Delete Method is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# allemaal inschakelen? (alle plugins inschakelen)
+
+
+
+
+
+
+
+
+
+# Was eerst: Titels om te printen
+# Dit is een kadertitel met daaronder de twee opties om rijen of
+# kolommen te laten herhalen bij het printen 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Kolommen die steeds links op de pagina worden herhaald:
+
+
+
+
+
+
+
+# Rijen die steeds bovenaan de pagina worden herhaald:
+# Rijen die op elke pagina terugkomen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# opmaken ipv aanmaken klinkt beter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# werkbladen?
+
+# Gegevens verschuiven
+
+
+# husselmethode? schudden
+# verschuiven
+# door elkaar? omroeren?
+
+
+
+
+# simulatieoverzicht
+
+
+
+
+
+
+
+
+
+
+
+
+
+# referentiedoel?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# linkerzijde
+
+
+
+
+
+
+
+
+
+
+# verhogen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# misschien 'maken' weglaten
+
+
+# aangegeven scherm/gespecificeerde scherm
+
+
+
+
+# opmaak van de werkmap
+
+
+
+
+
+
+
+
+
+# er wordt beveiliging bedoeld, geen bescherming
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# steekproef nemen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# waardes of waarden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of een beantwoordingsrapportage?
+
+
+
+
+
+
+
+
+
+# Rapportage?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tweeledige rapportage
+
+
+
+
+# probleem/fout  als vertaling voor 'failure'
+# probleem is vriendelijker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# naar boven/onderen
+# naar voren/achteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# meervoud ipv enkelvoud gebruiken.
+# Het gaat om het aantal functies dat aanwezig is binnen een categorie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tijdens/bij
+
+
+
+
+# VLAGGEN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toewijzingsfout
+
+
+
+
+
+
+# toewijzingsfout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is wat anders dan: tekst doorzoeken
+
+
+
+
+
+
+
+
+
+
+# doorzoeken per rij/op rij
+
+
+
+
+
+
+
+
+
+
+# geen enkele opslaan/niets opslaan
+
+
+# uitloggen/afmelden
+
+
+
+
+
+
+# tonen/weergeven
+
+
+# tonen/weergeven
+
+
+
+# tonen/weergeven
+
+
+
+
+
+
+
+# betere vertaling voor outline symbols?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de betekenis is:
+# lists the mime types that the program ssindex is able to handle
+
+
+
+
+
+
+
+# parse-> taalkundig ontleden ?
+
+# beter: heeft niet de opgegeven tekenset?
+
+
+
+# 'trying to' is niet vertaald
+
+
+# CHECK misschien is dit te lang
+
+
+
+# CHECK misschien is dit te lang
+
+
+# Woordenboek: Overzetten in lettertekens van een andere taal
+# Escape overzetten?
+
+# vraagvorm gezet
+
+
+
+
+
+
+
+
+
+
+# onwaar/niet waar
+
+
+
+
+
+
+
+
+
+# not available, niet beschikbaar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# formatteren/opmaken/opmaak
+# Algemene opmaak/normale opmaak/zonder opmaak
+
+# formatteren/opmaken/opmaak
+
+
+
+
+# als bij wetenschappelijke notatie
+
+
+
+
+
+
+
+
+
+
+# omlaag kopieren
+
+
+
+
+
+
+
+
+
+
+
+
+# voorspelling
+
+
+
+
+
+
+# gnumeric home page
+
+
+# onmiddellijke/directe assistentie/hulp
+
+
+
+
+
+
+
+
+# was eerst versturen aan...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# EN Spelling: *that* are uses by...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# mogelijk kan 'achteraan' worden weggelaten (we gebruiken
+# toevoegen ipv invoegen)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# inzoomen of uitzoomen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schudden? door elkaar husselen
+
+
+# Valideren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Een teller?
+
+
+
+# combinatie combinatieframe?
+
+
+
+
+
+
+
+# tooltip
+
+
+
+
+
+
+# Financieel
+
+
+
+
+
+
+
+
+
+
+
+# Was eerst:
+# De geselecteerde cellen gebruiken een scheidingsteken voor duizendtallen
+
+# nauwkeurigheid verhogen/aantal decimalen vergroten/meer decimalen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# omschakelen/ aan/uitzetten aan/uit
+
+
+# uitloggen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# justify=align?
+# ordenen/uitlijnen
+
+
+
+
+
+
+
+# korpsgrootte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontdooien of loslaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG: cold border color slaat nergens op.
+# Het plaatje laat blauwe lijnen zien, een ander sjabloon heeft
+# paarse lijnen en heet: purple border color
+
+
+
+
+
+
+
+
+# BUG engelse omschrijving verbeteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# suggestions beter dan predictions. BUGREPORT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangepaste toetsenborden
+
+
+
+
+
+
+
+
+
+
+# Controletoets
+
+
+
+
+
+
+
+# Het type waarde dat door een invoerapparaat wordt afgegeven.
+# Een schakelaar kan bijvoorbeeld alleen aan/uit, maar een apparaat
+# dat op je hoofd gemonteerd wordt en zo met je mee kan kijken op het
+# scherm heeft een 2-dimensionale waarde-invoer.
+# Een schuif is weer 1-dimensionaal.
+
+
+
+# zucht, wat een warrige taal.
+
+
+
+
+
+
+# Dwell: als je boven de toets blijft hangen wordt hij
+# geactiveerd. Je hoeft de toets dan niet in te drukken. (voor mensen die hun
+# handen niet kunnen gebruiken)
+# Hangen, Aarzelen, Verblijven, Blijven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# suggestions beter dan prediction, maar de 
+# ontwikkelaars denken er anders over
+
+# wordt hier het opvullen van de schermbreedte bedoeld?
+
+
+
+
+
+# eigenlijk: Toetshoogte maar voor de consistentie hier los geschreven.
+# Misschien moeten de anderen wel aangepast worden.
+
+
+
+
+
+
+
+
+# Controletoets
+
+
+
+
+
+# suggestions beter dan predictions imho, maar de
+# ontwikkelaars denker er anders over.
+# Voorlopig wel vertalen als suggesties, totdat we klachten krijgen
+
+# suggestions beter dan predictions imho, maar de
+# ontwikkelaars denker er anders over.
+
+# suggestions beter dan predictions imho, maar de
+# ontwikkelaars denker er anders over.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Toegangsmethode
+
+
+
+# duidelijker dan spatiering
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# eigenlijk: muistoetsen, maar is mogelijk te lang
+
+
+# er staat in het engels: Prior
+# moet Previous zijn?
+# Dit is waarschijnlijk de toetsen op een
+# Sun toetsenbord. Deze heeft toetsen. Prior en Next
+
+
+
+
+
+
+# Wat is dit?
+
+
+
+
+
+
+# wat is de juiste/goede vertaling hiervoor?
+
+
+
+
+
+
+
+
+# dit zijn frequentielijsten voor de Nederlandse taal.
+# Ref: http://www.onzetaal.nl/advies/letterfreq.html
+
+
+
+
+
+
+# moeten we credits vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat een onbegrijpelijk bericht. Bugzilla voor de ontwikkelaars?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit is niet mooi!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebruiken of aanzetten?
+
+
+
+
+
+
+
+
+
+
+
+# Op slot doen, vastzetten, klink
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is een tooltip
+
+# uitpakken/onttrekken/extraheren/rippen/kopieren
+# als experiment vertalen als 'kopieren', want dat is
+# wat mensen doen als ze een cd rippen, een kopietje op je harde schijf
+# of cd zetten (in een of ander bestandsformaat)
+
+# bezig met nummers uitpakken/nummers worden uitgepakt
+
+
+# hoge/grote
+
+
+# de _a wordt al voor _annuleren gebruikt
+
+
+
+
+# een aanvinkoptie, voor het aanmaken van een pls-bestand
+
+
+
+
+
+
+
+
+
+
+
+# image is hier het iso-bestand?
+
+# er komt te staan:
+# Gevonden afbeeldingen: %u, laden van afbeelding: %u
+
+
+
+
+
+
+# aanwezig/beschikbaar
+
+# bitsnelheid/bitfrequentie
+
+
+
+# Kleinere bestanden/Kleinere bestandsgrootte
+
+# hogere/betere
+# kan volgens mij alletwee. Google geeft: 
+# hogere kwaliteit: 279.000
+# betere kwaliteit: 392.000
+
+# sneller comprimeren/snellere compressie
+
+
+
+
+
+
+
+# met/door
+
+
+
+
+
+# lade geopend/lade staat open/geopende lade/ lade open
+
+# dit is een tooltip
+
+# bezig/ cd wordt uitgeworpen
+
+
+
+
+
+# wijzigen/aanpassen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verscheidene/verschillende (weggelaten)
+
+
+
+
+# nummers weggelaten
+
+# locaal opgeslagen afbeelding
+# 'from disk' is met gnomer-vfs niet eens helemaal meer waar.
+# iig wordt hiermee de bestandskiezer geopend
+
+
+# je hoeft niet zelf te zoeken, dat doet het programma
+
+
+
+
+
+
+
+
+# wat wordt hier bedoeld: random of shuffle?
+# kriskras/door elkaar/willekeurig/lukraak
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Echt mooi is dit niet, maar ja... (Wouter Bolsterlee)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrije ruimte voor(aan)
+# vrije ruimte achter(aan)
+
+
+# volgend op/erachter
+
+# kortere vertaling?
+# instellen (je gaat de partitie instellen)
+
+
+
+
+
+# N.B. letterlijke vertaling: U heeft een disklabel nodig... is lelijk
+# de schijf/deze schijf
+# te kunnen aanmaken/aan te maken
+
+
+
+
+
+
+
+
+# Ongebruikt
+
+# Markeringen
+
+# minimaal/minstens/tenminste
+# bezig/bezet
+
+
+
+
+
+
+
+
+
+# afronden op cylinders/afronden op de cylinder
+
+
+# logisch station
+
+# logisch station
+
+
+
+
+# herschalen
+
+# dit is een kop in het dialoogvenster
+# Bewerkingen in de wachtrij uitvoeren
+
+# uitleg onder de kop
+
+
+# titel van de voortgangsbalk
+
+# titel van de voortgangsbalk
+
+
+
+# bewerking/handeling/operatie/actie
+# afbreken/annuleren
+
+# verlopen/voltooid
+
+# toepassen/uitvoeren
+
+# to disk weggelaten
+
+
+# afbreken/annuleren
+
+# afbreken/annuleren
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# koppelingspunt/aankoppelingspunt
+# punt/map
+
+
+
+
+
+
+
+
+
+# van grootte veranderen/grootte van partitie wijzigen
+
+# oud/nieuw oude/nieuwe vorige/nieuwe
+
+
+
+
+
+
+
+# partitiesoort/partitietype
+
+
+
+
+
+
+
+# omdat de grafische representatie van de schijf toch geen direct verband
+# heeft met de fysieke indeling van de schijf, zijn 'naar voren' als
+# 'naar achteren' net zo goed/fout als 'naar links' en 'naar rechts'.
+# Bij de laatste is het voor de gebruiker echter meteen duidelijk wat er
+# gebeurt omdat het grafisch weergeeft wat er gebeurt.
+# voorwaarts/naar voren/naar rechts
+
+# achterwaarts/naar achteren/naar links
+
+# 1 herschalen van 2 naar 3/
+# /grootte van 1 veranderen van 2 naar 3
+
+
+
+# vrije ruimte op de harde schijf waar een partitie op aangemaakt
+# kan worden
+
+# niet geformatteerd/zonder format/ongeformatteerd
+
+
+
+
+
+
+
+
+# het is ietwat inconsequent om de devices hier te vertalen als
+# 'stations', we gebruiken al apparaten/schijven
+# schijven/stations/apparaten
+# verder is herladen niet echt duidelijk.
+
+
+
+
+
+
+
+
+
+
+
+
+# 'uitvoeren' hier toch beter dan 'toepassen'
+
+# kortere vertaling?
+# instellen (je gaat de partitie instellen)/plaatsen/wijzigen/herschalen
+
+
+
+# koppelen aan/aankoppelen op
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet dit vertaald worden?
+# wisselbestand/wisselgeheugen
+
+# moet dit vertaald worden?
+
+
+# schijven/stations/apparaten
+
+# schijven hier gebruikt ipv apparaten
+
+# koppel alle (aangekoppelde) partities los. (aangekoppelde weggelaten want het is
+# een beetje dubbelop)
+
+
+
+
+# hoofdbericht
+
+# verklarende tekst
+
+
+# alle logische partities afkoppelen die een nummer hebben hoger dan
+# ...met een hoger nummer dan
+
+
+
+
+
+
+
+# aankoppelpunten/koppelpunten/koppelingspunten
+
+
+
+
+
+
+
+
+# aankoppelen op/koppelen aan
+
+# aankoppelen op/koppelen aan
+
+
+
+
+
+# data/gegevens/informatie
+
+
+
+# laten groeien/groter maken/uitbreiden/laten uitzetten
+
+# herschalen
+
+
+
+
+
+# hmm, flag vertalen?
+
+
+
+
+
+# testrun uitvoeren
+
+# laten groeien/groter maken/uitbreiden/laten uitzetten
+
+
+
+
+# uitzetten?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# invoeren hier met opzet weggelaten
+
+
+
+
+
+
+# hekje hier weggelaten, omdat wij dat eigenlijk niet gebruiken
+
+# misschien beter: uit (ipv van): pagina 1 uit 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# waarschijnlijk is 'limit' hier geen werkwoord
+# en wordt het gebruikt om de kleuren van de limieten aan te geven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Doorgaan met meten tijdens minimalisatie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# runnable moet running zijn denk ik.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Uur/Uren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verbinding leggen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# misschien: traceren ipv oplossen, of
+# Kon het adres dat bij hostnaam hoort niet vinden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hier vrij vertaald, de bedoeling is duidelijk
+
+
+
+
+
+
+
+
+
+
+
+
+# binnenhalen ipv downloaden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moeten we dit vertalen of niet?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling van timestamps?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weergeven als catalogus
+
+
+
+# een viewer bestaat ook in het Nederlands. Bekijker/weergever
+# is te vergezocht
+
+
+# was eerst tuimelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG: engels: Prevous
+
+
+
+
+
+# Aperture is letterlijk opening, dus er wordt ws. diafragma bedoeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# datum kan hier weggelaten worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in/naar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# datum kan hier weggelaten worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# incrementeel is geen nederlands woord.
+# Hier wordt ws bedoeld:
+# Het gedeeltelijk laden en dan al gedeeltelijk weergaven van een afbeelding
+# geleidelijk laden/deelsgewijs laden
+
+
+
+
+
+# meervoud in nl van byte is byte
+# reserveren van %u byte geheugenruimte voor de afbeelding is mislukt
+# Niet mogelijk om afbeeldingsbuffer van %u byte te alloceren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# overlopende stapel
+# maar dit is toch een melding waar newbies niets mee kunnen.
+# Ze zouden deze melding eigenlijk niet mogen zien.
+# Om degene die wel weten wat ze ermee kunnen doen niet op een dwaalspoor
+# te zetten: Niet vertaald
+
+
+# onjuiste code
+
+
+
+# composite a frame?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet tussen 0 en 9 liggen
+
+# moet tussen 0 en 9 liggen
+
+
+
+
+
+
+
+
+
+
+# kan niet behandelen
+# kan niet aan
+
+
+
+
+# tegengekomen/ontdekt/gevonden
+
+
+
+
+
+
+
+
+
+
+
+
+# Reserveren van geheugenruimte voor IOBuffer struct niet gelukt
+# kan geen geheugenruimte reserveren voor ....
+
+
+# kan niet opnieuw geheugenruimte reserveren
+
+
+
+
+
+
+
+
+
+
+# te veel data in bestand
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afbeelding ipv bestand gebruikt.
+
+
+
+
+
+
+
+
+# Let me remind translators that it's best not to translate these key
+# names if they're not translated on keyboards in front of you.  But, be
+# sure to strip the "keyboard label|" part in translations, since that's
+# how context marking works in glib. (Danilo)
+
+
+
+# mijn toetsenbord zegt: pauze/n break
+
+
+
+
+# dit is ws de windowstoets (configureerbaar?)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# naar boven/onder
+
+
+# naar boven/onder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schuine streep
+
+
+
+
+# het gedeelte voor | is om het bericht meer uniek te maken en mag niet
+# worden vertaald.
+
+
+# niet strikt vertaald.
+
+# niet strikt vertaald
+
+
+
+# niet strikt vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# worden afgebeeld/
+
+
+
+
+
+
+
+
+# favorieten/bladwijzers
+
+
+
+
+
+
+# _b zou conflicteren met: _Bladeren naar andere mappen
+
+# wordt/worden
+# kiezen welk soort bestanden getoond wordt
+#                             wordt weergegeven
+#                   bestand  
+#             type
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tekens ipv symbolen?
+
+
+# tekens ipv symbolen?
+
+
+
+
+
+
+# Really hoeft hier niet vertaald te worden.
+
+
+
+
+
+
+# bestandsnaam wijzigen in
+
+
+
+
+
+
+
+
+# Kies een andere naam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Navigation wordt o.a. gebruikt bij het doorlopen van
+# configuratie-assistenten en bij webbrowsers
+
+
+
+
+# Vorige is ook een mogelijkheid:
+# Forward-Back Volgende-Vorige
+# voorlopig laten staan op Terug (12-08-2005)
+
+
+# Was eerst: Voorwaarts, maar bij configuratie-assistenten is
+# dat onlogisch. Daar betekent het in feite hetzelfde als Next.
+# Volgende dus. Desnoods zou 'Heen' (Forward-Back <-> Heen-Terug)
+# ook kunnen, maar dat is minder mooit.
+
+
+# ga naar
+
+
+
+
+
+# Was _Voorwaarts, maar bij media moet het Vooruit zijn
+# of Vooruitspoelen (vergelijk Back: Terugspoelen)
+
+
+
+
+
+
+# Terug of Terugspoelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Alt?/ Super?
+
+
+
+
+
+# ongebruikt/niet gebruikt/uitgezet/onbruikbaar/niet bruikbaar
+
+
+
+# Engels heeft geen hoofdletter aan begin van zin
+
+
+# dit is ws voor een wacom-tablet
+
+
+
+
+
+
+# focus grijpen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# smiley/emoticon/emotieteken
+
+
+
+
+
+
+
+
+
+
+
+# was eerst smiley, is later emoticon geworden
+# in de vertaling houden we het voorlopig op smiley
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geperforeerd papier/gaatjespapier
+# het is een sjabloon: gaatjespapier is beeldender
+
+
+
+
+
+# Verwijzing
+
+
+
+
+
+
+
+
+
+
+
+
+# Verwijzing
+
+# Grootte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# alineastijl?
+
+# verwijzingstijl?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+# url testen...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# in de pixbuf?
+
+
+
+
+
+
+
+# technische termen
+
+
+# webstek
+
+
+
+
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+# dat als logo wordt gebruikt in het info-venster.
+
+
+# of de licentietekst omgebogen wordt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beter? de hoeveelheid verandering/aanpassing
+
+
+
+
+
+
+
+# Dit is waarschijnlijk de stapgrootte als je op page-up of page-down drukt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de extra ruimte wordt afgebeeld buiten de rand
+
+
+
+
+
+# verzetten/verplaatsen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het model bevattende de mogelijke waarden....
+
+
+# enigszins vrij vertaald, maar betekenis klopt volgens mij
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vormgegeven tekst te renderen
+
+
+
+# gezet ipv gehouden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# if at all, vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# grid: netwerk, rooster, raster
+# layouting: indeling
+
+
+
+
+
+
+
+# enkelvoud mooier? Menu heeft afscheurperforatie
+# afscheurlijn/afscheurmogelijkheid
+# afscheurlijn aan menus toevoegen
+# Menus hebben afscheurlijn<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# RTL right to left
+# misschien omzetten naar RNL?
+
+
+
+# aanvullen / completering
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# momenteel/nu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weer te geven/weergegeven
+
+
+
+
+
+
+
+
+
+
+
+# herschikbaar/Volgorde te veranderen/wijzigbare volgorde
+
+# beeld is herschikbaar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# if at all  vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verpakkingsrichting
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# if at all  vertalen?
+
+
+
+# keuzerondje/radioknop
+
+# de widget is eigendom van de groep van het keuzerondje
+# de radioknop van de groep waartoe dit widget behoort.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# itt dubbelkliktijd 
+
+
+
+
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet hintnone etc vertaald worden?
+
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+# geen streepje tussen thema en grootte
+# het gaat om de grootte van de cursors
+
+
+
+
+
+
+
+
+
+
+
+# magneetrooster
+
+
+
+
+
+
+
+
+
+# resize: groter kleiner maken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertalen of niet?
+# werktip
+# tip
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kolom zoeken?
+
+# kolom modelleren?
+
+
+
+
+
+# engels taalfout: collaped
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vergroting/verkleining
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet helemaal strict vertaald, maar wel duidelijk
+
+
+
+
+
+
+# in de tooltip wordt uitgelegd dat het 'de naam van' is
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in Gnome-nl is er voor gekozen de pager te vertalen met: werkbladwisselaar
+
+
+
+# aandacht
+
+
+# projectie/realisering
+
+
+# versiering beter dan decoratie(=onderscheiding)
+
+# vensterbeheer ipv window manager?
+
+
+
+# Input-method. Wordt gebruikt bij de invoer van chinese tekens
+
+
+
+
+# Lettertypes/lettertypeopties
+
+
+
+
+#, fuzzy
+
+
+# huh?
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+# hoe moeten we dit zien?
+# grid: netwerk, rooster, raster
+# layouting: indeling
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# file chooser = file selector
+
+
+# if at all  vertalen?
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# herschikbaar/Volgorde te veranderen/wijzigbare volgorde
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# de widget is eigendom van de groep van het keuzerondje
+# de radioknop van de groep waartoe dit widget behoort.
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# documenttekst/tekst van documenten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitlichten/oplichten/belichten/markeren
+
+# uitgelicht/opgelicht
+
+# het gaat ws om de marge en niet om een lijn
+
+
+
+
+# "overlay" is het margegebied zelf
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Opmaak-code/markering
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Wat zijn dit?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Regelgeving bijvoegen
+
+
+
+
+
+
+
+# per sectie
+
+
+
+
+
+
+
+
+
+
+
+
+# globale is niet echt de juiste vertaling van global
+
+
+
+
+
+
+
+
+
+
+
+# Toevoegen
+
+
+
+# wat betekent dit?
+
+
+
+# Regelgeving bijvoegen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de taal 'octave'
+
+
+
+
+
+
+
+
+
+
+# Nederlands woord voor 'loop' ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toewijzing/toewijzingsoperator/is-gelijkteken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de taal "scheme"
+
+
+# meestgebruikte
+
+# Wat zijn dit?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# globale is niet echt de juiste vertaling van global
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Opmaak-code/markering
+
+
+# per sectie
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+# canoniek: gezaghebbend
+
+
+
+
+
+
+
+
+# entity: iets bestaands/wezen
+# het is het teken in een voor XML begrijpelijke vorm
+# schrijfwijze/representatie
+
+
+# aliassen/aliasnamen
+
+
+# bijna hetzelfde/equivalenten bij benadering
+# bij benadering equivalent/gelijkwaardig
+
+
+
+
+
+
+
+
+
+
+
+# de _d wordt gebruikt in Beel_d
+
+# thuisbrengen/identificeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# teken/letter
+
+
+
+
+# open/close
+# opening/ afsluiting/sluiting
+
+
+# openings/beginnende aanhalingsteken
+
+
+# open/close
+# opening/afsluiting
+
+
+
+
+
+
+
+
+
+
+# auteursrecht/copyright
+
+
+
+
+
+
+
+
+
+
+
+# de _k wordt gebruikt voor de knop _kopieren en de T voor Tekentabel
+
+
+
+# voor consistentie met de andere vormen met Latijns
+
+# aanvulling/supplement
+
+# uitbreiding/verlengd/vergroot/uitgebreid/extensie
+
+
+# IPA: International Phonetic Alphabet
+# fonetische tekens
+
+# dit zijn oa letters die bv de toonhoogte aangeven of de lengte van klinkers
+# spacing is hier dus niet spatiering
+
+# tekens die in combinatie met andere tekens worden gebruikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bv de R voor reeele getallen en N voor natuurlijke getallen
+
+# kan ook meer dan 10 zijn (bijv X of L)
+
+
+# techniek gemengd/gemengd technisch
+
+# bv teken voor einde tekstm, teken voor beckspace, esc.
+# afbeeldingen/figuren/tekens/plaatjes
+
+# OCR
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# leestekens/punctuatie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Het lineair-b is een schrift! Het is dus *NIET* een B die lineair is.
+# dus NIET: Lineaire B. Dat is fout!
+
+# Het lineair-b is een schrift. Het is dus *NIET* een B die lineair is.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Canadees Aboriginal
+
+
+
+
+
+
+
+
+# _V wordt gebruikt in _Volgende
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# elke nieuwe download.
+
+# verwijzingen/links
+
+
+
+# vereisten/benodigdheden
+
+
+
+
+# limiteren/beperken
+
+
+
+# limit niet meevertaald
+
+# uit de lijst/van de lijst
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# links/verwijzingen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwijzingen/links
+
+
+# vereisten/benodigdheden
+
+# Elapse = Elapsed
+
+# limiteren/beperken
+
+
+
+
+
+# gebruikt aanmeldingscontrole/vereist aanmelding
+
+
+
+
+# gestald(stallen)/vastlopen
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# Elapse = Elapsed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# uit de lijst/van de lijst
+#, fuzzy
+
+
+# vertaling socket?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+# betere vertaling?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# ui/preferences.glade.h:50
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# ui/preferences.glade.h:125
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# kies ipv gebruik
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# klaar
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# kon geen verbinding maken/kon niet verbinden
+#, fuzzy
+
+# invoeren hier met opzet weggelaten
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# een rand om de selectie zetten
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# lengteduur/duur/lengte
+
+
+# aantal keer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Naar (uw) muziek luisteren klinkt heel raar.
+
+# beeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+# husselen/schudden (net als bij kaarten)
+
+
+
+# in een minimale interface
+# door een minimale interface
+# via een minimale interface
+
+
+
+
+
+
+
+
+
+
+# Nummerherhaling resetten
+# Teller
+
+
+
+
+
+# bohemian rhapsody door queen?
+
+
+
+# speellijst/afspeellijst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Het huidige album selecteren<
+
+
+# nummers-database
+
+
+# geluidsapparaat?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# unjuiste titel
+
+
+
+
+
+
+# afspeellijsten
+
+# Recent/recentelijk
+# toegevoegd/bijgevoegd
+
+
+
+
+# meervoud van uur is hier uur
+
+
+
+
+
+
+# visueel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# spiegelniveau?
+# mirror-level
+
+
+# alleenstaand/standalone/zonder netwerk
+
+
+
+
+
+
+
+
+
+
+# verkondiging/aankondiging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# File descriptor om de afkorting duidelijk te laten. Normale gebruikers weten waarschijnlijk niet wat een bestandsbeschrijver is.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# huh? wat betekent dit?
+
+
+
+
+
+
+
+
+
+
+
+# Of gaat het over pagina's met afbeeldingen erop?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Woord 'directory' hoort niet gebruikt te worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet dit niet vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mooi woord toch, verwittigen, al klinkt het wat Vlaams :)
+
+
+
+
+
+
+
+
+
+
+
+# niet naar achtergrond/niet naar achtergrond 'forken'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# profileringswekker/profielwekker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# actie/gebeurtenis
+
+
+
+
+
+
+
+
+
+
+
+# daglange gebeurtenis/actie
+
+
+
+
+
+
+
+
+
+
+# ontbrekende/geen
+
+
+# ontbrekende/geen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# herhalende/terugkerende
+
+# BUG: occurence ipv recurrence?
+
+
+
+#, fuzzy
+
+
+
+# dag/week/maand etc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bij voorkeur/voorkeur
+
+
+
+
+
+
+
+
+# BUG: engels: Whether is a home e-mail address
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# degenen die zichtbaar zijn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# weghalen
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+# selectie wissen/selectie ongedaan maken/geen selectie meer
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# Nederlandse vertaling of niet?
+# Kruismix?
+#, fuzzy
+
+# vertaling van crossfade?
+
+# vertaling van crossfade?
+
+
+
+
+
+
+
+
+
+
+# informatie geven
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+# zeer hoge/superhoge
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# selectie start
+
+
+# selectie eind
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+# transporteren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# stap vooruit/terug
+
+
+
+
+
+
+
+
+
+
+# Nederlandse vertaling of niet?
+# Kruismix?
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# geleend door/uitgeleend aan
+
+
+
+
+
+
+
+
+
+
+
+
+
+# drie puntjes is genoeg. Engels heeft er 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# slaapcontrole/inactiviteitscontrole
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mogelijkerwijs/Misschien
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# breedte tab/tabbreedte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# bespreek/bediscussieer
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Nazaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Losmaken is korter dan: Ontkoppelen
+
+
+
+# was eerst: Overleden. eigenlijke betekenis: Niet meer bestaand,
+# wordt goed verwoord door: Afgelopen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Gebruik controletoets als vertaling van modifier (Ctrl/Shift/Alt/Esc)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# immediately, mogelijk vertalen met: 'met direct effect', maar kan volgens
+# mij ongestraft weggelaten worden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Terminal opstarten/Een terminal opstarten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# volgens mij is cursor_size hier niet bedoeld als sneltoets voor cursorsize,
+# is het een onjuist gebruik van een variabele.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling voor frame geometry?
+
+
+
+
+# Gradiënt hier beter?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hoe vertalen we operator en operand?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# technotalk
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# Dit is zo'n dergelijk moeilijke vertaling als in het Nederlands, dat het
+# Engelse origineel een beter restultaat oplevert.
+#  -- Michiel Sikkes, zo 9 apr 2006
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitvoeren/toepassen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# sibling = nakomeling/afstammeling
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebiedende wijs
+
+
+# stijlbestand/stijlblad/stylesheet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beter? kunnen niet leeg zijn
+
+
+
+
+
+
+
+
+
+
+# element hier niet vertaald/weggelaten
+
+
+
+
+
+
+
+
+
+
+# Engels fout: Dubbele spatie: Insert a  node before
+
+
+
+# Engels: cuts the current node to the internal clipboard
+# inconsistent met
+# Copy the current node to the internal clipboard
+
+
+
+
+
+
+# moet ws kort zijn
+
+# Brrr  afstammelingknooppunt. betere vertaling?
+
+
+
+# moet waarschijnlijk kort zijn
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+# om de geldigheid te kunnen controleren
+
+
+
+
+
+
+
+
+
+
+
+# sourcecode/broncode/bron
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet dit afgekort worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+# hoofdknooppunt
+# moederknooppunt
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+# beelden/beeld/weergaven
+
+# inspringing is lelijk
+
+
+# kantlijn/marge
+
+
+
+
+# completeringsveld/aanvullen-veld/aanvulveld
+# gebruiken/aanzetten
+# aanvullen aanzetten
+# aanvullen gebruiken
+
+# kantlijnpositie
+
+
+
+
+
+# sourcecode/broncode/bron
+
+
+# valideren/validatie gebruiken
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# Brrr  afstammelingknooppunt. betere vertaling?
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gnome wel of niet vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# highest volume level = maximaal geluidsvolume
+
+
+
+
+
+
+
+
+
+# render - gebruiken?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Ik heb bewust deze mnemonic gekozen hier. Dit is namelijk ook de default
+# keybinding voor deze actie (en ook de Engelse mnemonic). (Wouter Bolsterlee)
+
+# Ik heb bewust deze mnemonic gekozen hier. Dit is namelijk ook de default
+# keybinding voor deze actie (en ook de Engelse mnemonic). (Wouter Bolsterlee)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uit ipv van?
+
+
+
+
+
+
+
+
+
+
+
+# meervoud van uur is hier uur en niet uren
+
+
+
+
+
+
+# Bezig met laden:
+# Nu aan het laden:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+# wanneer/als (niet indien)
+
+
+
+
+# 'from a file' niet meevertaald, het maakt het onduidelijker
+
+
+# signalen/tekens
+
+
+
+# aanwezige/bestaande
+
+
+
+
+
+
+
+
+
+
+# extension is hier (waarschijnlijk) niet extensie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels taalfout: GNU Genaral
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels grammaticafout: if option -a is set (moet when zijn ipv if)
+
+# syntactische fout/syntaxfout
+
+
+
+# ontleden/verwerken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# appearance condition settings?
+
+
+
+# appearance condition settings?
+
+# Engels taalfout: when the user select the menu item
+
+
+
+#, fuzzy
+
+# wanneer/als (niet indien)
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+# wanneer/als (niet indien)
+
+
+# ?
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# inconsequent disc/CD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Set is hier een z.nw. en geen werkwoord?!
+
+
+#  add the reset background item, possibly disabled
+
+#  add the reset background item, possibly disabled
+
+#  add the reset background item, possibly disabled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  add the reset background item, possibly disabled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# In wat??
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# naam van zoekopdracht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de O wordt gebruikt bij Items _ordenen, de P bij _Plakken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wijziging/verandering
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kon/kan
+
+# u moet een naam invullen voor de server
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  add the reset background item, possibly disabled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Engels: 'Select folder search in' moet zijn?
+# 'Select folder to search in'
+# Selecteer de map waarin gezocht wordt
+
+# tekening/illustratie
+
+
+
+# venstertitel om bestandstype te selecteren
+
+
+# dit criterium uit de zoekopdracht halen/van de zoekopdracht weghalen
+# dit zoekcriterium weghalen
+
+
+# bewerken/wijzigen/
+
+# Een nieuw criterium aan deze zoekopdracht toevoegen
+# voeg een nieuw criterium aan deze zoekopdracht toe
+
+# tooltip bij 'Reload'
+
+
+
+# zoekterm:/zoeken naar:/zoekopdracht:/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# alvast naar 2006 gezet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# nieuwe toegevoegd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vaste netwerk
+
+
+
+# Netwerken
+
+# Bekabeld ethernet/kabel-ethernet
+
+
+
+
+# (verschijnt als ondertitel in het 'about' dialoog.
+# Een toepassing in het paneel voor het beheren van uw netwerkverbindingen en apparaten.
+# Een paneeltoepassing voor het beheer van uw netwerkapparaten en verbindingen.
+
+
+# starten/opzetten/aanmaken 
+# aanmeldfout/aanmeldingsfout
+# (dit bericht komt meerdere keren voor)
+
+
+# launching en starting is allebij opstarten.
+# kon geen VPN-verbinding met s maken/kon de VPN-verbinding s niet maken
+
+
+# VPN-verbinding starten/opzetten/aanmaken
+
+
+# niet goed/onjuist
+
+
+
+
+# station/apparaat
+
+
+# vaste netwerk
+
+
+# vaste netwerk
+
+# bezig met pogen om binen te komen
+# aan te sluiten bij/verbinding te maken met/binnen te komen bij
+# ("binnenkomen bij" klingt als 'cracken')
+
+
+# vaste netwerk
+
+
+# afgerond/voltooid/gelegd
+# vaste netwerk
+
+
+# is niet uitgevoerd (klinkt als verleden tijd)
+# is niet opgestart
+# NetworkManager loopt niet
+# Geen NetworkManager aanwezig
+# NetworkManager niet aanwezig
+
+# netwerk is uitgezet/netwerken is uitgezet/netwerken is niet mogelijk
+
+# geen netwerk/netwerkverbinding
+
+# netwerk/netwerkverbinding
+# vaste netwerk
+
+
+
+# verbinding naar/met
+
+# Connecting? ipv connection?
+
+
+
+# Netwerken
+
+
+
+# Netwerken
+
+
+
+# Er zijn geen netwerkapparaten geconfigureerd/gevonden
+
+# betere vertaling
+# is niet uitgevoerd (klinkt als verleden tijd)
+# is niet opgestart
+# NetworkManager loopt niet
+# Geen NetworkManager aanwezig
+# NetworkManager niet aanwezig
+
+
+# Wireless gebruiken
+
+# het kan het glade-bestand niet vinden.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vaste netwerk
+
+# vaste netwerk
+
+
+
+# encryptie/versleuteling/cryptografie
+# en wordt er geen gebruik gemaakt van cryptografie/wordt de verbinding niet versleuteld
+
+
+
+
+
+
+
+
+
+
+
+
+# om toegang te kunnen verkrijgen tot het draadloos netwerk s
+# WEP-key voorlopig laten staan ipv versleuteling, mogelijk is het duidelijker
+
+
+
+
+# identiteitscontrole/aanmeldingscontrole
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# draadloze adapter is een adapter zonder draadjes
+# bedoeld wordt een adapter voor draadloos netwerken
+
+
+
+
+
+# Bedoeld wordt beveiliging van het draadloos netwerk.
+# niet dat de beveiling draadloos is.
+
+
+
+# Netwerken
+
+# VPN-verbinding type s
+# VPN-verbindingstype s
+
+# herleiden/ophalen
+
+# bleh: UI files
+
+
+
+
+
+
+
+# opzetten/aanmaken
+
+
+
+
+
+
+
+
+# gebiedende wijs hier mooier?
+# Exporteer de geselecteerde VPN-verbinding naar een bestand
+
+# voltooi het aanmaken van de VPN-verbinding
+
+# virtuele privenetwerkverbindingen
+# virtuele prive-netwerken beheren
+
+
+# Netwerken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bedraad netwerk
+
+
+# "the connection has been disconnected" is een contaminatie
+
+
+
+
+# dient zich aan te melden/moet zich aanmelden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Lokale/Externe IP-adres
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zijn/waren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontwerpen/tekenen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# filtreren/filteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# In overeenstemming met het menu waar ipv Zero: 'Normal' wordt gebruikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Mogelijk: iets met 'doorlaten' toevoegen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Veranderen
+
+
+
+
+
+
+
+
+
+
+
+# aanpassen hier beter dan bewerken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# binnengehaald/opgehaald/verkregen/opgeslagen
+
+
+
+
+
+
+
+
+
+# filtreren/filteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# volledig scherm behouden/vastzetten/forceren/opleggen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# spatiëring
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Downloaden/ophalen
+
+# verifieren
+
+
+
+
+# aan het installeren/bezig
+
+
+
+# code/sleutel
+
+
+# dit is vrij vertaald
+
+
+
+
+
+# nu uitvoeren
+
+# de-installatie?
+# installeren en verwijderen
+# Installaties en verwijderingen uitvoeren
+
+
+
+
+
+
+
+# dit kan beter
+
+
+
+
+
+# 'via' is hier beter dan 'vanaf'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'of' beter dan 'dat'
+
+
+
+
+
+
+# downloaden/binnenhalen/ophalen
+
+
+
+# de pagina voor s
+
+
+
+# passende bundels
+
+# controleren of het weglaten van 'overeenkomende/passende' hier kan
+
+
+
+
+
+
+
+
+
+
+
+# updaten/bijwerken
+
+
+
+
+
+
+
+
+
+# bekijken/oplossen
+
+
+# bekeken/opgelost
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Gedownload/binnengehaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# controleren of het weglaten van 'overeenkomende' hier kan
+
+# controleren of het weglaten van 'overeenkomende' hier kan
+# passend
+
+# passende pakketten
+
+
+
+
+
+
+
+
+
+
+# dit is de kolom-kop voor: suggested, urgent etc
+# Mogelijkheden: Belang, Gewichtigheid, Urgentie
+
+# vertaling?
+
+# huh?
+
+
+
+
+# bijwerken?
+
+
+
+
+
+
+
+# voltooid/verlopen
+
+
+
+
+
+
+
+
+
+
+# gegevens/data
+# data is verwarrend hier: lijkt op datums
+
+# betere term?
+
+
+
+
+
+# uit uw cache?
+
+# was eerst: maak de buffer leeg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit is een vinkje
+# (ook) in de beschrijving zoeken | Beschrijvingen doorzoeken
+
+# de keuzen zijn: Match any word & Match all words
+# zoeken op/naar:
+
+
+
+
+
+
+
+
+# wat een lelijke Engelse zin
+
+
+
+
+
+
+
+
+
+# Pending: iets met wachtrij? op stapel staan? nog te doen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# voorrecht/privilege
+
+
+
+
+
+# instellen - stel in
+
+# was eerst: dat u de s wilt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bepaalde bestanden
+
+
+
+
+# gedurende het zoeken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wat is een goede vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitdelen/uitlenen
+
+
+# Titel/naam
+
+# [aanvinkoptie]
+
+
+# datum niet meevertalen
+
+
+# _T wordt voor _Titel gebruikt
+# _d voor Beel_d (in hoofdmenu)
+
+
+
+
+# dit is in de voorkeurendialoog dus dit mag wat langer
+
+#, fuzzy
+
+
+# op speciaal verzoek van reinouts
+# Nieuwe bestanden in mijn collectie bijhouden/
+# Monitor mijn bibilotheek voor nieuwe bestanden
+
+
+
+
+
+
+# zoek naar/controleer op
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# omgeving is wel verwarrend, shell zelf lijkt op een merknaam
+# opdrachtregel?
+
+
+
+
+
+
+
+
+# share niet meevertaald
+
+
+# draait niet/loopt niet/niet opgestart
+
+# actief/opgestart
+
+# activeren/opstarten
+
+# opgestart/actief
+
+
+
+
+
+
+
+
+
+
+
+
+# I M en p geven het: uur(12-uurs), minuut en am/pm indicatie
+
+
+# a is afgekortte weekdag
+
+# b is afgekortte maandnaam
+
+
+# rapporteer een fout/maak een foutmelding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling scheduler?
+
+
+
+# source pad? was dat nou weer?
+
+
+
+
+# misschien weglaten? 'via pijpleiding'
+# misschien andere formulering:
+# via ander programma?
+
+
+# station/apparaat
+
+
+# CD/DVD-brander
+
+# schrijvers/branders/schrijfapparaten
+
+# voor/van bestand
+
+
+
+
+
+
+
+
+
+
+# binnengehaald/gedownload
+
+
+
+
+
+
+
+
+
+
+
+
+
+# observeren/monitoren
+
+
+
+
+
+
+
+
+# Het woord URI mag niet aan eindgebruikers getoond worden!
+
+
+
+
+
+
+
+
+
+# standaard:
+# aandacht
+
+
+
+# aan/uit(zetten)
+
+
+
+# hoe vertalen we dit (kort)
+
+# statusbalkmelding
+
+
+#, fuzzy
+
+
+
+# 'te gebruiken' weggelaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# schijfje/medium
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# menuitem
+
+# statusbalkmelding
+
+
+
+# statusbalkmelding
+
+# statusbalkmelding
+
+# statusbalkmelding
+#, fuzzy
+
+# wachtrij in zijbalk/als zijbalk (in plaast van als bron)
+# ('in' is duidelijker dan 'als')
+# de _W wordt gebruikt voor _Werkbalk en de sneltoets is Ctrl+K
+
+# statusbalkmelding
+
+
+# tooltip
+# muziek harder of zachter zetten/Geluidsvolume aanpassen
+
+# bij/tijdens
+
+# U luistert naar/bezig met afspelen
+# wordt getoond als attentieballon bij een nieuw nummer
+
+
+
+
+
+
+
+
+
+
+
+
+# laden/importeren
+
+# laden/importeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# omgekeerde/afnemende
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# niet alleen het eerste nummer opnieuw afspelen maar, 
+# helemaal overnieuw beginnen
+
+
+# statusbalkmelding
+
+
+#, fuzzy
+
+# momenteel niet spelend
+# niet bezig met afspelen
+# afspelen gestopt
+
+
+
+# Kon het afspelen niet starten/ kon niet beginnen met afspelen
+
+
+# hmm, betere vertaling voor doorzoekbaar
+
+# stromingsfout/stroomfout
+
+
+
+# statusbalkmelding
+
+
+
+
+
+
+# attentie/notificatie/kennisgeven/kennisgeving/mededeling
+
+
+#, fuzzy
+
+
+# toegang krijgen tot/benaderen
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+
+# spoor
+
+
+
+# brander/schrijfapparaat
+
+# schrijven/branden
+
+
+
+
+
+
+
+
+
+
+
+
+# doe een lege CD in het apparaat
+
+
+
+
+
+
+
+
+# aanmaken van de recorder is mislukt
+
+
+
+
+# wat is een audio track list? bedoelen ze hetzelfde als playlist?
+
+
+
+
+
+
+# 	
+
+# wissen/leegmaken
+
+# de wachtrij leegmaken
+
+
+# sneltoets is Ctrl+P
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+
+
+# gedownloade/binnengehaalde/opgehaalde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# In de tabelkop komt te staan: Afgespeeld: Nooit, 1, 2 etc
+# Aantal maal afgespeeld is veel te lang
+
+
+# datum niet meervertaald (overbodig en te lang)
+
+
+# niet bezig met afspelen/niet aan het afspelen
+
+
+
+
+
+
+
+
+
+
+
+
+
+# time niet meevertaald, overbodig en te lang
+
+# time niet meevertaald
+
+
+
+
+
+
+# omgekeerde/afnemende
+
+
+
+# is gelijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# programma voor het maken en bewerken van profielen voor gebruikers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# user niet meevertaald
+
+# user niet meevertaald
+
+
+
+
+
+
+# is dit de venstertitel?
+# bewerking van profiel/bewerken van profiel
+
+
+
+
+
+
+
+
+# voor/van
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aangegeven/opgegegeven/gespecificeerd/gekozen
+# BUG?: No search based ipv No search base
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../lisp/menus.jl
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+# ../themer/themer.in
+
+
+# ../themes/simple/theme.jl
+
+# ../lisp/menus.jl
+
+
+# ../themes/gradient/theme.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+
+# ../themes/gradient/theme.jl
+
+# ../themes/gradient/theme.jl
+
+# ../themes/gradient/theme.jl
+
+# ../themes/gradient/theme.jl
+
+# ../themes/gradient/theme.jl
+
+# ../themes/gradient/theme.jl
+
+# ../themes/mono/theme.jl
+
+# ../themes/simple/theme.jl
+
+# ../themes/simple/theme.jl
+
+
+
+# ../themes/simple/theme.jl
+
+# ../themes/simple/theme.jl
+
+# ../themes/simple/theme.jl
+
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../themes/smaker/theme.jl
+
+# ../src/sawmill-ui.jl
+
+
+# ../lisp/menus.jl
+
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/keymaps.jl
+# ../lisp/custom.jl
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/match-window.jl
+
+# ../src/sawmill-ui.jl
+
+
+
+
+# urg.
+# ../src/sawmill-ui.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/keymaps.jl
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/customize.jl
+
+# ../lisp/focus.jl
+
+# ../lisp/focus.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/keymaps.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/custom.jl
+
+# ../src/sawmill-ui.jl
+# MacOS gebruikt `Wijzig' ipv Bewerk
+
+
+
+
+# ../lisp/stacking.jl
+
+
+# ../lisp/stacking.jl
+
+
+# ?
+# ../lisp/stacking.jl
+
+
+# ../lisp/stacking.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/stacking.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/stacking.jl
+
+
+
+# ../src/sawmill-ui.jl
+
+
+# ../lisp/viewport.jl
+
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/custom.jl
+
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/ignore-window.jl
+
+
+
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/cycle.jl
+
+
+# ../lisp/workspace.jl
+
+
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/gnome-commands.jl
+
+
+# ../lisp/sm-init.jl
+
+
+
+
+
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/custom.jl
+
+
+
+
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/group-funs.jl
+
+
+# ../lisp/group-funs.jl
+
+# ../lisp/group-funs.jl
+
+# ../lisp/group-funs.jl
+
+
+
+# ../lisp/menus.jl
+# ../src/sawmill-ui.jl
+# `Delete window'
+
+# ../lisp/x-cycle.jl
+
+
+
+
+
+
+
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/maximize.jl
+
+
+
+
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+
+
+# ../lisp/slide-window.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/slide-window.jl
+
+
+# ../lisp/slide-window.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/move-resize.jl
+
+
+# ../lisp/stacking.jl
+
+
+# ../lisp/stacking.jl
+
+
+
+
+# ../lisp/stacking.jl
+
+
+# ../lisp/stacking.jl
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+# ../lisp/menus.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/slide-window.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/slide-window.jl
+
+
+# ../lisp/slide-window.jl
+
+
+# ../lisp/slide-window.jl
+
+# ../lisp/group-funs.jl
+
+# ../lisp/slide-window.jl
+
+
+# ../lisp/slide-window.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/viewport.jl
+
+
+# ../lisp/viewport.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+
+# ../lisp/keymaps.jl
+
+
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/functions.jl
+
+
+# ugh.
+# ../lisp/tooltips.jl
+
+
+# ../lisp/menus.jl
+
+# ../lisp/auto-raise.jl
+
+# ../lisp/auto-raise.jl
+
+# ../lisp/edge-flip.jl
+
+# ../lisp/edge-flip.jl
+
+
+# ../lisp/move-resize.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+
+
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+
+
+
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+
+
+# ../lisp/auto-raise.jl
+
+
+# ugh.
+# ../lisp/tooltips.jl
+
+
+
+
+
+
+
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+
+# ../lisp/maximize.jl
+
+
+# ../lisp/maximize.jl
+
+
+
+
+
+
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+# ../lisp/custom.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/workspace.jl
+
+
+
+# ../lisp/menus.jl
+
+
+
+# ../lisp/menus.jl
+
+
+
+
+# ../lisp/iconify.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/iconify.jl
+
+# ../lisp/iconify.jl
+
+
+
+# ../lisp/iconify.jl
+
+# ../lisp/cycle.jl
+
+# ../lisp/match-window.jl
+
+
+
+# ../lisp/iconify.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/ignore-window.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/ignore-window.jl
+
+
+# ../lisp/ignore-window.jl
+
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/ignore-window.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/maximize.jl
+
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/maximize.jl
+
+
+# ../lisp/maximize.jl
+
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/shading.jl
+
+# ../lisp/workspace.jl
+
+# MacOS gebruikt Dichtrollen
+# ../lisp/shading.jl
+
+
+# ../lisp/shading.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/transient.jl
+
+# ../lisp/auto-raise.jl
+
+# ../lisp/stacking.jl
+
+
+# ?
+# ../lisp/stacking.jl
+
+
+# ../lisp/stacking.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/iconify.jl
+
+
+# ../lisp/iconify.jl
+
+
+# ../lisp/gtkrc.jl
+
+
+
+# ../lisp/keymap.jl
+
+
+
+
+
+
+# ../lisp/keymaps.jl
+
+
+
+# ../lisp/ignore-window.jl
+
+
+
+# ../lisp/customize.jl
+
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/custom.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+
+
+
+
+
+
+# ../lisp/menus.jl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de tool ipv gereedschap?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bekeken ipv gebruikt? andere vertaling?
+
+
+
+# 777 ipv rwx  en zo 
+
+# betekenis van bestandspermissies 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bewaren hier mooier?
+
+
+
+
+
+
+
+
+# Gebruiken ipv laden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# toestemming staat er in het engels niet bij, maar wordt wel
+# geimpliceerd
+
+
+
+# huh? wat moet dat betekenen?
+# Print variables in for a C type shell
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# engels: er staat een komma ipv een punt voor:  Put
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# onjuist/foutief
+
+
+
+
+
+
+
+
+
+
+
+# wat betekent dit?
+
+
+
+
+# te cachen/in de buffer op te slaan
+
+
+
+
+
+
+
+
+
+
+# toestemming staat er in het engels niet bij, maar wordt wel
+# geimpliceerd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ontvangers/geadresseerden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Blok %d
+
+
+
+
+# gebruiken/aanzetten
+
+
+
+# voert versleutelingsbewerkingen uit op tekst/versleutelt tekst
+
+# uw persoonlijke sleutel
+
+
+
+
+
+# encrypt is hier een werkwoord
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Optioneel? kun je ook geen emailadres hebben?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verloopdatum?
+
+
+
+
+
+
+
+
+
+
+
+# Choosing a passphrase is an integral part of creating a strong key.  As
+# with passwords, a passphrase should contain letters, numbers, and
+# punctuation.  Additionally, a passphrase can contain spaces, meaning it can
+# contain many words.  You should pick a phrase that you can remember well,
+# and that contains punctuation.  
+# Then take this phrase, adjust the case of various letters, and change some
+# of the letters into numbers or punctuation, reminiscent of \"leet speak\.
+# But don't make it obscure to the point where you can't remember it!
+# de oorspronkelijke versie zat vol met Engelse taalfouten
+
+
+
+
+
+# expiratiedatum?
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet dit vertaald worden?
+
+# moet dit vertaald worden?
+
+# moet dit vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# of?
+# Een eigen nieuwe sleutel genereren
+
+
+
+
+
+# is dit goed?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'er is' ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# encrypt is hier een werkwoord
+
+
+
+# validiteit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ongebruikt
+
+# reden ipv beschrijving?
+
+
+
+
+
+
+# dubbelzinnig: voor %s wilt signeren, of wilt signeren voor %s?
+
+# dubbelzinnig: voor %s wilt signeren, of wilt signeren voor %s?
+
+# losjes luchtig eenvoudig gemakkelijk, onzorgvuldig,oppervlakkig.
+
+
+
+
+
+
+
+
+
+
+
+# uiterst zorgvuldig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit is de tooltip die bij soundjuicer verschijnt.
+# muziek van uw cds uitpakken
+# is lelijk.
+# Mogelijk: Muziek van uw CDs halen
+# rippen er tussen haakjes achtergezet. dit kan omdat
+# het een tooltip is.
+
+# cd-kopieerprogramma: hier is kopieren wel verwarrend omdat
+# het lijkt als het een programma is waarmee je kopietjes van
+# een cd kunt branden.
+# extraheerder/uitpakker (allemaal lelijk)
+
+# Apparaat/station/Speler
+
+
+# bestandsindeling/formatteren/format
+
+
+# nummerlijst/titels (letterl. de titels van de nummers)
+# maar het is het kopje dat hoort bij het onderdeel waarbij je
+# de uiteindelijke vorm van de naam van het bestand kiest.
+
+# de _A wordt gebruikt voor de knop _Afspelen
+
+
+# de _A wordt gebruikt voor de knop _Afspelen
+
+
+
+# _Map wordt al gebruikt
+# meervoud is beter hier
+
+
+# de _u wordt gebruikt in sl_uiten
+# uitgang/uitvoer
+
+
+
+
+
+
+
+# de _u wordt gebruikt in sl_uiten
+
+
+# overniew/opnieuw
+# de _o wordt gebruikt bij v_olgende
+
+
+
+
+
+
+
+
+
+
+# moet GNOME hier wel bij staan?
+
+
+
+
+
+
+
+
+
+# dat het geschat is, is wel duidelijk,
+# om het kort te houden is het daarom weggelaten.
+
+# dat het geschat is, is wel duidelijk,
+# om het kort te houden is het daarom weggelaten.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# muziek van uw cds uitpakken
+# is lelijk.
+# Mogelijk: Muziek van uw CDs halen
+# kopieren is het beste in dit geval
+
+
+
+
+# beter?: niet op uw systeem geinstalleerd?
+
+
+
+# submission?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# de titel van het nummer, hoe het nummer heet
+
+
+
+
+# fout in Engels: Number-Track Artist-Track Title
+# Geen spaties rond teken: -
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# man-pagina's
+
+
+
+
+# meervoud?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaald als weergeven ipv bekijken
+
+
+# for the system niet meevertaald
+
+
+
+
+
+
+
+
+# onderdelen/secties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# specifieke informatie?
+
+
+
+
+
+# er was een fout bij het afdrukken
+
+# het bleek onmogelijk/het was onmogelijk/het is onmogelijk gebleken
+
+
+
+
+
+
+# Nederlands gebruikt dubbele aanhalingsteken voor een quotatie.
+# Enkele voor een aanhaling
+
+
+
+
+# niet-juist gevormde/niet-juist opgemaakte
+
+
+
+
+
+
+
+
+# van/met
+
+
+
+
+
+# de URI
+
+
+
+
+
+
+
+
+
+
+
+# vrij vertaald.
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# versturen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# misschien beter in enkelvoud:
+# openen Midi-apparaat mislukt
+
+
+
+
+
+
+
+# monitoren/meten
+
+
+
+
+# engels spelfout:
+# Connect all unconnected track of a song
+
+
+# kort houden.
+# (niet: bij problemen met het selecteren van een PCM-apparaat)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moet kennelijk kort zijn
+
+
+
+
+
+
+
+
+# taalfout in engels: spatie tussen modulation en instead ontbreekt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebruiken/instellen
+
+# presentatietoepassing klinkt niet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# kleurenselectie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in overeenstemming met evolution terminologie
+
+
+
+
+
+
+
+# hendel/handler
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/mozilla/TOCProtocolHandler.cpp:314
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'quit' is eigenlijk sluiten, maar dat is al de vertaling van 'close'
+# dus hier wordt waarschijnlijk 'exit' bedoeld, vandaar 'afsluiten'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# oproep/gesprek
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Translators: This is shown in the history.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Behavior
+
+
+
+
+#  Use ILS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/context.c:1075
+
+# src/menubar.c:150
+
+
+
+
+# ui/preferences.glade.h:195
+
+
+# ui/preferences.glade.h:195
+
+
+# src/menubar.c:150
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+
+
+
+# ui/epiphany.glade.h:91
+
+
+
+# ui/preferences.glade.h:195
+
+# src/menubar.c:571
+
+
+
+
+# src/menubar.c:571
+
+# ui/preferences.glade.h:7
+
+# src/bookmarks_editor.c:949
+# src/bookmarks_editor.c:1169
+# src/menubar.c:39
+
+
+
+# src/main.c:111
+
+# src/main.c:133
+
+# ui/preferences.glade.h:10
+
+# ui/preferences.glade.h:18
+
+# src/menubar.c:401
+
+# src/bookmarks.c:245
+# src/prefs.c:365
+# src/toolbar.c:260
+# ui/bookmarks.glade.h:3
+
+# ui/epiphany.glade.h:63
+
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+
+
+
+
+
+
+
+
+# src/prefs.c:385
+# ui/epiphany.glade.h:36
+
+# src/persistent_data_manager.c:138
+# ui/epiphany.glade.h:94
+
+
+
+# src/mozcallbacks.c:424
+
+
+# src/context.c:57
+# src/toolbar.c:117
+
+
+
+
+
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# src/menubar.c:68
+
+# src/menubar.c:571
+
+# src/context.c:80
+
+# src/context.c:80
+
+# src/context.c:80
+
+
+
+
+
+
+# src/menubar.c:406
+
+# src/menubar.c:411
+# ui/preferences.glade.h:12
+
+
+# ui/preferences.glade.h:176
+
+# ui/preferences.glade.h:175
+
+# ui/preferences.glade.h:176
+
+# Cursorbladermodus??
+
+
+
+
+
+
+
+
+
+
+
+# ui/epiphany.glade.h:171
+
+# ui/epiphany.glade.h:171
+
+
+
+
+
+
+
+
+
+
+# ui/epiphany.glade.h:30
+
+# ui/preferences.glade.h:123
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:50
+
+
+
+
+
+# src/toolbar.c:286
+
+# src/mozilla/TOCProtocolHandler.cpp:232
+# src/mozilla/TOCProtocolHandler.cpp:316
+# src/mozilla/TOCProtocolHandler.cpp:415
+
+# ui/preferences.glade.h:35
+
+# src/bookmarks_editor.c:941
+# src/bookmarks_editor.c:1148
+# src/menubar.c:565
+
+# ui/preferences.glade.h:105
+
+# src/mozilla_i18n.c:39
+# ui/preferences.glade.h:212
+
+# ui/preferences.glade.h:146
+
+
+# src/toolbar.c:286
+
+
+
+# src/mozilla_i18n.c:39
+# ui/preferences.glade.h:212
+
+
+
+
+
+
+
+# typo in Engels:
+# ... while false makes sidebar not visible...
+# sidebar->statusbar
+
+
+
+# viewer is ook nederlands
+
+
+
+
+
+
+
+
+# vrij vertaald
+
+# weergeven/tonen/voorstellen
+# de makers van deze toepassing tonen
+
+# verder schuiven/doorschuiven/vooruit schuiven
+
+
+# aandacht geven
+# invoerfocus leggen bij de paginakiezer
+# paginakiezer invoerklaar maken
+
+
+# verder/vooruit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# andere vertaling voor defined.
+
+
+
+
+
+
+# vertaling voor fontmap
+
+
+
+
+
+
+
+# troep/rotzooi
+
+
+
+# rommel/rotzooi na DVI pagina-specificatie/opgave
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is belabberd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling...
+
+
+
+# Ernstig
+
+# ernstig
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit hoort niet vertaalt te worden omdat het anders foutmeldingen oplevert
+
+# geschreven door: velen
+
+# gedocumenteerd door: een kleiner aantal/niet zo veel
+
+# per pagina/enkel/alleenstaand
+
+
+
+
+
+
+
+
+
+# uitzetten?
+
+
+
+
+
+
+# hekje hier weggelaten, omdat wij dat eigenlijk niet gebruiken
+
+
+
+
+
+
+
+# Recentelijk?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zijvenster?
+# Meestal wordt er over de 'side bar' gesproken
+
+
+# uitleg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tools menu: werkmenu?
+
+
+
+
+
+
+
+
+# link niet bereikbaar?
+
+
+# bladeren
+# doorzoeken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# prev en next zijn alletwee 4 letters. misschien moeten we het vertalen met Volg en Vorg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Betere vertaling?
+
+
+
+
+
+
+
+# orientatie gegeven door document negeren
+# door document gegeven orientatie verwerpen/negeren
+
+
+
+
+# betere vertaling?
+
+
+
+# percentage ipv grootte?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# trema's
+
+
+
+
+# trema
+
+
+
+
+# hoewel het beide kanten op werkt is het idee duidelijk zo
+
+
+
+
+
+
+
+# Of het zijpaneel moet worden getoond, rechts van het weergavegebied.
+
+
+
+
+
+# rand ipv rechthoek?
+
+# onthouden ipv opslaan en herstellen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# In overeenstemming met de andere berichten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# invoeren hier met opzet weggelaten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+# global catalog is een windowism
+
+
+
+
+
+
+
+# is al gedelegeerd
+
+
+# geen toegang krijgen tot
+
+
+
+
+# bijwerken
+
+
+
+
+# rechten/persmissies/toestemming
+
+# bijwerken/updaten/veranderen/aanpassen
+
+
+
+
+
+
+# een dergelijke gebruiker %s bestaat niet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# mag/kan
+
+
+
+
+
+
+
+
+# verzetten?
+# verplaatsen? (move)
+
+
+
+
+
+
+
+# kies ipv gebruik
+
+# kies een gebruiker
+
+# map wordt geopend
+
+# map %s wordt geopend
+
+
+
+
+# betekenis?
+# Kan abonnement op map %s niet opzeggen
+# kan abonnement op map niet opzeggen: 'melding'
+
+
+
+
+
+
+
+# aankruisvakje
+
+
+
+
+
+
+
+
+
+
+
+# vinden
+# oplossen
+
+
+
+
+
+
+
+
+# updaten kan ook wat mij betreft
+# misschien wel mooier
+
+
+# niet aangewezen voor offline ondersteuning
+
+
+
+
+# dat er eerst afgesloten moet worden is vrij logisch
+# (ik weet het, het is gevaarlijk dat aan te nemen
+# maar op deze manier vind ik het mooier en begrijpelijker)
+
+
+# ...op niet werkbaar worden gezet...
+
+
+
+#, fuzzy
+
+
+# waarschuwing wanneer wachtwoord gaat/zal verlopen
+
+# controleren!
+# Exc_hange-server:
+
+
+# mailbox hier niet vertaald vanwege de 'outlookism'
+
+
+
+
+
+
+# Controleer het formaat!
+
+
+
+
+
+
+
+
+
+
+
+
+
+# groupware is wat anders dan workgroup
+# (denk software voor groepen)
+
+
+
+
+
+
+
+
+# indien/als
+
+# indien/als
+
+# gewoon 'berichten' beter? korter?
+
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+
+
+
+
+# extra/uitgebreid/geavenceerd
+
+# extra/uitgebreid/geavenceerd
+
+
+
+
+
+
+
+
+
+
+
+# was eerst %s tot %s
+
+
+
+
+
+
+
+
+
+
+
+# de _a wordt al gebruikt in _Aan en de _b in _Bestand
+
+
+
+
+
+
+
+# beheerder
+
+# sa=spamassasin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# alles ververgen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# probleem met de _a is dat deze al voor de knop _Aan gebruikt wordt
+# de _b wordt gebruikt voor _Bestand
+
+
+
+
+
+
+
+
+
+# indien/als
+
+
+
+
+
+
+
+
+
+# gewoon 'berichten' beter? korter?
+
+# dubbele sneltoets
+
+
+
+# engels spelling: messaage
+
+# engels spelling: messaage
+
+
+
+
+
+
+
+
+# was eerst: Computernaam, maar kan hier beter: Servernaam/Server zijn.
+# Hier moet het adres van de mailserver worden gegeven
+# letterlijk: gastcomputer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# probleem met de _a is dat deze al voor de knop _Aan gebruikt wordt
+# de _b wordt gebruikt voor _Bestand
+
+
+
+
+
+
+
+# Engels: spatie te veel: "Mark  as default folder"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Een bestand aan het bericht toevoegen
+# Een bestand bij het bericht voegen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# agenda/kalender
+
+
+
+
+# Control not load control?
+# ------------loaded
+# geen idee wat dit betekent
+
+
+
+
+# account met die naam/onder die naam
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# peilen/onderzoeken/ondervragen/bevragen
+
+
+
+
+
+
+
+
+
+# src/netscape.c:155
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# weggehaald/verwijderd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/bookmarks_editor.c:1046
+
+# src/bookmarks_editor_callbacks.c:1598
+# src/bookmarks_menus_callbacks.c:714
+
+# src/menubar.c:571
+
+# ui/preferences.glade.h:123
+
+
+# ui/preferences.glade.h:280
+
+# ui/preferences.glade.h:280
+
+# ui/bookmarks.glade.h:50
+
+# ui/preferences.glade.h:207
+
+# src/menubar.c:518
+
+# src/menubar.c:433
+
+# src/menu_callbacks.c:1286
+
+# src/context.c:61
+
+# src/menu_callbacks.c:1286
+
+
+# ui/bookmarks.glade.h:15
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+
+# src/bookmarks_menus.c:462
+
+# src/mozilla/ExternalProtocolService.cpp:137
+
+# src/bookmarks_menus.c:462
+
+# ui/prompts.glade.h:1
+
+# ui/preferences.glade.h:207
+
+
+
+
+
+# src/context.c:64
+# src/history_callbacks.c:165
+# src/misc_callbacks.c:412
+
+# src/context.c:75
+
+# src/menubar.c:433
+
+
+
+
+
+
+
+
+
+
+# src/mozilla_i18n.c:99
+
+# src/mozilla_i18n.c:121
+
+# src/mozilla_i18n.c:121
+
+# src/mozilla_i18n.c:52
+
+# src/mozilla_i18n.c:55
+
+# src/mozilla_i18n.c:122
+
+# src/mozilla_i18n.c:80
+
+# src/mozilla_i18n.c:52
+
+# src/mozilla_i18n.c:53
+
+# src/mozilla_i18n.c:122
+
+# src/mozilla_i18n.c:46
+
+# src/mozilla_i18n.c:80
+
+# src/mozilla_i18n.c:87
+
+# src/mozilla_i18n.c:105
+
+
+
+
+
+
+
+# src/mozilla_i18n.c:103
+
+
+
+# ui/bookmarks.glade.h:1
+
+# ui/bookmarks.glade.h:2
+
+# ui/bookmarks.glade.h:4
+# ui/galeon.glade.h:20
+
+# ui/bookmarks.glade.h:9
+# ui/galeon.glade.h:31
+
+
+# ui/bookmarks.glade.h:12
+
+# ui/bookmarks.glade.h:18
+
+# ui/bookmarks.glade.h:25
+
+# ui/bookmarks.glade.h:30
+
+# ui/bookmarks.glade.h:31
+
+# ui/bookmarks.glade.h:32
+
+
+# ui/bookmarks.glade.h:35
+
+# ui/bookmarks.glade.h:37
+
+# ui/bookmarks.glade.h:38
+
+# ui/bookmarks.glade.h:39
+
+# ui/bookmarks.glade.h:40
+
+
+# ui/bookmarks.glade.h:44
+
+# src/bookmarks_editor.c:1024
+# src/bookmarks_editor.c:1171
+# src/bookmarks_menus.c:559
+
+# src/bookmarks_menus.c:525
+# ui/bookmarks.glade.h:47
+
+# ui/bookmarks.glade.h:48
+
+
+# ui/galeon.glade.h:18
+
+# ui/galeon.glade.h:38
+
+# src/newuser_callbacks.c:513
+
+# src/newuser_callbacks.c:513
+
+# ui/galeon.glade.h:83
+
+# src/newuser_callbacks.c:513
+
+# ui/galeon.glade.h:79
+
+# src/newuser_callbacks.c:513
+
+# ui/preferences.glade.h:241
+
+# src/toolbar.c:338
+
+# ui/preferences.glade.h:184
+
+# ui/preferences.glade.h:273
+
+
+
+# ui/bookmarks.glade.h:38
+
+
+
+# src/downloader.c:86
+
+# src/mozilla/FilePicker.cpp:427
+# src/mozilla/FilePickerGfs.cpp:345
+
+# src/mozilla/FilePicker.cpp:446
+# src/mozilla/FilePickerGfs.cpp:364
+
+# src/mozilla/FilePicker.cpp:452
+# src/mozilla/FilePickerGfs.cpp:370
+
+
+# src/window.c:985
+
+# ui/bookmarks.glade.h:14
+
+# ui/bookmarks.glade.h:15
+
+# ui/bookmarks.glade.h:51
+
+# ui/bookmarks.glade.h:55
+
+# ui/bookmarks.glade.h:56
+
+# ui/bookmarks.glade.h:57
+
+
+
+# src/mozilla_i18n.c:108
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ui/galeon.glade.h:83
+
+# ui/galeon.glade.h:83
+
+# ui/bookmarks.glade.h:31
+
+# src/menubar.c:176
+
+# ui/bookmarks.glade.h:48
+
+# ui/bookmarks.glade.h:37
+
+# src/menubar.c:150
+
+# ui/preferences.glade.h:14
+
+
+
+# ui/preferences.glade.h:15
+
+# ui/preferences.glade.h:15
+
+
+# src/menubar.c:358
+
+# src/menubar.c:358
+
+# src/bookmarks_menus.c:575
+# src/context.c:63
+# src/history_callbacks.c:162
+# src/misc_callbacks.c:410
+
+# src/newuser_callbacks.c:537
+
+
+
+
+
+
+
+
+# ui/preferences.glade.h:237
+
+
+# ui/galeon.glade.h:148
+# ui/preferences.glade.h:239
+
+# ui/galeon.glade.h:148
+# ui/preferences.glade.h:239
+
+# ui/galeon.glade.h:148
+# ui/preferences.glade.h:239
+
+# ui/galeon.glade.h:148
+# ui/preferences.glade.h:239
+
+# ui/galeon.glade.h:154
+# ui/preferences.glade.h:242
+
+# ui/galeon.glade.h:154
+# ui/preferences.glade.h:242
+
+# ui/galeon.glade.h:154
+# ui/preferences.glade.h:242
+
+# ui/galeon.glade.h:154
+# ui/preferences.glade.h:242
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/galeon.glade.h:78
+# ui/preferences.glade.h:88
+
+# src/bookmarks_menus.c:462
+
+# src/bookmarks_menus.c:462
+
+
+
+
+
+# src/menubar.c:390
+
+
+# src/menubar.c:86
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/preferences.glade.h:117
+
+# ui/preferences.glade.h:117
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/galeon.glade.h:169
+# ui/preferences.glade.h:266
+
+# ui/galeon.glade.h:24
+
+# src/bookmarks_menus.c:462
+
+# ui/preferences.glade.h:171
+
+# ui/preferences.glade.h:177
+
+
+
+
+
+
+
+
+# ui/galeon.glade.h:24
+
+# src/mozilla_i18n.c:33
+
+# src/mozilla_i18n.c:45
+
+# src/mozilla_i18n.c:47
+
+# src/mozilla_i18n.c:48
+
+# src/mozilla_i18n.c:64
+
+# src/mozilla_i18n.c:86
+
+
+
+
+# src/mozcallbacks.c:436
+
+# ui/preferences.glade.h:87
+
+# ui/preferences.glade.h:16
+
+# src/prefs.c:1063
+# src/prefs_callbacks.c:395
+
+# src/prefs.c:1066
+# src/prefs_callbacks.c:399
+
+# src/prefs.c:1072
+
+# src/prefs.c:1075
+# src/prefs_callbacks.c:403
+
+# src/prefs.c:1080
+# src/prefs_callbacks.c:461
+
+# src/prefs.c:1082
+# src/prefs_callbacks.c:239
+# src/prefs_callbacks.c:463
+
+# src/prefs_callbacks.c:230
+
+
+# src/menubar.c:433
+
+
+# src/menu_callbacks.c:1286
+
+# src/toolbar.c:170
+
+# ui/preferences.glade.h:125
+
+# src/menubar.c:187
+
+# ui/galeon.glade.h:85
+
+# src/prefs.c:367
+# src/toolbar.c:273
+# ui/galeon.glade.h:78
+# ui/preferences.glade.h:88
+
+# src/context.c:57
+# src/toolbar.c:117
+
+
+
+
+
+
+
+
+
+# ui/preferences.glade.h:155
+
+
+# src/mozilla/TOCProtocolHandler.cpp:145
+
+# src/mozilla/TOCProtocolHandler.cpp:169
+
+# src/mozilla/TOCProtocolHandler.cpp:173
+
+# src/mozilla/TOCProtocolHandler.cpp:181
+
+# src/mozilla/TOCProtocolHandler.cpp:185
+
+# src/mozilla/TOCProtocolHandler.cpp:228
+# src/mozilla/TOCProtocolHandler.cpp:312
+# src/mozilla/TOCProtocolHandler.cpp:411
+
+# src/mozilla/TOCProtocolHandler.cpp:232
+# src/mozilla/TOCProtocolHandler.cpp:316
+# src/mozilla/TOCProtocolHandler.cpp:415
+
+# src/menubar.c:155
+
+# src/menubar.c:155
+
+# ui/preferences.glade.h:232
+
+# ui/preferences.glade.h:232
+
+# src/menubar.c:443
+
+# src/menubar.c:443
+
+
+
+
+
+
+
+# ui/preferences.glade.h:112
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# src/menubar.c:443
+
+
+# src/menubar.c:443
+
+# src/menubar.c:443
+
+# src/menubar.c:443
+
+# ui/galeon.glade.h:171
+
+# ui/galeon.glade.h:34
+
+# ui/preferences.glade.h:123
+
+# ui/preferences.glade.h:50
+
+# ui/preferences.glade.h:6
+
+# ui/preferences.glade.h:10
+
+# ui/preferences.glade.h:13
+
+# ui/preferences.glade.h:14
+
+# ui/preferences.glade.h:15
+
+# ui/preferences.glade.h:218
+
+# ui/preferences.glade.h:47
+
+# ui/preferences.glade.h:229
+
+# src/prefs.c:397
+# ui/preferences.glade.h:103
+
+# ui/preferences.glade.h:255
+
+# ui/preferences.glade.h:134
+
+# ui/preferences.glade.h:107
+
+# src/menubar.c:54
+
+# ui/preferences.glade.h:137
+
+# ui/preferences.glade.h:136
+
+
+# ui/preferences.glade.h:153
+
+# ui/preferences.glade.h:159
+
+# src/menubar.c:401
+
+# ui/preferences.glade.h:248
+
+# ui/preferences.glade.h:68
+
+# ui/preferences.glade.h:248
+
+# ui/preferences.glade.h:249
+
+# ui/preferences.glade.h:107
+
+# src/menubar.c:54
+
+# ui/preferences.glade.h:125
+
+# ui/preferences.glade.h:144
+
+# ui/preferences.glade.h:275
+
+# ui/preferences.glade.h:279
+
+# ui/preferences.glade.h:292
+
+
+
+# merk op dat het commentaar hier bij het verkeerde bericht staat.
+# Het gaat om het vorige/volgende bericht
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# termijn
+
+# huidige waarde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# interpreteren ipv verwerken?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# diplay is hier de DISPLAY van de X-server?
+
+
+# vrij vertaald
+
+
+
+
+
+
+
+# succesvol/correct/juist/goed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# configureren beter?
+
+
+
+
+
+
+# 'wel of niet' weggelaten
+
+
+
+
+
+# om in zeemanstermen te blijven zoude we het eigenlijk moeten
+# hebben over aanmeren en afmeren
+
+
+
+# afsluiten/afzetten/uitschakelen/uitzetten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# c-format
+
+
+
+# User niet meevertaald,
+# Pietje wordt over/binnen 10 seconden aangemeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# hmm, dit is niet zo mooi
+
+
+
+
+
+
+
+
+
+# controleren/gecontroleerd/behandelen/behandeld
+# context: is a login attempt handled by this computer
+
+# na een aantal seconden, een gebruiker automatisch aanmelden
+# een gebruiker na een aantal seconden automatisch aanmelden
+# gespecificeerd/opgegeven kan hier worden weggelaten (is duidelijker zo)
+# _E _N _G zijn al in gebruik
+
+
+
+
+
+
+
+# opnieuw worden opgestart/herstart
+
+
+
+# welkomstbericht op afstand/extern welkomstbericht/
+# niet-lokaal welkomstbericht
+
+
+
+
+
+
+
+
+
+
+# welkom/welkomst
+
+
+
+
+
+# automatisch hier weggelaten, omdat het al twee keer wordt genoemd,
+# vlak erboven, en om het kort te houden
+
+
+
+
+
+
+
+# getimede aanmelding/tijd(s)aanmelding
+# gebruiker die na een tijd wordt aangemeld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# selectie verschil?
+# selectie kruising?
+# selectie samenkomst?
+
+
+
+
+
+
+
+
+# Engels spelfout: Selction
+
+
+
+
+
+#, fuzzy
+
+
+# ratio
+
+
+# Height in pixels) <- ?
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+# extraheren?
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+# twee keer tussen, maar in het origineel wordt ook twee keer 'tween' gebruikt
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What meaning of 'export' is used here?
+
+
+
+# What meaning of 'export' is used here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# d.i. de tooltip
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Shrink wrap is the phenomenon of fitting the image window to the image dimensions
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# item vastkoppelen
+
+
+
+
+
+
+# FS=?
+#, fuzzy
+
+
+
+
+
+
+# I do not like to translate legal language. Please contact the FSF for the correct translation.
+
+# I do not like to translate legal language. Please contact the FSF for the correct translation.
+
+# I do not like to translate legal language. Please contact the FSF for the correct translation.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+# vast midden/centrum
+
+
+
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+# betere vertaling?
+
+# betere vertaling?
+
+# opnieuw instellen/herstellen
+
+
+
+
+# regelafstand/regelhoogte
+#, fuzzy
+
+# regelafstand/regelhoogte
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+# opnieuw instellen/herstellen
+#, fuzzy
+
+
+
+#  *  anything else starting with a '-' is an error.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# How to translate 'touch'?
+# Datum-tijdstip van originele bestand is niet veranderd? (tino)
+# Ik laat het zo maar staan, als mensen er over vallen moeten ze
+# maar schrijven.
+#
+
+
+
+
+
+
+# full niet meevertaald
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# korter: spiraal
+
+
+# vertalen?
+# inlijns pixbuf
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 'Schaal' already suggests a ratio
+
+
+
+
+#  Contiguous Regions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+# What's the Dutch word for 'triplet'?
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  <Image>/Edit/Buffer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Pointer Movement Feedback
+
+
+# What does 'enable' do here? Doesn't the checkbox already suggest that one can enable and disable?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is the Dutch translation of 'lens flare'?
+# Schittering
+
+# What is the Dutch translation of 'lens flare'?
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#  Initialize our progress dialog
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+#  And let's begin the progress
+
+
+
+
+
+
+
+
+
+
+# overige/andere
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+# betegelen
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  Can't save to directory
+
+
+
+
+
+
+
+# What is the correct Dutch translation of this phrase?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'B/L' stand for? Blue/Luminance?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Auto-stretch contrast in HSV space
+# What is the Dutch translation of the term 'HSV'?
+
+
+
+
+
+
+
+# How to translate 'bumpmap'?
+
+
+
+
+# Makes the contrast fit the whole color range
+
+
+#  set up frame
+
+
+
+
+
+
+# Is there a Dutch translation for 'hot scanning'?
+
+# What is the translation of 'convolution'?
+
+
+
+# Is there a Dutch translation for 'hot scanning'?
+
+
+
+
+
+# What is the Dutch translation of 'Diffraction'?
+
+
+
+
+
+
+
+
+# What is the Dutch translation of 'lens flare'?
+#  don't translate '<Image>' entry,
+#  * it is keyword for the gtk toolkit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is there a Dutch translation for 'hot scanning'?
+
+# What does HRZ mean?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  don't translate '<Image>'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'sample' stand for in this context?
+
+
+
+
+
+
+
+
+
+
+# What is the correct translation of 'solid' in this context?
+
+
+#  don't translate '<Image>', it's a special
+#  * keyword for the gtk toolkit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What meaning has 'scan' here?
+
+
+
+
+
+
+
+
+
+# What is the Dutch term for 'Release'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#  output results
+
+
+
+
+
+
+
+
+
+#  Aie! Unknown type
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What is being referred to with 'Decorations'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is there a Dutch translation for 'hot scanning'?
+
+# Is there a Dutch translation for 'hot scanning'?
+
+
+
+
+
+# What is the Dutch translation of 'tooltip'?
+
+# What is the Dutch translation of 'tooltip'?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is Truchet a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'cool' mean here?
+
+# What does 'cool' mean here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Named after the movie Predator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'particle trace' refer to?
+
+
+
+
+
+
+# Is Truchet a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is Trochoid a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+#, fuzzy
+
+
+#, fuzzy
+
+# beginwaarde
+#, fuzzy
+
+#, fuzzy
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# cirkeltekst
+
+
+#, fuzzy
+
+
+
+
+# Is Truchet a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'cool' mean here?
+
+# What does 'cool' mean here?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Named after the movie Predator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# What does 'particle trace' refer to?
+
+
+
+
+
+
+# Is Truchet a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+# Is Trochoid a name or a term? If it is a term, what does it mean?
+
+
+
+
+
+
+# Allocatie van %lu bytes om bestand "%s" te lezen is mislukt<
+
+
+
+
+# omzetten/conversie
+
+
+
+
+# met een lege structuur/zonder structuur
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Niveau oranje waarde
+
+
+
+
+
+
+
+
+# suspend vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitermate verwarrend deze terminologie.
+# Als het batterijtje horizontaal ligt, betkent dit dan van rechts naar links
+# of omgekeerd, en als hij opgeladen wordt?
+#
+# Beter: batterij vult zich van de min-pool naar de plus-pool
+# PS. 'towards top' betekent dat de batterij leegloopt naar boven
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bij aanklikken
+# bij klikken 
+# indien aangeklikt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# rand
+# was: omranding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# u werk verliest, zou klinken als 'baan verliezen'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# (geen ?
+
+
+
+
+
+
+
+# indeling
+
+
+
+#  data
+#  PANEL_APPLET_BONOBO_SHLIB_FACTORY( "OAFIID:GNOME_GSwitchItApplet_Factory", PANEL_TYPE_APPLET, "GSwitchIt Applet factory", GSwitchItAppletFactory, NULL )        //data
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Geen idee, wat dit moet zijn, waarschijnlijk een toets op het toetsenbord
+
+
+
+
+
+
+
+
+# of testplugin?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in Australie
+
+
+
+
+
+
+
+
+# leder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# gebroken/ niet goed
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zou ook onvertaald kunnen blijven
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG
+
+
+
+# BUG
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# afbeeldingsbestand -> afbeelding
+
+
+
+# 'grot starten' of begin-grot?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# knappe puzzel die in 1 zet oplosbaar is!
+
+
+
+# online spel/netwerkspel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Moeten de methodes vertaald worden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Hebben we hier een woord voor?
+
+
+
+
+
+
+
+
+# het plaatje/de afbeelding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# steen/object
+
+
+
+
+# Einde spel?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Bedieningstoetsen<
+
+
+# BUG
+
+# BUG
+
+# BUG
+
+# BUG
+
+
+
+
+# obsure = vaag, onbekend, onduidelijk, afwijkend, slecht gedocumenteerd.
+
+
+
+
+
+
+
+
+# Dit behoort niet vertaald worden:
+# "No, it shouldn't be translated. These strings will be replaced
+# with text generated with either numbers or other text which has
+# already been translated. Unfortunately I couldn't find a way to
+# tell glade not to mark a label for translation or how to provide
+# a comment for translatorsin glade. Any better solutions about how
+# to handle this are welcome."
+#
+# Als het toch wordt vervangen kun je net zo goed een spatie neerzetten
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het venster aanpassen is niet helemaal 1 op 1 maar wel duidelijk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vertaling voor idle
+
+
+
+
+
+
+
+
+
+
+
+# succesvol is niet mooi hier.
+
+
+# verbinding leggen?
+# verbinden?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Soort aanmeldingscontrole
+# methode
+# wijze
+# manier
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# beveiligen/....
+# Op slot doen/Losmaken
+# Fixeren/Vrij maken
+
+
+
+
+
+
+
+
+# weergave schakelen van ....
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in een pad invoeren?
+
+
+# binnengaan ipv invoeren?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verbinding leggen
+
+
+
+
+
+
+# loctie van tabs;
+# tabs staan:
+
+
+
+
+
+
+
+# staan bovenaan, onderaan links rechts
+
+# aanpassen of wisselen?
+
+
+
+
+# Mud is eigenlijk een afkorting, dus niet vertalen naar modder.
+
+
+# ook hier weer het karakter in de mud
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bestand lezen is mislukt/kon bestand niet lezen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ze noemen het overal de HotSync-knop
+# Het uitroepteken op het einde is lelijk in het Nederlands
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# is dit lelijk?
+
+
+
+
+
+
+
+# rare zin
+
+# gncal/eventedit.c:860
+
+# gncal/eventedit.c:862
+
+# gncal/eventedit.c:861
+
+# gncal/eventedit.c:863
+
+# gnomecard/gnomecard.c:570
+
+# gnomecard/gnomecard.c:576
+
+# gnomecard/gnomecard.c:470 gnomecard/gnomecard.c:580
+
+# gnomecard/gnomecard.c:584
+
+# gnomecard/gnomecard.c:485 gnomecard/gnomecard.c:608
+
+
+
+
+# was eerst Radio-toestel
+
+
+
+
+
+
+
+
+
+
+
+# geluidsniveau?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is behoorlijk stom als programmeurs dit doen, maar ja
+# 1st -> 1e
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# het beeld/scherm zwart wordt/de monitor op zwart gaat<
+#
+
+
+# energie-zuinig/bespaar/spaarstand
+# het beeldscherm in de energiespaarstand gaat/komt
+
+
+
+
+
+
+
+# screensaver hier mooier omdat het onderdeel is van de schermbeveiliging
+
+
+
+
+
+
+
+# bedoelen ze hier dat het wachtwoord onjuist is? of
+# Wachtwoord controle mislukt!
+
+
+
+
+
+# item/onderdeel
+
+
+
+
+
+
+
+
+
+# Zichtbaar is:
+# verversen om de [5] seconden
+# Verversen, elke [5] seconden
+
+
+
+
+
+
+# dit moet dezelfde sneltoets zijn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# zelfde sneltoets gebruiken als bij Minder info!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# informatie of info?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# computernaam ipv hostnaam?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# niet vertaald als: dit is de lijst met IP adressen... omdat dat grammaticaal
+# niet correct is. (oorspronkelijke Engels is ook niet correct)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# netwerkverbinding via dit apparaat
+
+
+
+
+
+
+
+
+# Reden: De standaard-gateway is niet geactiveerd
+
+
+# Reden: Het standaard gateway-apparaat mist gateway informatie
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# tekst wordt:
+# Schuifbalks staat: [aan de rechterkant/linkerkant/uitgeschakeld]
+
+
+
+
+# dingus komt oorspronkelijk uit het Nederlands (GUADEC-2003): dinges is
+# een onbenoemd iets, een ding.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# bezig met opzoeken woord...
+# het woord wordt opgezocht...
+# Opzoeken woord
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verwerken/ontleden
+
+
+
+
+
+
+
+
+
+
+
+# "by the user" niet vertaald voor consistentie
+# met het corresponderende volgende bericht.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# vreemde string, onlogisch: opdracht uitgevoerd
+# maar nog niet geimplementeerd?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# metafile met uitbreiding
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit gaat waarschijnlijk om de rechten van user/groep/other
+
+
+
+
+
+
+
+# linkage is ws soort link: mailto: news: http:
+
+
+# de X is hier groot om rwx duidelijk te maken
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Is dit Basic of Basis?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# onder-rooster
+
+
+
+
+
+
+
+
+
+# de labels zijn hier getallen op de as
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Dit zijn titels van de dialoogvensters, vandaar gebiedende wijs
+
+
+# Venstertitel
+
+
+
+# grafiekmotor
+
+
+
+
+# helheid?
+
+
+
+
+
+
+
+
+# vulkleur/opvulkleur
+
+
+
+
+
+
+
+
+
+
+# besloten om overal 'plot' weg te laten in de vertaling
+
+
+
+
+# dit is het basiswoord waar getallen achter komen.
+# het is mooier om plot weg te laten bij deze dingen:
+# dus ipv Taartplot1 enz.: Taart1
+
+# dit is het basiswoord waar getallen achter komen.
+# het is mooier om plot weg te laten bij deze dingen:
+# dus ipv Taartplot1 enz.: Taart1
+
+
+
+
+
+
+
+
+
+# CHECK is dit begrijpelijk? klopt het?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# dit is het basiswoord waar getallen achter komen.
+# het is mooier om plot weg te laten bij deze dingen:
+# dus ipv Taartplot1 enz.: Taart1
+
+
+
+
+
+
+# de schijf van vijf!
+
+
+
+# afstand
+
+
+
+
+
+
+# wat is dit nu weer?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# besloten om overal 'plot' weg te laten in de vertaling
+
+# dit is het basiswoord waar getallen achter komen.
+# het is mooier om plot weg te laten bij deze dingen:
+# dus ipv Taartplot1 enz.: Taart1
+
+
+
+# met punten/markeringen
+
+
+
+
+
+
+
+
+
+# aantal punten
+
+# plot niet meevertalen!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ballonnen ipv bellen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# BUG: wat betekent XL hier? moet dat Excel zijn? 
+
+
+# Kies een afbeelding/Een afbeelding selecteren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# neerwaarts
+
+# opwaarts
+
+
+
+
+
+
+
+# Type markering voor punten in een grafiek
+
+# diabolo
+
+# Type markering voor punten in een grafiek
+# Diabolo?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# trema?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# aanvinkoptie? 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitproberen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# volledige/volledig
+
+
+
+
+# of in meervoud:
+# omdat wijzigingen, aangebracht op een schijf die bezet is, de kernel zouden kunnen verwarren...
+
+# verlopen/voltooid
+
+
+
+
+
+
+
+# van/als (formatteren als)
+
+
+
+
+
+
+
+# disklabel vertalen?
+
+# wat betekent parent in deze context?
+
+
+
+
+
+
+
+
+
+
+
+# is dit goed?
+
+
+
+
+
+
+
+
+
+# Vertaling van Job Swaps?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verkennen/doorbladeren
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Kon de huidige map niet veranderen in %s:
+# Could not set the current folder to %s:
+
+
+
+
+
+# d=dag b=afgekorte maand Y=jaar in 4 cijfers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Toetsen grijpen/Pluk een toets
+
+
+
+
+
+
+
+# replace with
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# voorkomen
+
+
+# Folder? ipv Directory
+# Gewoon: Mappen ipv mapmodus
+
+# in plaats van ipv in tegenstelling tot?
+
+
+# Tekenreeks dubbele aanhalingstekens geven 
+# Tekenreeks voorzien van dubbele aanhalingstekens<
+
+# tekenreeks aanhalen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# husselen
+
+
+
+
+
+
+
+# "Doe" ipv "start"?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# betere vertaling?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Doe een lege of herschrijfbare schijf in het station
+# Een lege of herschrijfbare schijf in het station invoeren
+
+
+# een leeg schijfje/een lege schijf
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+# nummers ipv sporen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# uitwendig/extern
+
+
+
+# validatie klinkt niet
+# Dit is ws de titel van het venster
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# wanneer/als (niet indien)
+
+# wanneer/als (niet indien)
+
+
+# beheer uw acties met NACT/uw acties beheren met NACT
+
+# die met de geselecteerde bestand(en)/map(pen) overeenkomen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Gemigreerd oud werkblad?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# &l
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# verbinding naar/met
+
+# BUG: deze horen niet thuis in het po-bestand
+
+# BUG: deze horen niet thuis in het po-bestand
+
+# BUG: deze horen niet thuis in het po-bestand
+
+# BUG: deze horen niet thuis in het po-bestand
+
+
+# BUG: deze horen niet thuis in het po-bestand
+
+
+
+
+# actief/aangezet
+
+
+
+# versleuteld verbinden/versleutelde verbinding maken
+# verbinding maken met versleuteling
+# Verbinden met versleuteling
+
+
+# draadloze netwerk/draadloos netwerk
+
+
+
+
+
+
+
+
+
+
+# aanmeld-fout kan verwarrend zijn omdat je je ook bij een draadloos 
+# netwerk moet aanmelden.
+
+
+# aanmeld-fout kan verwarrend zijn omdat je je ook bij een draadloos 
+# netwerk moet aanmelden.
+
+
+# Scannen voor/zoeken naar  draadloze netwerken pauzeren/hervatten
+
+
+# privénetwerk
+
+
+
+
+
+# een draadloos netwerk aanwezig...
+
+
+# presentatie-programma klinkt beter dan presentatie-toepassing
+
+
+
+
+
+
+
+# minder dan
+
+# meer dan
+
+
+
+
+
+
+
+
+
+
+
+
+
+# samengestelde ipv meerdelige?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# misschien beter: gebruik audioscrobbler
+
+
+
+
+
+
+
+
+# inhoud album bekijken/weergeven
+# inhoud album   | album inhoud
+# album doorbladeren
+# album overzicht
+
+
+
+
+
+# vrij vertaald, het is heel verwarrend om het over het 'root filesystem' te
+# hebben als je een locatie bedoeld.
+
+# wachtrij/nummers in de wachtrij/nummers in wachtrij
+# dit is de titel die in de zijbalk boven de wachtrij wordt weergegeven.
+
+
+
+
+
+
+# Kon niet op zoek gaan naar externe muziek-delen
+# Kon niet zoeken naar...
+# Kon externe muziek niet verkenne
+
+
+# niet binnengehaald/niet gedownload
+
+
+
+# _Laatst opgezet op/afgespeeld
+#, fuzzy
+
+# aantal keer opgezet/afgespeeld
+
+#, fuzzy
+
+# _Laatst opgezet op/afgespeeld
+
+
+# brandapparaat/brander/schrijver/schrijfapparaat
+# uitvinden/bepalen
+
+
+#, fuzzy
+
+
+
+# Master-playlist
+# hoofdafspeellijst
+
+
+
+# zie de vergelijkbare zin waarin %s op een andere plek staat
+
+# zie de vergelijkbare zin waarin %s op een andere plek staat
+
+
+
+
+
+# is dit te lang?
+# automatisch waarderen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# in de brander
+
+
+
+
+
+
+
+
+
+
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+
+# ../lisp/customize.jl
+
+
+
+# ../lisp/place-window.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/viewport.jl
+
+
+
+
+
+
+
+
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/workspace.jl
+
+
+
+# ../lisp/maximize.jl
+
+
+
+# ../lisp/move-resize.jl
+
+
+# ../lisp/auto-raise.jl
+
+
+# ../lisp/menus.jl
+
+
+
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+
+
+
+
+# ../lisp/move-resize.jl
+
+
+
+# ../lisp/slide-window.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/workspace.jl
+
+
+
+
+# ../lisp/tooltips.jl
+
+# ../lisp/tooltips.jl
+
+# ../lisp/tooltips.jl
+
+# ../lisp/customize.jl
+
+
+
+
+# ../lisp/smart-placement.jl
+
+
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/iconify.jl
+
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/maximize.jl
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/transient.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/group-funs.jl
+
+
+
+
+# ../src/sawmill-ui.jl
+
+
+
+
+
+# ../lisp/customize.jl
+
+# ../lisp/match-window.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/functions.jl
+
+# ../lisp/group-funs.jl
+
+# ../lisp/menus.jl
+#, fuzzy
+
+# ../lisp/menus.jl
+
+# ../lisp/viewport.jl
+#, fuzzy
+
+# ../lisp/workspace.jl
+#, fuzzy
+
+# ../lisp/x-cycle.jl
+
+# ../lisp/x-cycle.jl
+#, fuzzy
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+#, fuzzy
+
+# ../src/sawmill-ui.jl
+#, fuzzy
+
+# ../themes/mono/theme.jl
+
+# ../src/sawmill-ui.jl
+
+# ../src/sawmill-ui.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/custom.jl
+
+# ../lisp/customize.jl
+
+# ../lisp/customize.jl
+
+# ../lisp/edge-flip.jl
+
+# ../lisp/edge-flip.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/frames.jl
+
+# ../lisp/gnome-menu.jl
+
+# ../lisp/gnome-menu.jl
+
+# ../lisp/keymap.jl
+
+# ../lisp/keymap.jl
+
+# ../lisp/keymap.jl
+
+# ../lisp/keymap.jl
+
+# ../lisp/keymap.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/menus.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/move-resize.jl
+
+# ../lisp/place-window.jl
+
+# ../lisp/place-window.jl
+
+# ../lisp/sm-init.jl
+
+# ../lisp/sm-init.jl
+
+# ../lisp/sm-init.jl
+
+# ../lisp/sm-init.jl
+
+# ../lisp/smart-placement.jl
+
+# ../lisp/viewport.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../lisp/workspace.jl
+
+# ../themes/mono/theme.jl
+
+# ../themes/mono/theme.jl
+
+# ../themes/smaker/theme.jl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Sleutelbeheer hier beter dan Sleutelbeheerder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# moeten deze opties wel of niet vertaald worden? BUGREPORT
+
+
+
+
+# ondertekenaar?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#, fuzzy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# sectie/onderdeel
+
+# geluid en video
+
+
+
+
+# werd niet gevonden?
+# aangetroffen?
+
+
+
+
+
+
+
+
+# Office niet vertalen?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Een Hulp voor GNOME, een Hulp-programma voor GNOME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/no.po gnome-spell-1.0.8/po/no.po
--- gnome-spell-1.0.7/po/no.po	2005-01-24 19:21:40.000000000 +0000
+++ gnome-spell-1.0.8/po/no.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-# Norwegian/Bokmål translation of gnome-spell.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Kjartan Maraas  <kmaraas@gnome.org>, 2001.
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-spell 0.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-12-25 16:13+0100\n"
-"Last-Translator: Kjartan Maraas  <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian/Bokmaal <no@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: gnome-spell/control.c:231
-#, c-format
-msgid "_Suggestions for '%s'"
-msgstr "For_slag for «%s»"
-
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
-msgid "Suggestions"
-msgstr "Forslag"
-
-#: gnome-spell/control.c:413
-msgid "Could not load glade file."
-msgstr "Kunne ikke lese glade-fil."
-
-#: gnome-spell/dictionary.c:148
-msgid "Breton"
-msgstr "Breton"
-
-#: gnome-spell/dictionary.c:149
-msgid "Catalan"
-msgstr "Katalansk"
-
-#: gnome-spell/dictionary.c:150
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: gnome-spell/dictionary.c:151
-msgid "Welsh"
-msgstr "Walisisk"
-
-#: gnome-spell/dictionary.c:152
-msgid "Danish"
-msgstr "Dansk"
-
-#: gnome-spell/dictionary.c:153
-msgid "German (Austria)"
-msgstr "Tysk (Østerrike)"
-
-#: gnome-spell/dictionary.c:154
-msgid "German (Germany)"
-msgstr "Tysk (Tyskland)"
-
-#: gnome-spell/dictionary.c:155
-msgid "German (Swiss)"
-msgstr "Tysk (Sveitsisk)"
-
-#: gnome-spell/dictionary.c:156
-msgid "Greek"
-msgstr "Gresk"
-
-#: gnome-spell/dictionary.c:157
-msgid "English (American)"
-msgstr "Engelsk (Amerikansk)"
-
-#: gnome-spell/dictionary.c:158
-msgid "English (British)"
-msgstr "Engelsk (Britisk)"
-
-#: gnome-spell/dictionary.c:159
-msgid "English (Canadian)"
-msgstr "Engelsk (Kanadisk)"
-
-#: gnome-spell/dictionary.c:160
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: gnome-spell/dictionary.c:161
-msgid "Spanish"
-msgstr "Spansk"
-
-#: gnome-spell/dictionary.c:162
-msgid "Finnish"
-msgstr "Finsk"
-
-#: gnome-spell/dictionary.c:163
-msgid "Faroese"
-msgstr "Færøysk"
-
-#: gnome-spell/dictionary.c:164
-msgid "French (France)"
-msgstr "Fransk (Frankrike)"
-
-#: gnome-spell/dictionary.c:165
-msgid "French (Swiss)"
-msgstr "Fransk (Sveitsisk)"
-
-#: gnome-spell/dictionary.c:166
-msgid "Irish"
-msgstr "Irsk"
-
-#: gnome-spell/dictionary.c:167
-msgid "Galician"
-msgstr "Galisiks"
-
-#: gnome-spell/dictionary.c:168
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: gnome-spell/dictionary.c:169
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italiensk"
-
-#: gnome-spell/dictionary.c:171
-msgid "Icelandic"
-msgstr "Islandsk"
-
-#: gnome-spell/dictionary.c:172
-msgid "Latin"
-msgstr "Latin"
-
-#: gnome-spell/dictionary.c:173
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: gnome-spell/dictionary.c:174
-msgid "Norwegian (Bokmal)"
-msgstr "Norsk (bokmål)"
-
-#: gnome-spell/dictionary.c:175
-msgid "Dutch"
-msgstr "Nederlandsk"
-
-#: gnome-spell/dictionary.c:176
-msgid "Norwegian (Nyorsk)"
-msgstr "Norsk (nynorsk)"
-
-#: gnome-spell/dictionary.c:177
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: gnome-spell/dictionary.c:178
-msgid "Polish"
-msgstr "Polsk"
-
-#: gnome-spell/dictionary.c:179
-msgid "Portuguese (Portugal)"
-msgstr "Portugisisk"
-
-#: gnome-spell/dictionary.c:180
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisisk (Brasiliensk)"
-
-#: gnome-spell/dictionary.c:181
-msgid "Romanian"
-msgstr "Rumensk"
-
-#: gnome-spell/dictionary.c:182
-msgid "Russian"
-msgstr "Russisk"
-
-#: gnome-spell/dictionary.c:183
-msgid "Sardinian"
-msgstr "Sardinsk"
-
-#: gnome-spell/dictionary.c:184
-msgid "Slovak"
-msgstr "Slovakisk"
-
-#: gnome-spell/dictionary.c:185
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#: gnome-spell/dictionary.c:186
-msgid "Swedish"
-msgstr "Svensk"
-
-#: gnome-spell/dictionary.c:187
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: gnome-spell/dictionary.c:188
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: gnome-spell/dictionary.c:189
-msgid "Yiddish"
-msgstr "Jiddisk"
-
-#: gnome-spell/spell-checker.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: gnome-spell/spell-checker.glade.h:2
-msgid "Add to dictionary"
-msgstr "Legg til i ordbok"
-
-#: gnome-spell/spell-checker.glade.h:3
-msgid "Checked word"
-msgstr "Sjekket ord"
-
-#: gnome-spell/spell-checker.glade.h:4
-msgid "D_ictionaries"
-msgstr "_Ordbøker"
-
-#: gnome-spell/spell-checker.glade.h:5
-msgid "Describe _all"
-msgstr "Beskriv _alle"
-
-#: gnome-spell/spell-checker.glade.h:6
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: gnome-spell/spell-checker.glade.h:7
-msgid "Remember"
-msgstr "Husk"
-
-#: gnome-spell/spell-checker.glade.h:8
-msgid "Replace"
-msgstr "NO"
-
-#: gnome-spell/spell-checker.glade.h:10
-msgid "_Add word"
-msgstr "_Legg til ord"
-
-#: gnome-spell/spell-checker.glade.h:11
-msgid "_Back"
-msgstr "Til_bake"
-
-#: gnome-spell/spell-checker.glade.h:12
-msgid "_Describe"
-msgstr "_Beskriv"
-
-#: gnome-spell/spell-checker.glade.h:13
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: gnome-spell/spell-checker.glade.h:14
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: gnome-spell/spell-checker.glade.h:15
-msgid "_Replace"
-msgstr "E_rstatt"
-
-#: gnome-spell/spell-checker.glade.h:16
-msgid "_Skip"
-msgstr "_Hopp over"
-
-#: gnome-spell/test-spell.c:39
-msgid "I could not initialize Bonobo"
-msgstr "Kunne ikke initiere Bonobo"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/oc.po gnome-spell-1.0.8/po/oc.po
--- gnome-spell-1.0.7/po/oc.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-spell-1.0.8/po/oc.po	2007-10-15 12:38:08.000000000 +0000
@@ -0,0 +1,906 @@
+# Occitan translation of gnome-spell.
+# Copyright (C) 2001-2006 Free Software Foundation, Inc.
+# This file is distriibuted under the GNU General Public License version 2.
+#
+# Yannig MARCHEGAY (yannig@marchegay.org) - 2006-2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-spell 1.0.7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-13 17:48+0200\n"
+"PO-Revision-Date: 2007-07-29 12:52+0200\n"
+"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig@marchegay.org>\n"
+"Language-Team: Occitan (post 1500) <ubuntu-l10n-oci@lists.ubuntu.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../gnome-spell/control.c:232
+#, c-format
+msgid "_Suggestions for '%s'"
+msgstr "_Suggestions per '%s'"
+
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
+msgid "Suggestions"
+msgstr "Prepausicions"
+
+#: ../gnome-spell/control.c:415
+msgid "Could not load glade file."
+msgstr "Impossible de cargar lo fichièr glade."
+
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amaric"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamés"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturian"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avar"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymarà"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Aseri"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Bachkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinés"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Bielorus"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bembà"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgar"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislamà"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambarà"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetan"
+
+#: ../gnome-spell/dictionary.c:170
+msgid "Breton"
+msgstr "Breton"
+
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosniac"
+
+#: ../gnome-spell/dictionary.c:172
+msgid "Catalan"
+msgstr "Catalan"
+
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Chechen"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuan"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorrá"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukés"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Còrse"
+
+#: ../gnome-spell/dictionary.c:178
+msgid "Czech"
+msgstr "Chèc"
+
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kashbian"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../gnome-spell/dictionary.c:181
+msgid "Welsh"
+msgstr "Galés"
+
+#: ../gnome-spell/dictionary.c:182
+msgid "Danish"
+msgstr "Danés"
+
+#: ../gnome-spell/dictionary.c:183
+msgid "German (Austria)"
+msgstr "Aleman (Àustria)"
+
+#: ../gnome-spell/dictionary.c:184
+msgid "German (Germany)"
+msgstr "Aleman (Alemanha)"
+
+#: ../gnome-spell/dictionary.c:185
+msgid "German (Swiss)"
+msgstr "Aleman (Soïssa)"
+
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
+msgid "Greek"
+msgstr "Grèc"
+
+#: ../gnome-spell/dictionary.c:188
+msgid "English (American)"
+msgstr "Anglés (american)"
+
+#: ../gnome-spell/dictionary.c:189
+msgid "English (British)"
+msgstr "Anglés (britanic)"
+
+#: ../gnome-spell/dictionary.c:190
+msgid "English (Canadian)"
+msgstr "Anglés (canadian)"
+
+#: ../gnome-spell/dictionary.c:191
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../gnome-spell/dictionary.c:192
+msgid "Spanish"
+msgstr "Castelhan"
+
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estonian"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basc"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fula"
+
+#: ../gnome-spell/dictionary.c:197
+msgid "Finnish"
+msgstr "Finés"
+
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fijian"
+
+#: ../gnome-spell/dictionary.c:199
+msgid "Faroese"
+msgstr "Feroés"
+
+#: ../gnome-spell/dictionary.c:200
+msgid "French (France)"
+msgstr "Francés (França)"
+
+#: ../gnome-spell/dictionary.c:201
+msgid "French (Swiss)"
+msgstr "Francés (Soïssa)"
+
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friolan"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frisian"
+
+#: ../gnome-spell/dictionary.c:204
+msgid "Irish"
+msgstr "Irlandés"
+
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Gaelic escocés"
+
+#: ../gnome-spell/dictionary.c:206
+msgid "Galician"
+msgstr "Galician"
+
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarari"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Gaelic de Manx"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Aoaian"
+
+#: ../gnome-spell/dictionary.c:212
+msgid "Hebrew"
+msgstr "Ebrèu"
+
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Indi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Iligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Iri Motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Croat"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:219
+msgid "Hungarian"
+msgstr "Ongrés"
+
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armenian"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Ebrèu"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlinguà"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesian"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italian"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japonés"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanés"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyamà"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazakh"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannadà"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Corean"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Curd"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Cornic"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirghiz"
+
+#: ../gnome-spell/dictionary.c:251
+msgid "Latin"
+msgstr "Latin"
+
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxemborgés"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgian"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingalà"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Laossian"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
+msgid "Lithuanian"
+msgstr "Lituanian"
+
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katangà"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Leton"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maòri"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongolian"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Croacia"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marati"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malés"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltés"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Birman"
+
+#: ../gnome-spell/dictionary.c:274
+msgid "Norwegian (Bokmal)"
+msgstr "Norvegian (Bokmal)"
+
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niuean"
+
+#: ../gnome-spell/dictionary.c:280
+msgid "Dutch"
+msgstr "Olandés"
+
+#: ../gnome-spell/dictionary.c:281
+msgid "Norwegian (Nyorsk)"
+msgstr "Norvegian (Nyorsk)"
+
+#: ../gnome-spell/dictionary.c:282
+msgid "Norwegian"
+msgstr "Norvegian"
+
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriyà"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampangà"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:294
+msgid "Polish"
+msgstr "Polonés"
+
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:296
+msgid "Portuguese (Portugal)"
+msgstr "Portugués (Portugal)"
+
+#: ../gnome-spell/dictionary.c:297
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasil)"
+
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quechua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:301
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../gnome-spell/dictionary.c:302
+msgid "Russian"
+msgstr "Rus"
+
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwandà"
+
+#: ../gnome-spell/dictionary.c:304
+msgid "Sardinian"
+msgstr "Sard"
+
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Vinyes"
+
+#: ../gnome-spell/dictionary.c:309
+msgid "Slovak"
+msgstr "Eslovac"
+
+#: ../gnome-spell/dictionary.c:310
+msgid "Slovenian"
+msgstr "Eslovèn"
+
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "XChat"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanian"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbian"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:319
+msgid "Swedish"
+msgstr "Suedés"
+
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tajik"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tònga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:333
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsongà"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Taician"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:339
+msgid "Ukrainian"
+msgstr "Ucraïnian"
+
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Vendà"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamés"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Valon"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
+msgid "Yiddish"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr ""
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Chinés"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zolo"
+
+#: ../gnome-spell/spell-checker.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../gnome-spell/spell-checker.glade.h:2
+msgid "Add to dictionary"
+msgstr "Apondre al diccionari"
+
+#: ../gnome-spell/spell-checker.glade.h:3
+msgid "Checked word"
+msgstr "Mot verificat"
+
+#: ../gnome-spell/spell-checker.glade.h:4
+msgid "D_ictionaries"
+msgstr "D_iccionaris"
+
+#: ../gnome-spell/spell-checker.glade.h:5
+msgid "Describe _all"
+msgstr "_Tot descriure"
+
+#: ../gnome-spell/spell-checker.glade.h:6
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../gnome-spell/spell-checker.glade.h:7
+msgid "Remember"
+msgstr ""
+
+#: ../gnome-spell/spell-checker.glade.h:8
+msgid "Replace"
+msgstr "Remplaçar"
+
+#: ../gnome-spell/spell-checker.glade.h:10
+msgid "_Add word"
+msgstr "_Apondre lo mot"
+
+#: ../gnome-spell/spell-checker.glade.h:11
+msgid "_Back"
+msgstr "_Tornar"
+
+#: ../gnome-spell/spell-checker.glade.h:12
+msgid "_Describe"
+msgstr "_Descriure"
+
+#: ../gnome-spell/spell-checker.glade.h:13
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../gnome-spell/spell-checker.glade.h:14
+msgid "_Ignore"
+msgstr "_Ignorar"
+
+#: ../gnome-spell/spell-checker.glade.h:15
+msgid "_Replace"
+msgstr "_Remplaçar"
+
+#: ../gnome-spell/spell-checker.glade.h:16
+msgid "_Skip"
+msgstr "_Ignorar"
+
+#: ../gnome-spell/test-spell.c:39
+msgid "I could not initialize Bonobo"
+msgstr ""
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/pt_BR.po gnome-spell-1.0.8/po/pt_BR.po
--- gnome-spell-1.0.7/po/pt_BR.po	2005-01-24 19:21:41.000000000 +0000
+++ gnome-spell-1.0.8/po/pt_BR.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,278 +1,907 @@
-# Brazilian Portuguese translation of Gnome Spell.
+# American English translation of gnome-spell.HEAD
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2001.
 #
+# Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2001.
+# Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-spell 0.4\n"
+"Project-Id-Version: gnome-spell.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2004-04-06 20:40-0300\n"
-"Last-Translator: Viviani Ap. dos Santos <vivi_olivetti@brfree.com.br>\n"
-"Language-Team: GNOME-BR <gnome-l10n-br@listas.cipsga.org.br>\n"
+"POT-Creation-Date: 2006-03-22 19:05+0100\n"
+"PO-Revision-Date: 2006-04-10 03:19-0300\n"
+"Last-Translator: Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>\n"
+"Language-Team: American English <i18n@gdh.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: gnome-spell/control.c:231
+#: ../gnome-spell/control.c:232
 #, c-format
 msgid "_Suggestions for '%s'"
 msgstr "_Sugestões para '%s'"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Sugestões"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
-msgstr "Impossível carregar arquivo glade."
+msgstr "Não foi possível carregar arquivo glade."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Aricânder"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amárico"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Árabe"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamês"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avárico"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aimará"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbaidjano"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Bashkir"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinês"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Bielorrusso"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Biari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bichlamar"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetano"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Bretão"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bósnio"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Catalão"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Tchetcheno"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukês"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Corso"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Checo"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Cassubiano"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Tchuvache"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
 msgstr "Galês"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: gnome-spell/dictionary.c:153
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
-msgstr "Alemão (Austria)"
+msgstr "Alemão (Áustria)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Alemão (Alemanha)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Alemão (Suíça)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Jeje"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grego"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Inglês (Estados Unidos)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Inglês (Britânico)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Inglês (Canadense)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: gnome-spell/dictionary.c:162
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estoniano"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Basco"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Persa"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fula"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fidjiano"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
-msgstr "Faroês"
+msgstr "Feróico"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Francês (França)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
-msgstr "Francês (Suiça)"
+msgstr "Francês (Suíça)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friuliano"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frísio"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
 msgstr "Irlandês"
 
-#: gnome-spell/dictionary.c:167
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Escocês"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
 msgstr "Galego"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manês"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Hauçá"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Havaiano"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
-msgstr "Hebreu"
+msgstr "Hebraico"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Híndi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hiri Motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Lusácio Alto"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Crioulo Haitiano"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: gnome-spell/dictionary.c:170
-msgid "Italian"
-msgstr "Italiano"
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armênio"
 
-#: gnome-spell/dictionary.c:171
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Hereró"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlíngua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonésio"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Ibo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Yi (Sichuan)"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Ilocano"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
 msgid "Icelandic"
 msgstr "Islandês"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japonês"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanês"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgiano"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Quicongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Cuanhama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Cazaque"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Groenlandês"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Khmer"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Concani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Canúri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Curdo"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Córnico"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirghiz"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
 msgstr "Latim"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxemburguês"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Nganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburguês"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Laosiano"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: gnome-spell/dictionary.c:174
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Letão"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malgaxe"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshalino"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Macedônio"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malaiala"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongol"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldávio"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marati"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malaio"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltês"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Birmanês"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "Norueguês (Bokmal)"
+msgstr "Norueguês (Bokmål)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Ndebele do Norte"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Baixo-Saxão"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niueano"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Holandês"
 
-#: gnome-spell/dictionary.c:176
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
 msgstr "Norueguês (Nyorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Ndebele do Sul"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Soto do Sul"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navarro"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Cinianja"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitano"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriá"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Osseta"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Panjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampangano"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polonês"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pachto"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Português (Portugal)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasil)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quíchua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotongano"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
 msgstr "Romeno"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Russo"
 
-#: gnome-spell/dictionary.c:183
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Kinyarwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
-msgstr "Sardenha"
+msgstr "Sardo"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Lapão do Norte"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Cingalês"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: gnome-spell/dictionary.c:185
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoano"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Chona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanês"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Sérvio"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Suázi"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Soto do Sul"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sudanês"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Sueco"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Suaíli"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tâmil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Télugo"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tétum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadjique"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Tai"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrínia"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turcomeno"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Toquelauano"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalo"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Crioulo Inglês (Papua-Nova Guiné)"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
 msgstr "Turco"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tártaro"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Taitiano"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uigur"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
-msgstr "Ucrâniano"
+msgstr "Ucraniano"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Uzbeque"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Valão"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Uólofe"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
-msgstr "Ídiche"
+msgstr "Iídiche"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Ioruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Chinês"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Adicionar ao dicionário"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Palavra verificada"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "D_icionários"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Descrever _todos"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Lembrar"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Substituir"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Adicionar palavra"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Voltar"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Descrever"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Pular"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
-msgstr "Impossível iniciar o Bonobo"
-
-#~ msgid "Choose color"
-#~ msgstr "Escolha a cor"
-
-#~ msgid "Colors"
-#~ msgstr "Cores"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid "misspelling underline color"
-#~ msgstr "cor do sublinhado das palavras incorretas"
-
-#~ msgid "en"
-#~ msgstr "en"
+msgstr "Não foi possível iniciar o Bonobo"
 
-#~ msgid "Languages"
-#~ msgstr "Idiomas"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/ru.po gnome-spell-1.0.8/po/ru.po
--- gnome-spell-1.0.7/po/ru.po	2005-01-24 19:21:41.000000000 +0000
+++ gnome-spell-1.0.8/po/ru.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,284 +1,902 @@
 # Copyright (C) 2001-2003 Free Software Foundation, Inc.
 # Valek Filippov <frob@df.ru>, 2001-2003.
-#
+# Roman Kalashnikov <cargo200@gmail.com>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2003-06-28 22:15+0400\n"
-"Last-Translator: Valek Filippov <frob@df.ru>\n"
+"POT-Creation-Date: 2006-07-13 23:54+0400\n"
+"PO-Revision-Date: 2006-05-15 11:28+0000\n"
+"Last-Translator: Roman Kalashnikov <cargo200@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
-#, fuzzy, c-format
+#: ../gnome-spell/control.c:232
+#, c-format
 msgid "_Suggestions for '%s'"
-msgstr "Предложения для \"%s\""
+msgstr "_Варианты для «%s»"
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335 ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Предлагаемые замены"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Не удалось загрузить файл glade."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Афар"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Акан"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Амхарский (Амаринья)"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Арабский"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Ассамский"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Астурианский"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Авар"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Аймара"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Азербайджанский"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Башкирский"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Балийский"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Белорусский"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Бемба"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Болгарский"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Бихари"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Бислама"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Бамбара"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Бенгальский"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Тибетский"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Бретонский"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Боснийский"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Каталонский"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Чеченский"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Себуано"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Чаморро"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Чуукезе"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Корсиканский"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Чешский"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Кашубианский"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Чувашский"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
-msgstr ""
+msgstr "Валлийский"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Датский"
 
-#: gnome-spell/dictionary.c:153
-#, fuzzy
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
-msgstr "Немецкий"
+msgstr "Немецкий (Австрия)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Немецкий"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Немецкий (Швейцарский)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Эве"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Греческий"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Английский (Американский)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Английски (Британский)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Английский (Канадский)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Испанский"
 
-#: gnome-spell/dictionary.c:162
-#, fuzzy
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Эстонский"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Баскский"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Фарси"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Фула"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
-msgstr "Датский"
+msgstr "Финский"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Фиджи"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Фаэро"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Французский"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Французский (Швейцарский)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Фруилианский"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Фрисийский"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
-msgstr ""
+msgstr "Ирландский"
 
-#: gnome-spell/dictionary.c:167
-#, fuzzy
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Шотландский гаэльский"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
-msgstr "Итальянский"
+msgstr "Галицианский"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Гуарани"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Гуджарати"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Манкс гаэльский"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Хауса"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Гавайский"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
-msgstr ""
+msgstr "Иврит"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Хинди"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Хилигайнон"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Хири Моту"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Хорватский"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Верхнелужицкий"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Гаитянский Креольский"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
-msgstr ""
+msgstr "Венгерский"
 
-#: gnome-spell/dictionary.c:170
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Армянский"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Хереро"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Интерлингва"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Ибанский"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Индонезийский"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Игбо"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Сичуань Йи"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Илоко"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Идо"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "Исландский"
+
+#: ../gnome-spell/dictionary.c:230
 msgid "Italian"
 msgstr "Итальянский"
 
-#: gnome-spell/dictionary.c:171
-msgid "Icelandic"
-msgstr ""
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Японский"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Яванский"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Грузинский"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Качинский"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Конго"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Хаси"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Кикую"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Кваньяма"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Казахский"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Калааллисут / Гренландский"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Кхмер"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Корейский"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Конкани"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Канури"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Кашмири"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Курдский"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Коми"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Корнский"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Киргизский"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
-msgstr ""
+msgstr "Латинский"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Люксембургский"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Ганда"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Лимбуржский"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Лингала"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Лао"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Лози"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
-msgstr ""
+msgstr "Литовский"
 
-#: gnome-spell/dictionary.c:174
-#, fuzzy
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Луба-Катанга"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Луо"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Латышский"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Малагази"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Маршалезский"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Маори"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Минангкабау"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Македонский"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Малаялам"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Монгольский"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Молдавский"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Марати"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Малайский"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Мальтский"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Бирманский"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "Норвежский"
+msgstr "Норвежский (Бокмал)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Северный Ндебеле"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Нижнесаксонский"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Непальский"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ндонга"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Ниуэ"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Голандский"
 
-#: gnome-spell/dictionary.c:176
-#, fuzzy
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
-msgstr "Норвежский"
+msgstr "Норвежский (Норск)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Южный Ндебеле"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Северный сото"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Навахо"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Няня/Чичева"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Оккитан"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Оромо"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Ория"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Осетинский"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Панджаби"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Пампанга"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Папьяменто"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Польский"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Пушту"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Португальский"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Португальский (Бразильский)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Квечуа"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Раротонга"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Рунди"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
-msgstr ""
+msgstr "Румынский"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Русский"
 
-#: gnome-spell/dictionary.c:183
-#, fuzzy
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Киньяруанда"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
-msgstr "Украинский"
+msgstr "Сардинский"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Синдхи"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Северный Сами"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Санго"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Сингалезский"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: gnome-spell/dictionary.c:185
-#, fuzzy
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
-msgstr "Словацкий"
+msgstr "Словенский"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Самоанский"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Шона"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Сомали"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Албанский"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Сербский"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Свати"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Южный Сотхо"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Суданский"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Шведский"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Суахили"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Тамил"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Тетум"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Таджикский"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Тай"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Тигринья"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Туркменский"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Токелау"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Тагалог"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Тсвана"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Тонга"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Ток Писин"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
-msgstr ""
+msgstr "Турецкий"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Цонга"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Татарский"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Тви"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Таитянский"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Уйгурский"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Украинский"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Узбекский"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Венда"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Вьетнамский"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Валлун"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Волоф"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Коса"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
-msgstr ""
+msgstr "Идиш"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Йоруба"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Чжуань"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Китайский"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Зулу"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "Добавить в словарь"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Проверяемое слово"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
-msgstr "Словари"
+msgstr "Сл_овари"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
-msgstr "Подписать все"
+msgstr "Объ_яснить всё"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Запомнить"
 
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Заменить"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
-msgstr "Добавить слово"
+msgstr "До_бавить слово"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
-msgstr "Назад"
+msgstr "_Назад"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
-msgstr "Подписать"
+msgstr "_Объяснить"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
-msgstr "Справка"
+msgstr "_Справка"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
-msgstr "Игнорировать"
+msgstr "_Игнорировать"
 
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
-msgstr "Заменить"
+msgstr "_Заменить"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
-msgstr "Пропустить"
+msgstr "Пр_опустить"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
-
-#~ msgid "Choose color"
-#~ msgstr "Выбрать цвет"
-
-#~ msgid "Colors"
-#~ msgstr "Цвета"
-
-#~ msgid "Language"
-#~ msgstr "Язык"
-
-#~ msgid "misspelling underline color"
-#~ msgstr "цвет подчёркивания слов с ошибками"
-
-#~ msgid "en"
-#~ msgstr "en"
-
-#~ msgid "Languages"
-#~ msgstr "Языки"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/sl.po gnome-spell-1.0.8/po/sl.po
--- gnome-spell-1.0.7/po/sl.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-spell-1.0.8/po/sl.po	2007-09-03 07:42:15.000000000 +0000
@@ -0,0 +1,911 @@
+# Slovenian translation of gnome-spell.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-spell package.
+#
+# Matej Urbančič <matej.urban@gmail.com>, 2006, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-spell HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-13 03:51+0100\n"
+"PO-Revision-Date: 2006-11-13 11:54+0100\n"
+"Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../gnome-spell/control.c:232
+#, c-format
+msgid "_Suggestions for '%s'"
+msgstr "_Predlogi za '%s'"
+
+#: ../gnome-spell/control.c:335
+#: ../gnome-spell/spell-checker.glade.h:9
+msgid "Suggestions"
+msgstr "Predlogi"
+
+#: ../gnome-spell/control.c:415
+msgid "Could not load glade file."
+msgstr "Ni mogoče naložiti datoteke glade."
+
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "afarščina"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "afriščina"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "akanščina"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "amharščina"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "arabščina"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "asamščina"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "asturščina"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "avarščina"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "ajmarščina"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "azerbajdžanščina"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "baškirščina"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "bališčina"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "beloruščina"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "bembajščina"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "bolgarščina"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "biharščina"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "bislamščina"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "bambarščina"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "bengalščina"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "tibetanščina"
+
+#: ../gnome-spell/dictionary.c:170
+msgid "Breton"
+msgstr "bretonščina"
+
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "bosanščina"
+
+#: ../gnome-spell/dictionary.c:172
+msgid "Catalan"
+msgstr "katalonščina"
+
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "čečenščina"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "kebanščina"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "čamorščina"
+
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "čukeščina"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "korziščina"
+
+#: ../gnome-spell/dictionary.c:178
+msgid "Czech"
+msgstr "češčina"
+
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "kašubščina"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "čuvaščina"
+
+#: ../gnome-spell/dictionary.c:181
+msgid "Welsh"
+msgstr "valižanščina"
+
+#: ../gnome-spell/dictionary.c:182
+msgid "Danish"
+msgstr "danščina"
+
+#: ../gnome-spell/dictionary.c:183
+msgid "German (Austria)"
+msgstr "nemščina (Avstrija)"
+
+#: ../gnome-spell/dictionary.c:184
+msgid "German (Germany)"
+msgstr "nemščina (Nemčija)"
+
+#: ../gnome-spell/dictionary.c:185
+msgid "German (Swiss)"
+msgstr "nemščina (Švica)"
+
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "evščina"
+
+#: ../gnome-spell/dictionary.c:187
+msgid "Greek"
+msgstr "grščina"
+
+#: ../gnome-spell/dictionary.c:188
+msgid "English (American)"
+msgstr "angleščina (ZDA)"
+
+#: ../gnome-spell/dictionary.c:189
+msgid "English (British)"
+msgstr "angleščina (Velika Britanija)"
+
+#: ../gnome-spell/dictionary.c:190
+msgid "English (Canadian)"
+msgstr "angleščina (Kanada)"
+
+#: ../gnome-spell/dictionary.c:191
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../gnome-spell/dictionary.c:192
+msgid "Spanish"
+msgstr "španščina"
+
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "estonščina"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "baskovščina"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "farščina"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "fulščina"
+
+#: ../gnome-spell/dictionary.c:197
+msgid "Finnish"
+msgstr "finščina"
+
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "fidžijščina"
+
+#: ../gnome-spell/dictionary.c:199
+msgid "Faroese"
+msgstr "farščina"
+
+#: ../gnome-spell/dictionary.c:200
+msgid "French (France)"
+msgstr "francoščina (Francija)"
+
+#: ../gnome-spell/dictionary.c:201
+msgid "French (Swiss)"
+msgstr "francoščina (Švica)"
+
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "frigijščina"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "frisianščina"
+
+#: ../gnome-spell/dictionary.c:204
+msgid "Irish"
+msgstr "irščina"
+
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "galščina, škotska"
+
+#: ../gnome-spell/dictionary.c:206
+msgid "Galician"
+msgstr "galščina"
+
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "gvaranščina"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "gudžaratščina"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "galščina, manska"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "hausa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "havajščina"
+
+#: ../gnome-spell/dictionary.c:212
+msgid "Hebrew"
+msgstr "hebrejščina"
+
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "hindujščina"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "hilingajnonščina"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "hiri motu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "hrvaščina"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "srbščina, lužiška"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "kreolščina, haitska"
+
+#: ../gnome-spell/dictionary.c:219
+msgid "Hungarian"
+msgstr "madžarščina"
+
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "armenščina"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "hererščina"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "interlingva"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "ibanščina"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "indonezijščina"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "igbojščina"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "jiščina (Sečuan)"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "ilokojščina"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "idojščina"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "islandščina"
+
+#: ../gnome-spell/dictionary.c:230
+msgid "Italian"
+msgstr "italjanščina"
+
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "japonščina"
+
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "javanščina"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "gruzijščina"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "kačinščina"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "kongovščina"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "khaščina"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "gikujščina"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "kvanjamščina"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "kazahstanščina"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "kalalisujščina (Grenlandija)"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "kmerščina"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "kanareščina"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "korejščina"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "konkanščina"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "kanurščina"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "kašmirščina"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "kurdščina"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "komiščina"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "kornščina"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "kirghizijščina"
+
+#: ../gnome-spell/dictionary.c:251
+msgid "Latin"
+msgstr "latinščina"
+
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "luksemburščina"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "gandajščina"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "limburgščina"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "laoščina"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "loščina"
+
+#: ../gnome-spell/dictionary.c:258
+msgid "Lithuanian"
+msgstr "litvanščina"
+
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "lubalulujščina"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "latvijščina"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "malgaščina"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "maršalščina"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "maorščina"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "malajščina (Minangkabau)"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "makedonščina"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "malajščina"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "mongolščina"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "moldavščina"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "maratščina"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "malajščina"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "malteščina"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "burmanščina"
+
+#: ../gnome-spell/dictionary.c:274
+msgid "Norwegian (Bokmal)"
+msgstr "norveščina (Bokmal)"
+
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "ndebelščina, severna"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "saksonščina, spodnja"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "nepalščina"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "ndongščina"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "niuejščina"
+
+#: ../gnome-spell/dictionary.c:280
+msgid "Dutch"
+msgstr "nizozemščina"
+
+#: ../gnome-spell/dictionary.c:281
+msgid "Norwegian (Nyorsk)"
+msgstr "norveščina (Nyorsk)"
+
+#: ../gnome-spell/dictionary.c:282
+msgid "Norwegian"
+msgstr "norveščina"
+
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "ndebelščina, južna"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "sotojščina, severna"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "navajščina"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "čičevajščina"
+
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "okcitanščina"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "oromščina"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "orijščina"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "osetščina"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "pandžabščina"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "pampanščina"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "papiamentu"
+
+#: ../gnome-spell/dictionary.c:294
+msgid "Polish"
+msgstr "polščina"
+
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "paštu"
+
+#: ../gnome-spell/dictionary.c:296
+msgid "Portuguese (Portugal)"
+msgstr "portugalščina (Portugalska)"
+
+#: ../gnome-spell/dictionary.c:297
+msgid "Portuguese (Brazilian)"
+msgstr "portugalščina (Brazilija)"
+
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "kečvanščina"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "rarotanščina"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "rundščina"
+
+#: ../gnome-spell/dictionary.c:301
+msgid "Romanian"
+msgstr "romunščina"
+
+#: ../gnome-spell/dictionary.c:302
+msgid "Russian"
+msgstr "ruščina"
+
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "kinjarvanda"
+
+#: ../gnome-spell/dictionary.c:304
+msgid "Sardinian"
+msgstr "sardinščina"
+
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "sindščina"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "samščina, severna"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "singalščina"
+
+#: ../gnome-spell/dictionary.c:309
+msgid "Slovak"
+msgstr "slovaščina"
+
+#: ../gnome-spell/dictionary.c:310
+msgid "Slovenian"
+msgstr "slovenščina"
+
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "samojščina"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "šonščina"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "somalščina"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "albanščina"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "srbščina"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "svaziščina"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "sotojščina, južna"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "sundščina"
+
+#: ../gnome-spell/dictionary.c:319
+msgid "Swedish"
+msgstr "švedščina"
+
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "svahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "tamilščina"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "telugujščina"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "tetunščina"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "tadžikistanščina"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "tajščina"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "tigrinjščina"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "turkmenščina"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "tokelau"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "tagaloščina"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "tsvanščina"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "tok pisin"
+
+#: ../gnome-spell/dictionary.c:333
+msgid "Turkish"
+msgstr "turščina"
+
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "tsongščina"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "tatarščina"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "tvijščina"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "tahitijščina"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "ujgurščina"
+
+#: ../gnome-spell/dictionary.c:339
+msgid "Ukrainian"
+msgstr "ukrajinščina"
+
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "urdujščina"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "uzbekistanščina"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "vendajščina"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "vijetnamščina"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Valonščina"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "volofanščina"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "koščina"
+
+#: ../gnome-spell/dictionary.c:347
+msgid "Yiddish"
+msgstr "jidiščina"
+
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "jorubščina"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "džangščina"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "kitajščina"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "zulujščina"
+
+#: ../gnome-spell/spell-checker.glade.h:1
+msgid "*"
+msgstr "*"
+
+#: ../gnome-spell/spell-checker.glade.h:2
+msgid "Add to dictionary"
+msgstr "Dodaj v slovar"
+
+#: ../gnome-spell/spell-checker.glade.h:3
+msgid "Checked word"
+msgstr "Preverjena beseda"
+
+#: ../gnome-spell/spell-checker.glade.h:4
+msgid "D_ictionaries"
+msgstr "Slovarj_i"
+
+#: ../gnome-spell/spell-checker.glade.h:5
+msgid "Describe _all"
+msgstr "Opiši _vse"
+
+#: ../gnome-spell/spell-checker.glade.h:6
+msgid "Ignore"
+msgstr "Prezri"
+
+#: ../gnome-spell/spell-checker.glade.h:7
+msgid "Remember"
+msgstr "Zapomni si"
+
+#: ../gnome-spell/spell-checker.glade.h:8
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: ../gnome-spell/spell-checker.glade.h:10
+msgid "_Add word"
+msgstr "_Dodaj besedo"
+
+#: ../gnome-spell/spell-checker.glade.h:11
+msgid "_Back"
+msgstr "_Nazaj"
+
+#: ../gnome-spell/spell-checker.glade.h:12
+msgid "_Describe"
+msgstr "_Opisovanje"
+
+#: ../gnome-spell/spell-checker.glade.h:13
+msgid "_Help"
+msgstr "_Pomoč"
+
+#: ../gnome-spell/spell-checker.glade.h:14
+msgid "_Ignore"
+msgstr "_Prezri"
+
+#: ../gnome-spell/spell-checker.glade.h:15
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: ../gnome-spell/spell-checker.glade.h:16
+msgid "_Skip"
+msgstr "Pre_skoči"
+
+#: ../gnome-spell/test-spell.c:39
+msgid "I could not initialize Bonobo"
+msgstr "Nisem mogel inicializirati Bonoba"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/sv.po gnome-spell-1.0.8/po/sv.po
--- gnome-spell-1.0.7/po/sv.po	2005-01-24 19:21:41.000000000 +0000
+++ gnome-spell-1.0.8/po/sv.po	2007-01-01 22:18:09.000000000 +0000
@@ -1,310 +1,937 @@
 # Swedish messages for gnome-spell.
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003.
+# Daniel Nylander <po@danielnylander.se>, 2006.
 #
-# $Id: sv.po,v 1.12 2005/01/24 19:21:41 rodo Exp $
+# $Id: sv.po,v 1.13 2006/04/16 20:13:51 dnylande Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-spell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 19:18+0100\n"
-"PO-Revision-Date: 2003-04-18 22:24+0200\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"POT-Creation-Date: 2006-04-12 19:31+0200\n"
+"PO-Revision-Date: 2006-04-16 20:42+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome-spell/control.c:231
-#, fuzzy, c-format
+#: ../gnome-spell/control.c:232
+#, c-format
 msgid "_Suggestions for '%s'"
-msgstr "Förslag för \"%s\""
+msgstr "_Förslag för \"%s\""
 
-#: gnome-spell/control.c:334 gnome-spell/spell-checker.glade.h:9
+#: ../gnome-spell/control.c:335
+#: ../gnome-spell/spell-checker.glade.h:9
 msgid "Suggestions"
 msgstr "Förslag"
 
-#: gnome-spell/control.c:413
+#: ../gnome-spell/control.c:415
 msgid "Could not load glade file."
 msgstr "Kunde inte läsa in glade-filen."
 
-#: gnome-spell/dictionary.c:148
+#. check <http://aspell.sourceforge.net/man-html/Supported.html> and
+#. <http://aspell.sourceforge.net/man-html/Unsupported.html>.
+#. short language codes according to ISO 639-1.
+#: ../gnome-spell/dictionary.c:150
+msgid "Afar"
+msgstr "Afar"
+
+#: ../gnome-spell/dictionary.c:151
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../gnome-spell/dictionary.c:152
+msgid "Akan"
+msgstr "Akan"
+
+#: ../gnome-spell/dictionary.c:153
+msgid "Amharic"
+msgstr "Amhariska"
+
+#: ../gnome-spell/dictionary.c:154
+msgid "Arabic"
+msgstr "Arabiska"
+
+#: ../gnome-spell/dictionary.c:155
+msgid "Assamese"
+msgstr "Assamesiska"
+
+#: ../gnome-spell/dictionary.c:156
+msgid "Asturian"
+msgstr "Asturian"
+
+#: ../gnome-spell/dictionary.c:157
+msgid "Avar"
+msgstr "Avariskt språk"
+
+#: ../gnome-spell/dictionary.c:158
+msgid "Aymara"
+msgstr "Aymara"
+
+#: ../gnome-spell/dictionary.c:159
+msgid "Azerbaijani"
+msgstr "Azerbajdzjanska"
+
+#: ../gnome-spell/dictionary.c:160
+msgid "Bashkir"
+msgstr "Basjkiriska"
+
+#: ../gnome-spell/dictionary.c:161
+msgid "Balinese"
+msgstr "Balinesiska"
+
+#: ../gnome-spell/dictionary.c:162
+msgid "Belarusian"
+msgstr "Vitryska"
+
+#: ../gnome-spell/dictionary.c:163
+msgid "Bemba"
+msgstr "Bemba"
+
+#: ../gnome-spell/dictionary.c:164
+msgid "Bulgarian"
+msgstr "Bulgariska"
+
+#: ../gnome-spell/dictionary.c:165
+msgid "Bihari"
+msgstr "Bihari"
+
+#: ../gnome-spell/dictionary.c:166
+msgid "Bislama"
+msgstr "Bislama"
+
+#: ../gnome-spell/dictionary.c:167
+msgid "Bambara"
+msgstr "Bambara"
+
+#: ../gnome-spell/dictionary.c:168
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../gnome-spell/dictionary.c:169
+msgid "Tibetan"
+msgstr "Tibetanska"
+
+#: ../gnome-spell/dictionary.c:170
 msgid "Breton"
 msgstr "Bretonska"
 
-#: gnome-spell/dictionary.c:149
+#: ../gnome-spell/dictionary.c:171
+msgid "Bosnian"
+msgstr "Bosniska"
+
+#: ../gnome-spell/dictionary.c:172
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: gnome-spell/dictionary.c:150
+#: ../gnome-spell/dictionary.c:173
+msgid "Chechen"
+msgstr "Tjetjenska"
+
+#: ../gnome-spell/dictionary.c:174
+msgid "Cebuano"
+msgstr "Cebuano"
+
+#: ../gnome-spell/dictionary.c:175
+msgid "Chamorro"
+msgstr "Chamorro"
+
+# Osäker på denna
+#: ../gnome-spell/dictionary.c:176
+msgid "Chuukese"
+msgstr "Chuukese"
+
+#: ../gnome-spell/dictionary.c:177
+msgid "Corsican"
+msgstr "Korsikanska"
+
+#: ../gnome-spell/dictionary.c:178
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: gnome-spell/dictionary.c:151
+#: ../gnome-spell/dictionary.c:179
+msgid "Kashubian"
+msgstr "Kasjubiska"
+
+#: ../gnome-spell/dictionary.c:180
+msgid "Chuvash"
+msgstr "Tjuvasjiska"
+
+#: ../gnome-spell/dictionary.c:181
 msgid "Welsh"
-msgstr ""
+msgstr "Kymriska"
 
-#: gnome-spell/dictionary.c:152
+#: ../gnome-spell/dictionary.c:182
 msgid "Danish"
 msgstr "Danska"
 
-#: gnome-spell/dictionary.c:153
-#, fuzzy
+#: ../gnome-spell/dictionary.c:183
 msgid "German (Austria)"
-msgstr "Tyska (Tyskland)"
+msgstr "Tyska (Österrike)"
 
-#: gnome-spell/dictionary.c:154
+#: ../gnome-spell/dictionary.c:184
 msgid "German (Germany)"
 msgstr "Tyska (Tyskland)"
 
-#: gnome-spell/dictionary.c:155
+#: ../gnome-spell/dictionary.c:185
 msgid "German (Swiss)"
 msgstr "Tyska (schweizisk)"
 
-#: gnome-spell/dictionary.c:156
+#: ../gnome-spell/dictionary.c:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../gnome-spell/dictionary.c:187
 msgid "Greek"
 msgstr "Grekiska"
 
-#: gnome-spell/dictionary.c:157
+#: ../gnome-spell/dictionary.c:188
 msgid "English (American)"
 msgstr "Engelska (amerikansk)"
 
-#: gnome-spell/dictionary.c:158
+#: ../gnome-spell/dictionary.c:189
 msgid "English (British)"
 msgstr "Engelska (brittisk)"
 
-#: gnome-spell/dictionary.c:159
+#: ../gnome-spell/dictionary.c:190
 msgid "English (Canadian)"
 msgstr "Engelska (kanadensisk)"
 
-#: gnome-spell/dictionary.c:160
+#: ../gnome-spell/dictionary.c:191
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: gnome-spell/dictionary.c:161
+#: ../gnome-spell/dictionary.c:192
 msgid "Spanish"
 msgstr "Spanska"
 
-#: gnome-spell/dictionary.c:162
-#, fuzzy
+#: ../gnome-spell/dictionary.c:193
+msgid "Estonian"
+msgstr "Estniska"
+
+#: ../gnome-spell/dictionary.c:194
+msgid "Basque"
+msgstr "Baskiska"
+
+#: ../gnome-spell/dictionary.c:195
+msgid "Farsi"
+msgstr "Farsi"
+
+#: ../gnome-spell/dictionary.c:196
+msgid "Fulah"
+msgstr "Fulani"
+
+#: ../gnome-spell/dictionary.c:197
 msgid "Finnish"
-msgstr "Danska"
+msgstr "Finska"
 
-#: gnome-spell/dictionary.c:163
+#: ../gnome-spell/dictionary.c:198
+msgid "Fijian"
+msgstr "Fidjianska"
+
+#: ../gnome-spell/dictionary.c:199
 msgid "Faroese"
 msgstr "Färöiska"
 
-#: gnome-spell/dictionary.c:164
+#: ../gnome-spell/dictionary.c:200
 msgid "French (France)"
 msgstr "Franska (Frankrike)"
 
-#: gnome-spell/dictionary.c:165
+#: ../gnome-spell/dictionary.c:201
 msgid "French (Swiss)"
 msgstr "Franska (schweizisk)"
 
-#: gnome-spell/dictionary.c:166
+#: ../gnome-spell/dictionary.c:202
+msgid "Friulian"
+msgstr "Friuliska"
+
+#: ../gnome-spell/dictionary.c:203
+msgid "Frisian"
+msgstr "Frisiska"
+
+#: ../gnome-spell/dictionary.c:204
 msgid "Irish"
-msgstr ""
+msgstr "Iriska"
 
-#: gnome-spell/dictionary.c:167
-#, fuzzy
+#: ../gnome-spell/dictionary.c:205
+msgid "Scottish Gaelic"
+msgstr "Höglandsskotska"
+
+#: ../gnome-spell/dictionary.c:206
 msgid "Galician"
-msgstr "Italienska"
+msgstr "Galiciska"
 
-#: gnome-spell/dictionary.c:168
+#: ../gnome-spell/dictionary.c:207
+msgid "Guarani"
+msgstr "Guarani"
+
+#: ../gnome-spell/dictionary.c:208
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../gnome-spell/dictionary.c:209
+msgid "Manx Gaelic"
+msgstr "Manx-skotska"
+
+#: ../gnome-spell/dictionary.c:210
+msgid "Hausa"
+msgstr "Haussa"
+
+#: ../gnome-spell/dictionary.c:211
+msgid "Hawaiian"
+msgstr "Hawaiianska"
+
+#: ../gnome-spell/dictionary.c:212
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebreiska"
 
-#: gnome-spell/dictionary.c:169
+#: ../gnome-spell/dictionary.c:213
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../gnome-spell/dictionary.c:214
+msgid "Hiligaynon"
+msgstr "Hiligaynon"
+
+#: ../gnome-spell/dictionary.c:215
+msgid "Hiri Motu"
+msgstr "Hirimotu"
+
+#: ../gnome-spell/dictionary.c:216
+msgid "Croatian"
+msgstr "Kroatiska"
+
+#: ../gnome-spell/dictionary.c:217
+msgid "Upper Sorbian"
+msgstr "Övre sorbiska"
+
+#: ../gnome-spell/dictionary.c:218
+msgid "Haitian Creole"
+msgstr "Haitisk kreol"
+
+#: ../gnome-spell/dictionary.c:219
 msgid "Hungarian"
-msgstr ""
+msgstr "Ungerska"
 
-#: gnome-spell/dictionary.c:170
+#: ../gnome-spell/dictionary.c:220
+msgid "Armenian"
+msgstr "Armeniska"
+
+#: ../gnome-spell/dictionary.c:221
+msgid "Herero"
+msgstr "Herero"
+
+#: ../gnome-spell/dictionary.c:222
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: ../gnome-spell/dictionary.c:223
+msgid "Iban"
+msgstr "Iban"
+
+#: ../gnome-spell/dictionary.c:224
+msgid "Indonesian"
+msgstr "Indonesiska"
+
+#: ../gnome-spell/dictionary.c:225
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../gnome-spell/dictionary.c:226
+msgid "Sichuan Yi"
+msgstr "Sichuan Yi"
+
+#: ../gnome-spell/dictionary.c:227
+msgid "Iloko"
+msgstr "Iloko"
+
+#: ../gnome-spell/dictionary.c:228
+msgid "Ido"
+msgstr "Ido"
+
+#: ../gnome-spell/dictionary.c:229
+msgid "Icelandic"
+msgstr "Isländska"
+
+#: ../gnome-spell/dictionary.c:230
 msgid "Italian"
 msgstr "Italienska"
 
-#: gnome-spell/dictionary.c:171
-msgid "Icelandic"
-msgstr ""
+#: ../gnome-spell/dictionary.c:231
+msgid "Japanese"
+msgstr "Japanska"
 
-#: gnome-spell/dictionary.c:172
+#: ../gnome-spell/dictionary.c:232
+msgid "Javanese"
+msgstr "Javanska"
+
+#: ../gnome-spell/dictionary.c:233
+msgid "Georgian"
+msgstr "Georgiska"
+
+#: ../gnome-spell/dictionary.c:234
+msgid "Kachin"
+msgstr "Kachin"
+
+#: ../gnome-spell/dictionary.c:235
+msgid "Kongo"
+msgstr "Kikongo"
+
+#: ../gnome-spell/dictionary.c:236
+msgid "Khasi"
+msgstr "Khasi"
+
+#: ../gnome-spell/dictionary.c:237
+msgid "Kikuyu"
+msgstr "Kikuyu"
+
+#: ../gnome-spell/dictionary.c:238
+msgid "Kwanyama"
+msgstr "Kwanyama"
+
+#: ../gnome-spell/dictionary.c:239
+msgid "Kazakh"
+msgstr "Kazakiska"
+
+#: ../gnome-spell/dictionary.c:240
+msgid "Kalaallisut / Greenlandic"
+msgstr "Grönländska"
+
+#: ../gnome-spell/dictionary.c:241
+msgid "Khmer"
+msgstr "Kambodjanska"
+
+#: ../gnome-spell/dictionary.c:242
+msgid "Kannada"
+msgstr "Kanaresiska"
+
+#: ../gnome-spell/dictionary.c:243
+msgid "Korean"
+msgstr "Koreanska"
+
+#: ../gnome-spell/dictionary.c:244
+msgid "Konkani"
+msgstr "Konkani"
+
+#: ../gnome-spell/dictionary.c:245
+msgid "Kanuri"
+msgstr "Kanuri"
+
+#: ../gnome-spell/dictionary.c:246
+msgid "Kashmiri"
+msgstr "Kashmiri"
+
+#: ../gnome-spell/dictionary.c:247
+msgid "Kurdish"
+msgstr "Kurdiska"
+
+#: ../gnome-spell/dictionary.c:248
+msgid "Komi"
+msgstr "Komi"
+
+#: ../gnome-spell/dictionary.c:249
+msgid "Cornish"
+msgstr "Korniska"
+
+#: ../gnome-spell/dictionary.c:250
+msgid "Kirghiz"
+msgstr "Kirgisiska"
+
+#: ../gnome-spell/dictionary.c:251
 msgid "Latin"
-msgstr ""
+msgstr "Latin"
 
-#: gnome-spell/dictionary.c:173
+#: ../gnome-spell/dictionary.c:252
+msgid "Luxembourgish"
+msgstr "Luxemburgiska"
+
+#: ../gnome-spell/dictionary.c:253
+msgid "Ganda"
+msgstr "Luganda"
+
+#: ../gnome-spell/dictionary.c:254
+msgid "Limburgian"
+msgstr "Limburgisch"
+
+#: ../gnome-spell/dictionary.c:255
+msgid "Lingala"
+msgstr "Lingala"
+
+#: ../gnome-spell/dictionary.c:256
+msgid "Lao"
+msgstr "Laotiska"
+
+#: ../gnome-spell/dictionary.c:257
+msgid "Lozi"
+msgstr "Lozi"
+
+#: ../gnome-spell/dictionary.c:258
 msgid "Lithuanian"
-msgstr ""
+msgstr "Litauiska"
 
-#: gnome-spell/dictionary.c:174
-#, fuzzy
+#: ../gnome-spell/dictionary.c:259
+msgid "Luba-Katanga"
+msgstr "Luba-Katanga"
+
+#: ../gnome-spell/dictionary.c:260
+msgid "Luo"
+msgstr "Luo"
+
+#: ../gnome-spell/dictionary.c:261
+msgid "Latvian"
+msgstr "Lettiska"
+
+#: ../gnome-spell/dictionary.c:262
+msgid "Malagasy"
+msgstr "Malagasy"
+
+#: ../gnome-spell/dictionary.c:263
+msgid "Marshallese"
+msgstr "Marshallesiska"
+
+#: ../gnome-spell/dictionary.c:264
+msgid "Maori"
+msgstr "Maori"
+
+#: ../gnome-spell/dictionary.c:265
+msgid "Minangkabau"
+msgstr "Minangkabau"
+
+#: ../gnome-spell/dictionary.c:266
+msgid "Macedonian"
+msgstr "Makedonska"
+
+#: ../gnome-spell/dictionary.c:267
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../gnome-spell/dictionary.c:268
+msgid "Mongolian"
+msgstr "Mongoliskt språk"
+
+#: ../gnome-spell/dictionary.c:269
+msgid "Moldavian"
+msgstr "Moldaviska"
+
+#: ../gnome-spell/dictionary.c:270
+msgid "Marathi"
+msgstr "Marathi"
+
+#: ../gnome-spell/dictionary.c:271
+msgid "Malay"
+msgstr "Malajiska"
+
+#: ../gnome-spell/dictionary.c:272
+msgid "Maltese"
+msgstr "Maltesiska"
+
+#: ../gnome-spell/dictionary.c:273
+msgid "Burmese"
+msgstr "Burmanska"
+
+#: ../gnome-spell/dictionary.c:274
 msgid "Norwegian (Bokmal)"
-msgstr "Norska"
+msgstr "Norska (Bokmål)"
 
-#: gnome-spell/dictionary.c:175
+#: ../gnome-spell/dictionary.c:275
+msgid "North Ndebele"
+msgstr "Ndebele (nord)"
+
+#: ../gnome-spell/dictionary.c:276
+msgid "Low Saxon"
+msgstr "Lågsachsiska"
+
+#: ../gnome-spell/dictionary.c:277
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../gnome-spell/dictionary.c:278
+msgid "Ndonga"
+msgstr "Ndonga"
+
+#: ../gnome-spell/dictionary.c:279
+msgid "Niuean"
+msgstr "Niuean"
+
+#: ../gnome-spell/dictionary.c:280
 msgid "Dutch"
 msgstr "Holländska"
 
-#: gnome-spell/dictionary.c:176
-#, fuzzy
+#: ../gnome-spell/dictionary.c:281
 msgid "Norwegian (Nyorsk)"
-msgstr "Norska"
+msgstr "Norska (Nynorsk)"
 
-#: gnome-spell/dictionary.c:177
+#: ../gnome-spell/dictionary.c:282
 msgid "Norwegian"
 msgstr "Norska"
 
-#: gnome-spell/dictionary.c:178
+#: ../gnome-spell/dictionary.c:283
+msgid "South Ndebele"
+msgstr "Ndebele (syd)"
+
+#: ../gnome-spell/dictionary.c:284
+msgid "Northern Sotho"
+msgstr "Nordsotho"
+
+#: ../gnome-spell/dictionary.c:285
+msgid "Navajo"
+msgstr "Navaho"
+
+#: ../gnome-spell/dictionary.c:286
+msgid "Nyanja/Chichewa"
+msgstr "Nyanja/Chichewa"
+
+# DN: Kallas även "Langue d'oc" men Occitanska är den moderna varianten
+#: ../gnome-spell/dictionary.c:287
+msgid "Occitan"
+msgstr "Occitanska"
+
+#: ../gnome-spell/dictionary.c:288
+msgid "Oromo"
+msgstr "Oromo"
+
+#: ../gnome-spell/dictionary.c:289
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../gnome-spell/dictionary.c:290
+msgid "Ossetic"
+msgstr "Ossetiska"
+
+#: ../gnome-spell/dictionary.c:291
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../gnome-spell/dictionary.c:292
+msgid "Pampanga"
+msgstr "Pampanga"
+
+#: ../gnome-spell/dictionary.c:293
+msgid "Papiamento"
+msgstr "Papiamento"
+
+#: ../gnome-spell/dictionary.c:294
 msgid "Polish"
 msgstr "Polska"
 
-#: gnome-spell/dictionary.c:179
+#: ../gnome-spell/dictionary.c:295
+msgid "Pushto"
+msgstr "Pashto"
+
+#: ../gnome-spell/dictionary.c:296
 msgid "Portuguese (Portugal)"
 msgstr "Portugisiska (Portugal)"
 
-#: gnome-spell/dictionary.c:180
+#: ../gnome-spell/dictionary.c:297
 msgid "Portuguese (Brazilian)"
 msgstr "Portugisiska (brasiliansk)"
 
-#: gnome-spell/dictionary.c:181
+#: ../gnome-spell/dictionary.c:298
+msgid "Quechua"
+msgstr "Quechua"
+
+#: ../gnome-spell/dictionary.c:299
+msgid "Rarotongan"
+msgstr "Rarotongan"
+
+#: ../gnome-spell/dictionary.c:300
+msgid "Rundi"
+msgstr "Rundi"
+
+#: ../gnome-spell/dictionary.c:301
 msgid "Romanian"
-msgstr ""
+msgstr "Rumänska"
 
-#: gnome-spell/dictionary.c:182
+#: ../gnome-spell/dictionary.c:302
 msgid "Russian"
 msgstr "Ryska"
 
-#: gnome-spell/dictionary.c:183
-#, fuzzy
+#: ../gnome-spell/dictionary.c:303
+msgid "Kinyarwanda"
+msgstr "Rwanda"
+
+#: ../gnome-spell/dictionary.c:304
 msgid "Sardinian"
-msgstr "Ukrainska"
+msgstr "Sardinska"
 
-#: gnome-spell/dictionary.c:184
+#: ../gnome-spell/dictionary.c:305
+msgid "Sindhi"
+msgstr "Sindhi"
+
+#: ../gnome-spell/dictionary.c:306
+msgid "Northern Sami"
+msgstr "Nordsamiska"
+
+#: ../gnome-spell/dictionary.c:307
+msgid "Sango"
+msgstr "Sango"
+
+#: ../gnome-spell/dictionary.c:308
+msgid "Sinhalese"
+msgstr "Singalesiska"
+
+#: ../gnome-spell/dictionary.c:309
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: gnome-spell/dictionary.c:185
-#, fuzzy
+#: ../gnome-spell/dictionary.c:310
 msgid "Slovenian"
-msgstr "Slovakiska"
+msgstr "Slovenska"
 
-#: gnome-spell/dictionary.c:186
+#: ../gnome-spell/dictionary.c:311
+msgid "Samoan"
+msgstr "Samoanska"
+
+#: ../gnome-spell/dictionary.c:312
+msgid "Shona"
+msgstr "Shona"
+
+#: ../gnome-spell/dictionary.c:313
+msgid "Somali"
+msgstr "Somali"
+
+#: ../gnome-spell/dictionary.c:314
+msgid "Albanian"
+msgstr "Albanska"
+
+#: ../gnome-spell/dictionary.c:315
+msgid "Serbian"
+msgstr "Serbiska"
+
+#: ../gnome-spell/dictionary.c:316
+msgid "Swati"
+msgstr "Swati"
+
+#: ../gnome-spell/dictionary.c:317
+msgid "Southern Sotho"
+msgstr "Sydsotho"
+
+#: ../gnome-spell/dictionary.c:318
+msgid "Sundanese"
+msgstr "Sundanesiska"
+
+#: ../gnome-spell/dictionary.c:319
 msgid "Swedish"
 msgstr "Svenska"
 
-#: gnome-spell/dictionary.c:187
+#: ../gnome-spell/dictionary.c:320
+msgid "Swahili"
+msgstr "Swahili"
+
+#: ../gnome-spell/dictionary.c:321
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../gnome-spell/dictionary.c:322
+msgid "Telugu"
+msgstr "Telugo"
+
+#: ../gnome-spell/dictionary.c:323
+msgid "Tetum"
+msgstr "Tetum"
+
+#: ../gnome-spell/dictionary.c:324
+msgid "Tajik"
+msgstr "Tadzjikiska"
+
+#: ../gnome-spell/dictionary.c:325
+msgid "Thai"
+msgstr "Thailändska"
+
+#: ../gnome-spell/dictionary.c:326
+msgid "Tigrinya"
+msgstr "Tigrinja"
+
+#: ../gnome-spell/dictionary.c:327
+msgid "Turkmen"
+msgstr "Turkmeniska"
+
+#: ../gnome-spell/dictionary.c:328
+msgid "Tokelau"
+msgstr "Tokelauiska"
+
+#: ../gnome-spell/dictionary.c:329
+msgid "Tagalog"
+msgstr "Tagalog"
+
+#: ../gnome-spell/dictionary.c:330
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../gnome-spell/dictionary.c:331
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../gnome-spell/dictionary.c:332
+msgid "Tok Pisin"
+msgstr "Tok Pisin"
+
+#: ../gnome-spell/dictionary.c:333
 msgid "Turkish"
-msgstr ""
+msgstr "Turkiska"
 
-#: gnome-spell/dictionary.c:188
+#: ../gnome-spell/dictionary.c:334
+msgid "Tsonga"
+msgstr "Tsonga"
+
+#: ../gnome-spell/dictionary.c:335
+msgid "Tatar"
+msgstr "Tatariska"
+
+#: ../gnome-spell/dictionary.c:336
+msgid "Twi"
+msgstr "Twi"
+
+#: ../gnome-spell/dictionary.c:337
+msgid "Tahitian"
+msgstr "Tahitiska"
+
+#: ../gnome-spell/dictionary.c:338
+msgid "Uighur"
+msgstr "Uiguriska"
+
+#: ../gnome-spell/dictionary.c:339
 msgid "Ukrainian"
 msgstr "Ukrainska"
 
-#: gnome-spell/dictionary.c:189
+#: ../gnome-spell/dictionary.c:340
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../gnome-spell/dictionary.c:341
+msgid "Uzbek"
+msgstr "Uzbekiska"
+
+#: ../gnome-spell/dictionary.c:342
+msgid "Venda"
+msgstr "Venda"
+
+#: ../gnome-spell/dictionary.c:343
+msgid "Vietnamese"
+msgstr "Vietnamesiska"
+
+#: ../gnome-spell/dictionary.c:344
+msgid "Walloon"
+msgstr "Vallonska"
+
+#: ../gnome-spell/dictionary.c:345
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../gnome-spell/dictionary.c:346
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../gnome-spell/dictionary.c:347
 msgid "Yiddish"
-msgstr ""
+msgstr "Jiddisch"
 
-#: gnome-spell/spell-checker.glade.h:1
+#: ../gnome-spell/dictionary.c:348
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../gnome-spell/dictionary.c:349
+msgid "Zhuang"
+msgstr "Zhuang"
+
+#: ../gnome-spell/dictionary.c:350
+msgid "Chinese"
+msgstr "Kinesiska"
+
+#: ../gnome-spell/dictionary.c:351
+msgid "Zulu"
+msgstr "Zulu"
+
+#: ../gnome-spell/spell-checker.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: gnome-spell/spell-checker.glade.h:2
+#: ../gnome-spell/spell-checker.glade.h:2
 msgid "Add to dictionary"
 msgstr "_Lägg till i ordboken"
 
-#: gnome-spell/spell-checker.glade.h:3
+#: ../gnome-spell/spell-checker.glade.h:3
 msgid "Checked word"
 msgstr "Kontrollerat ord"
 
-#: gnome-spell/spell-checker.glade.h:4
+#: ../gnome-spell/spell-checker.glade.h:4
 msgid "D_ictionaries"
 msgstr "_Ordböcker"
 
-#: gnome-spell/spell-checker.glade.h:5
+#: ../gnome-spell/spell-checker.glade.h:5
 msgid "Describe _all"
 msgstr "Beskriv _alla"
 
-#: gnome-spell/spell-checker.glade.h:6
+#: ../gnome-spell/spell-checker.glade.h:6
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: gnome-spell/spell-checker.glade.h:7
+#: ../gnome-spell/spell-checker.glade.h:7
 msgid "Remember"
 msgstr "Kom ihåg"
 
 # src/dialogs.c:575 src/menus.c:362
-#: gnome-spell/spell-checker.glade.h:8
+#: ../gnome-spell/spell-checker.glade.h:8
 msgid "Replace"
 msgstr "Ersätt"
 
-#: gnome-spell/spell-checker.glade.h:10
+#: ../gnome-spell/spell-checker.glade.h:10
 msgid "_Add word"
 msgstr "_Lägg till ord"
 
-#: gnome-spell/spell-checker.glade.h:11
+#: ../gnome-spell/spell-checker.glade.h:11
 msgid "_Back"
 msgstr "_Bakåt"
 
-#: gnome-spell/spell-checker.glade.h:12
+#: ../gnome-spell/spell-checker.glade.h:12
 msgid "_Describe"
 msgstr "_Beskriv"
 
-#: gnome-spell/spell-checker.glade.h:13
+#: ../gnome-spell/spell-checker.glade.h:13
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: gnome-spell/spell-checker.glade.h:14
+#: ../gnome-spell/spell-checker.glade.h:14
 msgid "_Ignore"
 msgstr "_Ignorera"
 
 # src/dialogs.c:575 src/menus.c:362
-#: gnome-spell/spell-checker.glade.h:15
+#: ../gnome-spell/spell-checker.glade.h:15
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: gnome-spell/spell-checker.glade.h:16
+#: ../gnome-spell/spell-checker.glade.h:16
 msgid "_Skip"
 msgstr "_Hoppa över"
 
-#: gnome-spell/test-spell.c:39
+#: ../gnome-spell/test-spell.c:39
 msgid "I could not initialize Bonobo"
 msgstr "Jag kunde inte initiera Bonobo"
 
 #~ msgid "Choose color"
 #~ msgstr "Välj färg"
-
 #~ msgid "Colors"
 #~ msgstr "Färger"
-
 #~ msgid "Language"
 #~ msgstr "Språk"
-
 #~ msgid "misspelling underline color"
 #~ msgstr "understrykningsfärg för felstavning"
-
 #~ msgid "en"
 #~ msgstr "sv"
-
 #~ msgid "Languages"
 #~ msgstr "Språk"
-
 #~ msgid "_Add to dictionary"
 #~ msgstr "_Lägg till i ordboken"
-
 #~ msgid "Add word"
 #~ msgstr "Lägg till ord"
-
 #~ msgid "Back"
 #~ msgstr "Bakåt"
-
-#~ msgid "German"
-#~ msgstr "Tyska"
-
 #~ msgid "English"
 #~ msgstr "Engelska"
-
 #~ msgid "French"
 #~ msgstr "Franska"
-
 #~ msgid "Portuguese"
 #~ msgstr "Portugisiska"
+
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/po/vi.po gnome-spell-1.0.8/po/vi.po
--- gnome-spell-1.0.7/po/vi.po	2006-02-08 11:22:23.000000000 +0000
+++ gnome-spell-1.0.8/po/vi.po	2007-01-01 22:18:09.000000000 +0000
@@ -647,7 +647,7 @@
 
 #:../gnome-spell/dictionary.c:303
 msgid "Kinyarwanda"
-msgstr "Ki-nia-ouănh-đa"
+msgstr "Ki-nia-ouăn-đa"
 
 #:../gnome-spell/dictionary.c:304
 msgid "Sardinian"
diff -Nru -x '*.gmo' -x '*.mo' --speed-large-files --minimal gnome-spell-1.0.7/README gnome-spell-1.0.8/README
--- gnome-spell-1.0.7/README	2001-10-08 18:57:45.000000000 +0000
+++ gnome-spell-1.0.8/README	2007-10-15 12:21:52.000000000 +0000
@@ -9,19 +9,19 @@
 Dictionary object could be used for live spell checking. Look in test-spell.c or
 in gtkhtml/components/html-editor/spell.c for sample usage.
 
-In future it will be expanded by implementation of GNOME::Spell::Checker object (see
+In the future it will be expanded by implementation of GNOME::Spell::Checker object (see
 also Spell.idl) and also by spell checking dialog control with appropriate interface.
 
 Pspell build
 ------------
 
-From my experience with pspell I recommend you to build pspell/aspell this way:
+From my experience with pspell I recommend you build pspell/aspell this way:
 
 	1) build and install pspell
 	2) build and install aspell
 	4) build and install GNOME Spell
 
-You could get Pspell and Aspell from:
+You can get Pspell and Aspell from:
 
 	http://pspell.sourceforge.net/
 	http://aspell.sourceforge.net/
@@ -29,6 +29,6 @@
 End
 ---
 
-I hope you will find the GNOME Spell usefull.
+I hope you will find GNOME Spell useful.
 
 Radek Doulik <rodo@ximian.com>
