From 9459938a37ab0efb0eead32190570f1218fc578f Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 4 Feb 2004 04:48:13 +0000
Subject: [PATCH] update

svn: r2768
---
 gramps2/ChangeLog                     |   5 +
 gramps2/configure                     | 693 ++++++++++-------------
 gramps2/doc/gramps-manual/Makefile.in | 171 ++++--
 gramps2/gramps-mdk.spec               |   4 +-
 gramps2/gramps.spec                   |   4 +-
 gramps2/src/po/template.po            | 782 +++++++++++++-------------
 6 files changed, 821 insertions(+), 838 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 6083549e8..3b358b4e0 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/FamilyView.py: new text string for "unknown" spouse
+	* src/ImageSelect.py: integer conversions for event.x, event.y
+	* src/const.py.in: copyright date update
+
 2004-02-03  Michel Guitel  <michel.guitel@free.fr>
 	* doc/gramps-manual/fr/filtref.xml: Update.
 	* doc/gramps-manual/fr/mainwin.xml: Update.
diff --git a/gramps2/configure b/gramps2/configure
index 7f31001ee..9d651e191 100755
--- a/gramps2/configure
+++ b/gramps2/configure
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gramps 0.99.
+# Generated by GNU Autoconf 2.57 for gramps 0.99.
 #
 # Report bugs to <gramps-bugs@lists.sourceforge.net>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -21,10 +22,9 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -43,7 +43,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -220,17 +220,16 @@ rm -f conf$$ conf$$.exe conf$$.file
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # 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'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
 # IFS
@@ -274,7 +273,7 @@ PACKAGE_STRING='gramps 0.99'
 PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net'
 
 ac_unique_file="src/gramps.py"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT MSGCONV ICONV LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB 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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot RELEASE VERSIONSTRING MSGFMT MSGCONV ICONV LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH ZIP 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 HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -633,7 +632,7 @@ done
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -673,10 +672,10 @@ if test -z "$srcdir"; then
   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -764,9 +763,9 @@ _ACEOF
   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -856,45 +855,12 @@ case $srcdir in
     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
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -905,13 +871,13 @@ esac
       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
+           test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -919,9 +885,10 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 gramps configure 0.99
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.57
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -933,7 +900,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by gramps $as_me 0.99, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
@@ -1010,19 +977,19 @@ do
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
+        ac_must_keep_next=false # Got value, back to normal.
       else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1056,12 +1023,12 @@ _ASBOX
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *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"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 }
@@ -1090,7 +1057,7 @@ _ASBOX
       for ac_var in $ac_subst_files
       do
 	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+        echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1109,7 +1076,7 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
+  rm -f core core.* *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1189,7 +1156,7 @@ fi
 # 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
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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"
@@ -1206,13 +1173,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+        ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -1269,7 +1236,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version="1.6"
+am__api_version="1.7"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1306,7 +1273,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # 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
@@ -1323,7 +1289,6 @@ do
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1331,20 +1296,20 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $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.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
       done
     done
     ;;
@@ -1488,7 +1453,7 @@ 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_,'`
+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 $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1515,6 +1480,15 @@ echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+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
@@ -1523,9 +1497,19 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
    { (exit 1); exit 1; }; }
 fi
 
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
 # Define the identity of the package.
- PACKAGE=gramps
- VERSION=0.99
+ PACKAGE='gramps'
+ VERSION='0.99'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1830,7 +1814,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do
+	for am_cv_pathless_PYTHON in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do
           if test "$am_cv_pathless_PYTHON" = : ; then
             { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
 echo "$as_me: error: no suitable Python interpreter found" >&2;}
@@ -1933,16 +1917,34 @@ echo "${ECHO_T}$am_cv_python_platform" >&6
 
 
 
-
-  pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
+                echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6
+if test "${am_cv_python_pythondir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+fi
+echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+echo "${ECHO_T}$am_cv_python_pythondir" >&6
+  pythondir=$am_cv_python_pythondir
 
 
 
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-
-  pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
+            echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6
+if test "${am_cv_python_pyexecdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+fi
+echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+  pyexecdir=$am_cv_python_pyexecdir
 
 
 
@@ -2370,6 +2372,7 @@ ac_compiler=`set X $ac_compile; echo $2`
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2389,8 +2392,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $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
@@ -2410,23 +2413,23 @@ 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.
-	;;
+        # This is the source file.
+        ;;
     [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
+        # 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
-	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
+        break;;
     * )
-	break;;
+        break;;
   esac
 done
 else
@@ -2500,8 +2503,8 @@ for ac_file in conftest.exe conftest conftest.*; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
+          export ac_cv_exeext
+          break;;
     * ) break;;
   esac
 done
@@ -2526,6 +2529,7 @@ if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2576,6 +2580,7 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2595,20 +2600,11 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2621,7 +2617,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2637,6 +2633,7 @@ if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2653,20 +2650,11 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2679,7 +2667,7 @@ 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 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
@@ -2706,6 +2694,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2733,16 +2722,6 @@ static char *f (char * (*g) (char **, int), char **p, ...)
   va_end (v);
   return s;
 }
-
-/* 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
-   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.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2769,20 +2748,11 @@ 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
+  (eval $ac_compile) 2>&5
   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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2795,7 +2765,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
@@ -2823,27 +2793,19 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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'
+         { 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 \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    '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 ();' \
@@ -2851,13 +2813,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -2868,20 +2831,11 @@ exit (42);
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2894,8 +2848,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2912,20 +2867,11 @@ exit (42);
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   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'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2937,7 +2883,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2951,30 +2897,22 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 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
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR="${am__leading_dot}deps"
 
           ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.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
@@ -2989,7 +2927,7 @@ echo "include confinc" > confmf
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -3049,18 +2987,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -3078,13 +3030,20 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       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/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
-      am_cv_CC_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -3101,6 +3060,18 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
 
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
@@ -3426,13 +3397,13 @@ _ACEOF
       # `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"
+        "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"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } |
@@ -3462,13 +3433,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # 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[	 ]*=/{
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
 s/:*\$(srcdir):*/:/;
 s/:*\${srcdir}:*/:/;
 s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
+s/^\([^=]*=[ 	]*\):*/\1/;
 s/:*$//;
-s/^[^=]*=[	 ]*$//;
+s/^[^=]*=[ 	]*$//;
 }'
 fi
 
@@ -3482,13 +3453,13 @@ fi
 cat >confdef2opt.sed <<\_ACEOF
 t clear
 : clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
 t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
 t quote
 d
 : quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
 s,\[,\\&,g
 s,\],\\&,g
 s,\$,$$,g
@@ -3510,7 +3481,7 @@ 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$//'`
+         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'
@@ -3527,6 +3498,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+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
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -3561,10 +3539,9 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -3583,7 +3560,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -3762,17 +3739,16 @@ rm -f conf$$ conf$$.exe conf$$.file
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # 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'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
 # IFS
@@ -3799,7 +3775,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by gramps $as_me 0.99, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3843,7 +3819,7 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -3857,10 +3833,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 gramps config.status 0.99
-configured by $0, generated by GNU Autoconf 2.59,
+configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+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
@@ -4074,6 +4051,7 @@ s,@LIBS@,$LIBS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
 s,@ACLOCAL@,$ACLOCAL,;t t
@@ -4088,6 +4066,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
 s,@RELEASE@,$RELEASE,;t t
 s,@VERSIONSTRING@,$VERSIONSTRING,;t t
 s,@MSGFMT@,$MSGFMT,;t t
@@ -4121,6 +4100,8 @@ 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,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
 s,@PYTHON_CPPFLAGS@,$PYTHON_CPPFLAGS,;t t
 s,@SK_CONFIG@,$SK_CONFIG,;t t
@@ -4160,9 +4141,9 @@ _ACEOF
       (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"
+  	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"
+  	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
@@ -4180,21 +4161,21 @@ 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,:.*,,'` ;;
+        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=`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
   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 ||
+         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; }
@@ -4210,10 +4191,10 @@ echo X"$ac_file" |
       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 ||
+         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; }
@@ -4251,45 +4232,12 @@ case $srcdir in
     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
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
 
   case $INSTALL in
@@ -4297,6 +4245,11 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  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.  */
@@ -4306,7 +4259,7 @@ esac
     configure_input="$ac_file.  "
   fi
   configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -4315,32 +4268,26 @@ esac
       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
+         # 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";;
+         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
+         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;;
+         fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@ -4380,41 +4327,16 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   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 ||
+         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
@@ -4440,45 +4362,12 @@ case $srcdir in
     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
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
 
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -4496,10 +4385,10 @@ echo "$as_me: executing $ac_dest commands" >&6;}
   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`(dirname "$mf") 2>/dev/null ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$mf" : 'X\(//\)[^/]' \| \
+         X"$mf" : 'X\(//\)$' \| \
+         X"$mf" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -4535,10 +4424,10 @@ echo X"$mf" |
     test -f "$dirpart/$file" && continue
     fdir=`(dirname "$file") 2>/dev/null ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$file" : 'X\(//\)[^/]' \| \
+         X"$file" : 'X\(//\)$' \| \
+         X"$file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -4554,10 +4443,10 @@ echo X"$file" |
       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 ||
+         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; }
diff --git a/gramps2/doc/gramps-manual/Makefile.in b/gramps2/doc/gramps-manual/Makefile.in
index 8e97f5176..3095568a1 100644
--- a/gramps2/doc/gramps-manual/Makefile.in
+++ b/gramps2/doc/gramps-manual/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.8 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,73 +15,75 @@
 @SET_MAKE@
 
 # Process this file with automake to produce Makefile.in
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINSH = @BINSH@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 ICONV = @ICONV@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LANGUAGES = @LANGUAGES@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 MSGCONV = @MSGCONV@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
 PYTHON = @PYTHON@
 PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -91,30 +93,57 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RELEASE = @RELEASE@
 SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 
 SUBDIRS = C fr ru
 subdir = doc/gramps-manual
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
@@ -180,10 +209,17 @@ tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ETAGS = etags
 ETAGSFLAGS =
 
+CTAGS = ctags
+CTAGSFLAGS =
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -199,9 +235,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -214,20 +256,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@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; \
 	  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 \
@@ -285,7 +348,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -295,7 +358,7 @@ clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -317,31 +380,39 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive distclean distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-recursive ctags ctags-recursive distclean \
+	distclean-generic distclean-recursive distclean-tags distdir \
+	dvi dvi-am dvi-recursive info info-am info-recursive install \
+	install-am install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
 	install-info install-info-am install-info-recursive install-man \
 	install-recursive install-strip installcheck installcheck-am \
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive tags tags-recursive uninstall \
-	uninstall-am uninstall-info-am uninstall-info-recursive \
-	uninstall-recursive
+	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+	ps-recursive tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
 # 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 --git a/gramps2/gramps-mdk.spec b/gramps2/gramps-mdk.spec
index a6dd8e5be..02cf01b73 100644
--- a/gramps2/gramps-mdk.spec
+++ b/gramps2/gramps-mdk.spec
@@ -1,5 +1,5 @@
-%define ver      1.0.0
-%define rel      0.CVS20040127
+%define ver      0.99
+%define rel      1
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec
index 0780ebfa5..f33621bfe 100644
--- a/gramps2/gramps.spec
+++ b/gramps2/gramps.spec
@@ -1,5 +1,5 @@
-%define ver      1.0.0
-%define rel      0.CVS20040127
+%define ver      0.99
+%define rel      1
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po
index 0ffd66c88..c84718916 100644
--- a/gramps2/src/po/template.po
+++ b/gramps2/src/po/template.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GRAMPS VERSION\n"
-"POT-Creation-Date: Mon Jan 19 14:10:17 2004\n"
+"POT-Creation-Date: Tue Feb  3 21:41:23 2004\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,9 +29,9 @@ msgstr ""
 
 #: AddSpouse.py:90 ChooseParents.py:57 EditPerson.py:250 FamilyView.py:208
 #: PeopleStore.py:58 SelectChild.py:120 SelectPerson.py:74 gramps_main.py:103
-#: plugins/BookReport.py:612 plugins/FilterEditor.py:315
+#: plugins/BookReport.py:612 plugins/FilterEditor.py:316
 #: plugins/IndivComplete.py:394 plugins/IndivSummary.py:232
-#: plugins/PatchNames.py:145 plugins/RelCalc.py:86 plugins/TimeLine.py:378
+#: plugins/PatchNames.py:145 plugins/RelCalc.py:87 plugins/TimeLine.py:378
 #: plugins/WebPage.py:322
 msgid "Name"
 msgstr ""
@@ -40,7 +40,7 @@ msgstr ""
 #: MediaView.py:77 PeopleStore.py:58 PlaceView.py:62 SelectChild.py:120
 #: SelectObject.py:86 SelectPerson.py:74 SourceView.py:70 Sources.py:79
 #: Sources.py:175 Witness.py:57 gramps_main.py:103 plugins/PatchNames.py:136
-#: plugins/RelCalc.py:86
+#: plugins/RelCalc.py:87
 msgid "ID"
 msgstr ""
 
@@ -57,12 +57,12 @@ msgstr ""
 msgid "Choose Spouse/Partner"
 msgstr ""
 
-#: AddSpouse.py:116 const.py:493 const.py:501 plugins/FamilyGroup.py:304
-#: plugins/FamilyGroup.py:306
+#: AddSpouse.py:116 const.py:424 const.py:432 plugins/FamilyGroup.py:306
+#: plugins/FamilyGroup.py:308
 msgid "Married"
 msgstr ""
 
-#: AddSpouse.py:228 const.py:495 const.py:503
+#: AddSpouse.py:228 const.py:426 const.py:434
 msgid "Partners"
 msgstr ""
 
@@ -225,10 +225,10 @@ msgid "Choose Parents"
 msgstr ""
 
 #: ChooseParents.py:129 ChooseParents.py:130 ChooseParents.py:520
-#: ChooseParents.py:521 SelectChild.py:116 SelectChild.py:118 const.py:170
+#: ChooseParents.py:521 SelectChild.py:116 SelectChild.py:118 const.py:171
 #: gramps.glade:4521 gramps.glade:4714 gramps.glade:5154 gramps.glade:5334
 #: gramps.glade:6957 gramps.glade:7203 gramps.glade:7811 gramps.glade:7982
-#: plugins/EventCmp.py:308 plugins/FamilyGroup.py:153 plugins/GraphViz.py:398
+#: plugins/EventCmp.py:308 plugins/FamilyGroup.py:155 plugins/GraphViz.py:398
 #: plugins/GraphViz.py:399
 msgid "Birth"
 msgstr ""
@@ -261,14 +261,14 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: ChooseParents.py:540 FamilyView.py:840 plugins/FamilyGroup.py:212
+#: ChooseParents.py:540 FamilyView.py:882 plugins/FamilyGroup.py:214
 #: plugins/IndivComplete.py:213 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:434 plugins/IndivSummary.py:293
 #: plugins/WebPage.py:341 plugins/WebPage.py:344
 msgid "Mother"
 msgstr ""
 
-#: ChooseParents.py:541 FamilyView.py:839 plugins/FamilyGroup.py:199
+#: ChooseParents.py:541 FamilyView.py:881 plugins/FamilyGroup.py:201
 #: plugins/IndivComplete.py:205 plugins/IndivComplete.py:207
 #: plugins/IndivComplete.py:429 plugins/IndivSummary.py:279
 #: plugins/WebPage.py:340 plugins/WebPage.py:343
@@ -321,7 +321,7 @@ msgstr ""
 msgid "Edit Person"
 msgstr ""
 
-#: EditPerson.py:230 EditPerson.py:256 EditPlace.py:109 const.py:393
+#: EditPerson.py:230 EditPerson.py:256 EditPlace.py:109 const.py:368
 #: plugins/pafexport.glade:217
 msgid "Description"
 msgstr ""
@@ -330,7 +330,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: EditPerson.py:231 EditPerson.py:244 Marriage.py:172 VersionControl.py:117
+#: EditPerson.py:231 EditPerson.py:244 Marriage.py:172 VersionControl.py:118
 #: filters/After.py:55 filters/Before.py:55
 msgid "Date"
 msgstr ""
@@ -342,7 +342,7 @@ msgstr ""
 
 #: EditPerson.py:238 EditSource.py:191 ImageSelect.py:683 ImageSelect.py:855
 #: ImageSelect.py:951 Marriage.py:173 marriage.glade:888
-#: plugins/FilterEditor.py:315 plugins/PatchNames.py:142
+#: plugins/FilterEditor.py:316 plugins/PatchNames.py:142
 msgid "Value"
 msgstr ""
 
@@ -364,18 +364,18 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: EditPerson.py:475 GrampsCfg.py:73 const.py:175 gramps.glade:4609
+#: EditPerson.py:475 GrampsCfg.py:73 const.py:176 gramps.glade:4609
 #: gramps.glade:4802 gramps.glade:5220 gramps.glade:5400 gramps.glade:7045
 #: gramps.glade:7291 gramps.glade:7877 gramps.glade:8048
 msgid "None"
 msgstr ""
 
-#: EditPerson.py:492 EditSource.py:173
+#: EditPerson.py:492 EditPlace.py:457 EditSource.py:173
 msgid "%(father)s and %(mother)s"
 msgstr ""
 
-#: EditPerson.py:500 choose.glade:218 const.py:140 plugins/Check.py:294
-#: plugins/FamilyGroup.py:657 plugins/IndivComplete.py:275
+#: EditPerson.py:500 choose.glade:218 const.py:141 plugins/Check.py:294
+#: plugins/FamilyGroup.py:659 plugins/IndivComplete.py:275
 #: plugins/IndivSummary.py:172 plugins/WebPage.py:591 select_person.glade:218
 msgid "unknown"
 msgstr ""
@@ -535,127 +535,140 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: FamilyView.py:301 PeopleView.py:384
+#: FamilyView.py:302 FamilyView.py:310 FamilyView.py:331 FamilyView.py:338
+#: FamilyView.py:359 FamilyView.py:368 FamilyView.py:389 FamilyView.py:398
+#: FamilyView.py:438 FamilyView.py:444 FamilyView.py:502 FamilyView.py:508
+#: FamilyView.py:970 FamilyView.py:976 FamilyView.py:1008 FamilyView.py:1014
+#: PedView.py:493 PedView.py:503 PeopleView.py:380 PeopleView.py:393
+#: gramps.glade:781 gramps_main.py:399
+msgid "Home"
+msgstr ""
+
+#: FamilyView.py:303 PeopleView.py:381
 msgid "Add Bookmark"
 msgstr ""
 
-#: FamilyView.py:304 FamilyView.py:325 FamilyView.py:348 FamilyView.py:371
-#: PedView.py:497 PeopleView.py:392
+#: FamilyView.py:306 FamilyView.py:334 FamilyView.py:364 FamilyView.py:394
+#: PedView.py:499 PeopleView.py:389
 msgid "People Menu"
 msgstr ""
 
-#: FamilyView.py:345 FamilyView.py:368 FamilyView.py:940 FamilyView.py:971
+#: FamilyView.py:361 FamilyView.py:391 FamilyView.py:989 FamilyView.py:1027
 msgid "Add parents"
 msgstr ""
 
-#: FamilyView.py:401
+#: FamilyView.py:429
 msgid "Child Menu"
 msgstr ""
 
-#: FamilyView.py:420
+#: FamilyView.py:455
 msgid "Make the selected child an active person"
 msgstr ""
 
-#: FamilyView.py:421 FamilyView.py:939 FamilyView.py:970
+#: FamilyView.py:456 FamilyView.py:988 FamilyView.py:1026
 msgid "Edit the child/parent relationships"
 msgstr ""
 
-#: FamilyView.py:422
+#: FamilyView.py:457
 msgid "Edit the selected child"
 msgstr ""
 
-#: FamilyView.py:423
+#: FamilyView.py:458
 msgid "Remove the selected child"
 msgstr ""
 
-#: FamilyView.py:458
+#: FamilyView.py:493
 msgid "Spouse Menu"
 msgstr ""
 
-#: FamilyView.py:477
+#: FamilyView.py:519
 msgid "Make the selected spouse an active person"
 msgstr ""
 
-#: FamilyView.py:478
+#: FamilyView.py:520
 msgid "Edit relationship"
 msgstr ""
 
-#: FamilyView.py:479
+#: FamilyView.py:521
 msgid "Remove the selected spouse"
 msgstr ""
 
-#: FamilyView.py:480
+#: FamilyView.py:522
 msgid "Edit the selected spouse"
 msgstr ""
 
-#: FamilyView.py:481
+#: FamilyView.py:523
 msgid "Set the selected spouse as the preferred spouse"
 msgstr ""
 
-#: FamilyView.py:682
+#: FamilyView.py:724
 msgid "Remove %s as a spouse of %s?"
 msgstr ""
 
-#: FamilyView.py:683
+#: FamilyView.py:725
 msgid "Removing a spouse removes the relationship between the spouse and the active person. It does not remove the spouse from the database"
 msgstr ""
 
-#: FamilyView.py:686
+#: FamilyView.py:728
 msgid "_Remove Spouse"
 msgstr ""
 
-#: FamilyView.py:856
+#: FamilyView.py:857
+msgid "<double click to add spouse>"
+msgstr ""
+
+#: FamilyView.py:898
 msgid ""
 "%s: %s\n"
 "\tRelationship: %s"
 msgstr ""
 
-#: FamilyView.py:858
+#: FamilyView.py:900
 msgid "%s: unknown"
 msgstr ""
 
-#: FamilyView.py:892 Plugins.py:457 Plugins.py:458 Plugins.py:459
-#: Plugins.py:479 Plugins.py:480 Plugins.py:481 Witness.py:74 const.py:176
-#: const.py:496 const.py:504 gramps.glade:4631 gramps.glade:4824
+#: FamilyView.py:934 Plugins.py:457 Plugins.py:458 Plugins.py:459
+#: Plugins.py:479 Plugins.py:480 Plugins.py:481 Witness.py:74 const.py:177
+#: const.py:427 const.py:435 gramps.glade:4631 gramps.glade:4824
 #: gramps.glade:5242 gramps.glade:5422 gramps.glade:7067 gramps.glade:7313
 #: gramps.glade:7899 gramps.glade:8070 gramps_main.py:1648
 #: plugins/WebPage.py:336
 msgid "Unknown"
 msgstr ""
 
-#: FamilyView.py:919
+#: FamilyView.py:961
 msgid "Parents Menu"
 msgstr ""
 
-#: FamilyView.py:938 FamilyView.py:969
+#: FamilyView.py:987 FamilyView.py:1025
 msgid "Make the selected parents the active family"
 msgstr ""
 
-#: FamilyView.py:941 FamilyView.py:972
+#: FamilyView.py:990 FamilyView.py:1028
 msgid "Remove parents"
 msgstr ""
 
-#: FamilyView.py:950
+#: FamilyView.py:999
 msgid "Spouse Parents Menu"
 msgstr ""
 
-#: FamilyView.py:1034 FamilyView.py:1049
+#: FamilyView.py:1090 FamilyView.py:1105
 msgid "Remove Parents of %s"
 msgstr ""
 
-#: FamilyView.py:1035 FamilyView.py:1050
+#: FamilyView.py:1091 FamilyView.py:1106
 msgid "Removing the parents of a person removes the person as a child of the parents. The parents are not removed from the database, and the relationship between the parents is not removed."
 msgstr ""
 
-#: FamilyView.py:1039 FamilyView.py:1054
+#: FamilyView.py:1095 FamilyView.py:1110
 msgid "_Remove Parents"
 msgstr ""
 
-#: FamilyView.py:1156
+#: FamilyView.py:1212
 msgid "Attempt to Reorder Children Failed"
 msgstr ""
 
-#: FamilyView.py:1157
+#: FamilyView.py:1213
 msgid "Children must be ordered by their birth dates."
 msgstr ""
 
@@ -667,7 +680,7 @@ msgstr ""
 msgid "Qualifier"
 msgstr ""
 
-#: Filter.py:82 GenericFilter.py:103 VersionControl.py:304 rule.glade:1255
+#: Filter.py:82 GenericFilter.py:104 VersionControl.py:305 rule.glade:1255
 msgid "No description"
 msgstr ""
 
@@ -695,351 +708,351 @@ msgstr ""
 msgid "French Republican"
 msgstr ""
 
-#: GenericFilter.py:100
+#: GenericFilter.py:101
 msgid "Miscellaneous filters"
 msgstr ""
 
-#: GenericFilter.py:132 GenericFilter.py:266 GenericFilter.py:285
-#: GenericFilter.py:308 GenericFilter.py:913 GenericFilter.py:1215
+#: GenericFilter.py:133 GenericFilter.py:253 GenericFilter.py:272
+#: GenericFilter.py:295 GenericFilter.py:900 GenericFilter.py:1202
 msgid "General filters"
 msgstr ""
 
-#: GenericFilter.py:135
+#: GenericFilter.py:136
 msgid "Matches everyone in the database"
 msgstr ""
 
-#: GenericFilter.py:149 GenericFilter.py:257 GenericFilter.py:325
-#: GenericFilter.py:415 GenericFilter.py:460 GenericFilter.py:544
-#: GenericFilter.py:589 GenericFilter.py:687 GenericFilter.py:739
-#: GenericFilter.py:830 choose.glade:536 gramps.glade:3370 imagesel.glade:552
+#: GenericFilter.py:150 GenericFilter.py:244 GenericFilter.py:312
+#: GenericFilter.py:402 GenericFilter.py:447 GenericFilter.py:531
+#: GenericFilter.py:576 GenericFilter.py:674 GenericFilter.py:726
+#: GenericFilter.py:817 choose.glade:536 gramps.glade:3370 imagesel.glade:552
 #: imagesel.glade:1409 mergedata.glade:468 mergedata.glade:1060
-#: plugins/FilterEditor.py:460
+#: plugins/FilterEditor.py:461
 msgid "ID:"
 msgstr ""
 
-#: GenericFilter.py:160
+#: GenericFilter.py:161
 msgid "Relationship filters"
 msgstr ""
 
-#: GenericFilter.py:163
+#: GenericFilter.py:164
 msgid "Matches the ancestors of two people back to a common ancestor, producing the relationship path between two people."
 msgstr ""
 
-#: GenericFilter.py:263
+#: GenericFilter.py:250
 msgid "Matches the person with a specified GRAMPS ID"
 msgstr ""
 
-#: GenericFilter.py:288
+#: GenericFilter.py:275
 msgid "Matches all people whose records are complete"
 msgstr ""
 
-#: GenericFilter.py:311
+#: GenericFilter.py:298
 msgid "Matches all females"
 msgstr ""
 
-#: GenericFilter.py:325 GenericFilter.py:374 GenericFilter.py:589
-#: GenericFilter.py:645 plugins/FilterEditor.py:466
+#: GenericFilter.py:312 GenericFilter.py:361 GenericFilter.py:576
+#: GenericFilter.py:632 plugins/FilterEditor.py:468
 msgid "Inclusive:"
 msgstr ""
 
-#: GenericFilter.py:336 GenericFilter.py:383 GenericFilter.py:426
-#: GenericFilter.py:475 GenericFilter.py:550
+#: GenericFilter.py:323 GenericFilter.py:370 GenericFilter.py:413
+#: GenericFilter.py:462 GenericFilter.py:537
 msgid "Descendant filters"
 msgstr ""
 
-#: GenericFilter.py:339
+#: GenericFilter.py:326
 msgid "Matches all descendants for the specified person"
 msgstr ""
 
-#: GenericFilter.py:374 GenericFilter.py:503 GenericFilter.py:645
-#: GenericFilter.py:789 GenericFilter.py:876 GenericFilter.py:1245
-#: GenericFilter.py:1268 plugins/FilterEditor.py:462
+#: GenericFilter.py:361 GenericFilter.py:490 GenericFilter.py:632
+#: GenericFilter.py:776 GenericFilter.py:863 GenericFilter.py:1232
+#: GenericFilter.py:1255 plugins/FilterEditor.py:463
 msgid "Filter name:"
 msgstr ""
 
-#: GenericFilter.py:386
+#: GenericFilter.py:373
 msgid "Matches people that are descendants of someone matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:415 GenericFilter.py:460 GenericFilter.py:687
-#: GenericFilter.py:739 plugins/FilterEditor.py:458
+#: GenericFilter.py:402 GenericFilter.py:447 GenericFilter.py:674
+#: GenericFilter.py:726 plugins/FilterEditor.py:459
 msgid "Number of generations:"
 msgstr ""
 
-#: GenericFilter.py:429
+#: GenericFilter.py:416
 msgid "Matches people that are descendants of a specified person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:471
+#: GenericFilter.py:458
 msgid "Matches people that are descendants of a specified person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:514
+#: GenericFilter.py:501
 msgid "Matches the person that is a child of someone matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:517 GenericFilter.py:803 GenericFilter.py:1033
-#: GenericFilter.py:1277
+#: GenericFilter.py:504 GenericFilter.py:790 GenericFilter.py:1020
+#: GenericFilter.py:1264
 msgid "Family filters"
 msgstr ""
 
-#: GenericFilter.py:553
+#: GenericFilter.py:540
 msgid "Matches people that are descendants or the spouse of a descendant of a specified person"
 msgstr ""
 
-#: GenericFilter.py:600
+#: GenericFilter.py:587
 msgid "Matches people that are ancestors of a specified person"
 msgstr ""
 
-#: GenericFilter.py:603 GenericFilter.py:658 GenericFilter.py:702
-#: GenericFilter.py:754 GenericFilter.py:840 GenericFilter.py:886
+#: GenericFilter.py:590 GenericFilter.py:645 GenericFilter.py:689
+#: GenericFilter.py:741 GenericFilter.py:827 GenericFilter.py:873
 msgid "Ancestral filters"
 msgstr ""
 
-#: GenericFilter.py:654
+#: GenericFilter.py:641
 msgid "Matches people that are ancestors of someone matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:698
+#: GenericFilter.py:685
 msgid "Matches people that are ancestors of a specified person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:750
+#: GenericFilter.py:737
 msgid "Matches people that are ancestors of a specified person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:800
+#: GenericFilter.py:787
 msgid "Matches the person that is a parent of someone matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:836
+#: GenericFilter.py:823
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr ""
 
-#: GenericFilter.py:882
+#: GenericFilter.py:869
 msgid "Matches people that have a common ancestor with someone matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:916
+#: GenericFilter.py:903
 msgid "Matches all males"
 msgstr ""
 
-#: GenericFilter.py:929 GenericFilter.py:976 GenericFilter.py:1078
-#: GenericFilter.py:1118 edit_person.glade:1907 edit_person.glade:3979
+#: GenericFilter.py:916 GenericFilter.py:963 GenericFilter.py:1065
+#: GenericFilter.py:1105 edit_person.glade:1907 edit_person.glade:3979
 #: marriage.glade:444 places.glade:1710
 msgid "Description:"
 msgstr ""
 
-#: GenericFilter.py:929 GenericFilter.py:976 GenericFilter.py:1078
-#: GenericFilter.py:1118 edit_person.glade:1955 marriage.glade:1771
+#: GenericFilter.py:916 GenericFilter.py:963 GenericFilter.py:1065
+#: GenericFilter.py:1105 edit_person.glade:1955 marriage.glade:1771
 #: mergedata.glade:534 mergedata.glade:717 mergedata.glade:1108
-#: mergedata.glade:1156 plugins/FilterEditor.py:456
+#: mergedata.glade:1156 plugins/FilterEditor.py:457
 msgid "Place:"
 msgstr ""
 
-#: GenericFilter.py:929 GenericFilter.py:976 GenericFilter.py:1078
-#: GenericFilter.py:1118 edit_person.glade:2003 edit_person.glade:2869
+#: GenericFilter.py:916 GenericFilter.py:963 GenericFilter.py:1065
+#: GenericFilter.py:1105 edit_person.glade:2003 edit_person.glade:2869
 #: marriage.glade:348 marriage.glade:1723 mergedata.glade:558
 #: mergedata.glade:693 mergedata.glade:1084 mergedata.glade:1132
 msgid "Date:"
 msgstr ""
 
-#: GenericFilter.py:929 plugins/FilterEditor.py:58
+#: GenericFilter.py:916 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr ""
 
-#: GenericFilter.py:943
+#: GenericFilter.py:930
 msgid "Matches the person with a personal event of a particular value"
 msgstr ""
 
-#: GenericFilter.py:946 GenericFilter.py:993 GenericFilter.py:1095
-#: GenericFilter.py:1135
+#: GenericFilter.py:933 GenericFilter.py:980 GenericFilter.py:1082
+#: GenericFilter.py:1122
 msgid "Event filters"
 msgstr ""
 
-#: GenericFilter.py:976 plugins/FilterEditor.py:59
+#: GenericFilter.py:963 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr ""
 
-#: GenericFilter.py:990
+#: GenericFilter.py:977
 msgid "Matches the person with a family event of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1022
+#: GenericFilter.py:1009
 msgid "Number of relationships:"
 msgstr ""
 
-#: GenericFilter.py:1023 plugins/FilterEditor.py:62
+#: GenericFilter.py:1010 plugins/FilterEditor.py:62
 msgid "Relationship type:"
 msgstr ""
 
-#: GenericFilter.py:1024
+#: GenericFilter.py:1011
 msgid "Number of children:"
 msgstr ""
 
-#: GenericFilter.py:1030
+#: GenericFilter.py:1017
 msgid "Matches the person who has a particular relationship"
 msgstr ""
 
-#: GenericFilter.py:1092
+#: GenericFilter.py:1079
 msgid "Matches the person with a birth of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1132
+#: GenericFilter.py:1119
 msgid "Matches the person with a death of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1158 GenericFilter.py:1180 edit_person.glade:2487
+#: GenericFilter.py:1145 GenericFilter.py:1167 edit_person.glade:2487
 #: imagesel.glade:957 imagesel.glade:1727
 msgid "Value:"
 msgstr ""
 
-#: GenericFilter.py:1158 plugins/FilterEditor.py:60
+#: GenericFilter.py:1145 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr ""
 
-#: GenericFilter.py:1180 plugins/FilterEditor.py:61
+#: GenericFilter.py:1167 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr ""
 
-#: GenericFilter.py:1206 choose.glade:630 edit_person.glade:1415
+#: GenericFilter.py:1193 choose.glade:630 edit_person.glade:1415
 #: gramps.glade:3464 imagesel.glade:718
 msgid "Title:"
 msgstr ""
 
-#: GenericFilter.py:1206 edit_person.glade:1343
+#: GenericFilter.py:1193 edit_person.glade:1343
 msgid "Suffix:"
 msgstr ""
 
-#: GenericFilter.py:1206 edit_person.glade:1367
+#: GenericFilter.py:1193 edit_person.glade:1367
 msgid "Family name:"
 msgstr ""
 
-#: GenericFilter.py:1206 edit_person.glade:1391
+#: GenericFilter.py:1193 edit_person.glade:1391
 msgid "Given name:"
 msgstr ""
 
-#: GenericFilter.py:1212
+#: GenericFilter.py:1199
 msgid "Matches the person with a specified (partial) name"
 msgstr ""
 
-#: GenericFilter.py:1274
+#: GenericFilter.py:1261
 msgid "Matches the person married to someone matching a filter"
 msgstr ""
 
-#: GenericFilter.py:1421
+#: GenericFilter.py:1408
 msgid "Everyone"
 msgstr ""
 
-#: GenericFilter.py:1422
+#: GenericFilter.py:1409
 msgid "Has the Id"
 msgstr ""
 
-#: GenericFilter.py:1423
+#: GenericFilter.py:1410
 msgid "Has a name"
 msgstr ""
 
-#: GenericFilter.py:1424
+#: GenericFilter.py:1411
 msgid "Has the relationships"
 msgstr ""
 
-#: GenericFilter.py:1425
+#: GenericFilter.py:1412
 msgid "Has the death"
 msgstr ""
 
-#: GenericFilter.py:1426
+#: GenericFilter.py:1413
 msgid "Has the birth"
 msgstr ""
 
-#: GenericFilter.py:1427
+#: GenericFilter.py:1414
 msgid "Is a descendant of"
 msgstr ""
 
-#: GenericFilter.py:1428
+#: GenericFilter.py:1415
 msgid "Is a descendant family member of"
 msgstr ""
 
-#: GenericFilter.py:1429
+#: GenericFilter.py:1416
 msgid "Is a descendant of filter match"
 msgstr ""
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1417
 msgid "Is a descendant of person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:1432
+#: GenericFilter.py:1419
 msgid "Is a descendant of person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:1434
+#: GenericFilter.py:1421
 msgid "Is a child of filter match"
 msgstr ""
 
-#: GenericFilter.py:1435
+#: GenericFilter.py:1422
 msgid "Is an ancestor of"
 msgstr ""
 
-#: GenericFilter.py:1436
+#: GenericFilter.py:1423
 msgid "Is an ancestor of filter match"
 msgstr ""
 
-#: GenericFilter.py:1437
+#: GenericFilter.py:1424
 msgid "Is an ancestor of person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:1439
+#: GenericFilter.py:1426
 msgid "Is an ancestor of person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:1441
+#: GenericFilter.py:1428
 msgid "Is a parent of filter match"
 msgstr ""
 
-#: GenericFilter.py:1442
+#: GenericFilter.py:1429
 msgid "Has a common ancestor with"
 msgstr ""
 
-#: GenericFilter.py:1443
+#: GenericFilter.py:1430
 msgid "Has a common ancestor with filter match"
 msgstr ""
 
-#: GenericFilter.py:1445
+#: GenericFilter.py:1432
 msgid "Is a female"
 msgstr ""
 
-#: GenericFilter.py:1446
+#: GenericFilter.py:1433
 msgid "Is a male"
 msgstr ""
 
-#: GenericFilter.py:1447
+#: GenericFilter.py:1434
 msgid "Has complete record"
 msgstr ""
 
-#: GenericFilter.py:1448
+#: GenericFilter.py:1435
 msgid "Has the personal event"
 msgstr ""
 
-#: GenericFilter.py:1449
+#: GenericFilter.py:1436
 msgid "Has the family event"
 msgstr ""
 
-#: GenericFilter.py:1450
+#: GenericFilter.py:1437
 msgid "Has the personal attribute"
 msgstr ""
 
-#: GenericFilter.py:1451
+#: GenericFilter.py:1438
 msgid "Has the family attribute"
 msgstr ""
 
-#: GenericFilter.py:1452
+#: GenericFilter.py:1439
 msgid "Matches the filter named"
 msgstr ""
 
-#: GenericFilter.py:1453
+#: GenericFilter.py:1440
 msgid "Is spouse of filter match"
 msgstr ""
 
-#: GenericFilter.py:1454
+#: GenericFilter.py:1441
 msgid "Relationship path between two people"
 msgstr ""
 
@@ -1212,7 +1225,7 @@ msgid "Media Object"
 msgstr ""
 
 #: ImageSelect.py:614 docgen/HtmlDoc.py:480 docgen/KwordDoc.py:495
-#: docgen/PdfDoc.py:583 docgen/RTFDoc.py:427
+#: docgen/PdfDoc.py:590 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr ""
 
@@ -1370,11 +1383,11 @@ msgstr ""
 msgid "Double clicking will make %s the active person"
 msgstr ""
 
-#: PedView.py:493
+#: PedView.py:495
 msgid "Set anchor"
 msgstr ""
 
-#: PedView.py:494
+#: PedView.py:496
 msgid "Remove anchor"
 msgstr ""
 
@@ -1382,16 +1395,12 @@ msgstr ""
 msgid "Death date"
 msgstr ""
 
-#: PeopleStore.py:247 PeopleView.py:255 PeopleView.py:274 gramps_main.py:946
+#: PeopleStore.py:250 PeopleView.py:252 PeopleView.py:271 gramps_main.py:946
 #: gramps_main.py:1546
 msgid "Updating display..."
 msgstr ""
 
-#: PeopleView.py:383 PeopleView.py:396 gramps.glade:781 gramps_main.py:399
-msgid "Home"
-msgstr ""
-
-#: PeopleView.py:388 PlaceView.py:177 SourceView.py:143 gramps.glade:844
+#: PeopleView.py:385 PlaceView.py:185 SourceView.py:149 gramps.glade:844
 #: plugins/BookReport.py:814
 msgid "Edit"
 msgstr ""
@@ -1404,27 +1413,27 @@ msgstr ""
 msgid "Place Name"
 msgstr ""
 
-#: PlaceView.py:144
+#: PlaceView.py:152
 msgid "Cannot merge places."
 msgstr ""
 
-#: PlaceView.py:145
+#: PlaceView.py:153
 msgid "Exactly two places must be selected to perform a merge. A second place can be selected by holding down the control key while clicking on the desired place."
 msgstr ""
 
-#: PlaceView.py:181 SourceView.py:147
+#: PlaceView.py:189 SourceView.py:153
 msgid "Source Menu"
 msgstr ""
 
-#: PlaceView.py:232 SourceView.py:172 gramps_main.py:1283
+#: PlaceView.py:240 SourceView.py:178 gramps_main.py:1283
 msgid "Delete %s?"
 msgstr ""
 
-#: PlaceView.py:233
+#: PlaceView.py:241
 msgid "This place is currently being used by at least one record in the database. Deleting it will remove it from the database and remove it from all records that reference it."
 msgstr ""
 
-#: PlaceView.py:237
+#: PlaceView.py:245
 msgid "_Delete Place"
 msgstr ""
 
@@ -1535,7 +1544,7 @@ msgstr ""
 #: docgen/OpenSpreadSheet.py:229 docgen/OpenSpreadSheet.py:400
 #: docgen/OpenSpreadSheet.py:404 docgen/OpenSpreadSheet.py:432
 #: docgen/OpenSpreadSheet.py:436 docgen/PSDrawDoc.py:103
-#: docgen/PSDrawDoc.py:106 docgen/PdfDoc.py:175 docgen/RTFDoc.py:81
+#: docgen/PSDrawDoc.py:106 docgen/PdfDoc.py:182 docgen/RTFDoc.py:81
 #: docgen/RTFDoc.py:84 docgen/SvgDrawDoc.py:74 docgen/SvgDrawDoc.py:76
 #: gramps_main.py:1187 gramps_main.py:1192 gramps_main.py:1202
 #: plugins/WriteFtree.py:140 plugins/WriteGedcom.py:580
@@ -1571,10 +1580,23 @@ msgstr ""
 msgid "The file has been moved or deleted."
 msgstr ""
 
-#: Relationship.py:226 plugins/rel_de.py:345
+#: Relationship.py:258 plugins/rel_de.py:345
 msgid "Relationship loop detected"
 msgstr ""
 
+#: ReorderIds.py:125 plugins/ReorderIds.py:129
+msgid "Reorder gramps IDs"
+msgstr ""
+
+#: ReorderIds.py:126 plugins/ChangeTypes.py:106 plugins/Check.py:373
+#: plugins/Merge.py:554 plugins/PatchNames.py:209 plugins/ReorderIds.py:130
+msgid "Database Processing"
+msgstr ""
+
+#: ReorderIds.py:127 plugins/ReorderIds.py:131
+msgid "Reorders the gramps IDs according to gramps' default rules."
+msgstr ""
+
 #: Report.py:77
 msgid "Default Template"
 msgstr ""
@@ -1731,7 +1753,7 @@ msgstr ""
 msgid "Report Options"
 msgstr ""
 
-#: Report.py:532 plugins/FilterEditor.py:254 plugins/pafexport.glade:127
+#: Report.py:532 plugins/FilterEditor.py:255 plugins/pafexport.glade:127
 msgid "Filter"
 msgstr ""
 
@@ -1743,11 +1765,16 @@ msgstr ""
 msgid "Page break between generations"
 msgstr ""
 
+#: Report.py:736 Witness.py:160 plugins/AncestorChart2.py:623
+#: plugins/FamilyGroup.py:506 plugins/FilterEditor.py:173
+msgid "Select Person"
+msgstr ""
+
 #: Report.py:808
 msgid "Save Report As"
 msgstr ""
 
-#: Report.py:883 Report.py:961 docgen/PSDrawDoc.py:378
+#: Report.py:883 Report.py:961 docgen/PSDrawDoc.py:405
 msgid "Print a copy"
 msgstr ""
 
@@ -1850,7 +1877,7 @@ msgstr ""
 msgid "Relationship to %(mother)s"
 msgstr ""
 
-#: SelectChild.py:105 plugins/RelCalc.py:81
+#: SelectChild.py:105 plugins/RelCalc.py:82
 msgid "Relationship to %s"
 msgstr ""
 
@@ -1870,11 +1897,11 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: SourceView.py:173
+#: SourceView.py:179
 msgid "This source is currently being used. Deleting it will remove it from the database and from all records that reference it."
 msgstr ""
 
-#: SourceView.py:176
+#: SourceView.py:182
 msgid "_Delete Source"
 msgstr ""
 
@@ -2041,27 +2068,27 @@ msgstr ""
 msgid "Revision control comment"
 msgstr ""
 
-#: VersionControl.py:112
+#: VersionControl.py:113
 msgid "Select an older revision"
 msgstr ""
 
-#: VersionControl.py:117
+#: VersionControl.py:118
 msgid "Changed by"
 msgstr ""
 
-#: VersionControl.py:117
+#: VersionControl.py:118
 msgid "Revision"
 msgstr ""
 
-#: VersionControl.py:118 plugins/FilterEditor.py:254
+#: VersionControl.py:119 plugins/FilterEditor.py:255
 msgid "Comment"
 msgstr ""
 
-#: VersionControl.py:293
+#: VersionControl.py:294
 msgid "Could not retrieve version"
 msgstr ""
 
-#: VersionControl.py:296 preferences.glade:566
+#: VersionControl.py:297 preferences.glade:566
 msgid "RCS"
 msgstr ""
 
@@ -2073,7 +2100,7 @@ msgstr ""
 msgid "Witness Editor"
 msgstr ""
 
-#: WriteXML.py:86
+#: WriteXML.py:86 WriteXML.py:135 WriteXML.py:144 WriteXML.py:161
 msgid "Failure writing %s"
 msgstr ""
 
@@ -2081,6 +2108,14 @@ msgstr ""
 msgid "An attempt is being made to recover the original file"
 msgstr ""
 
+#: WriteXML.py:136
+msgid "The database cannot be saved because you do not have permission to write to the directory. Please make sure you have write access to the directory and try again."
+msgstr ""
+
+#: WriteXML.py:145
+msgid "The database cannot be saved because you do not have permission to write to the file. Please make sure you have write access to the file and try again."
+msgstr ""
+
 #: calendars/Islamic.py:70
 msgid "Islamic"
 msgstr ""
@@ -2089,11 +2124,11 @@ msgstr ""
 msgid "Persian"
 msgstr ""
 
-#: choose.glade:128 const.py:139 select_person.glade:128
+#: choose.glade:128 const.py:140 select_person.glade:128
 msgid "female"
 msgstr ""
 
-#: choose.glade:173 const.py:138 select_person.glade:173
+#: choose.glade:173 const.py:139 select_person.glade:173
 msgid "male"
 msgstr ""
 
@@ -2120,353 +2155,353 @@ msgstr ""
 msgid "<b>Information</b>"
 msgstr ""
 
-#: const.py:112
+#: const.py:113
 msgid "GRAMPS (Genealogical Research and Analysis Management Programming System) is a personal genealogy program."
 msgstr ""
 
-#: const.py:127
+#: const.py:128
 msgid "TRANSLATORS: Translate this to your name in your native language"
 msgstr ""
 
-#: const.py:171 const.py:291 gramps.glade:4543 gramps.glade:4736
+#: const.py:172 const.py:284 gramps.glade:4543 gramps.glade:4736
 #: gramps.glade:5176 gramps.glade:5356 gramps.glade:6979 gramps.glade:7225
 #: gramps.glade:7833 gramps.glade:8004
 msgid "Adopted"
 msgstr ""
 
-#: const.py:172 gramps.glade:4565 gramps.glade:4758 gramps.glade:5198
+#: const.py:173 gramps.glade:4565 gramps.glade:4758 gramps.glade:5198
 #: gramps.glade:5378 gramps.glade:7001 gramps.glade:7247 gramps.glade:7855
 #: gramps.glade:8026
 msgid "Stepchild"
 msgstr ""
 
-#: const.py:173
+#: const.py:174
 msgid "Sponsored"
 msgstr ""
 
-#: const.py:174 gramps.glade:4587 gramps.glade:4780 gramps.glade:7023
+#: const.py:175 gramps.glade:4587 gramps.glade:4780 gramps.glade:7023
 #: gramps.glade:7269
 msgid "Foster"
 msgstr ""
 
-#: const.py:177 const.py:497 const.py:505 gramps.glade:1455
+#: const.py:178 const.py:428 const.py:436 gramps.glade:1455
 #: mergedata.glade:218
 msgid "Other"
 msgstr ""
 
-#: const.py:186 srcsel.glade:459
+#: const.py:187 srcsel.glade:459
 msgid "Very High"
 msgstr ""
 
-#: const.py:187 plugins/Merge.py:115 srcsel.glade:451
+#: const.py:188 plugins/Merge.py:115 srcsel.glade:451
 msgid "High"
 msgstr ""
 
-#: const.py:188 srcsel.glade:443
+#: const.py:189 srcsel.glade:443
 msgid "Normal"
 msgstr ""
 
-#: const.py:189 plugins/Merge.py:107 srcsel.glade:435
+#: const.py:190 plugins/Merge.py:107 srcsel.glade:435
 msgid "Low"
 msgstr ""
 
-#: const.py:190 srcsel.glade:427
+#: const.py:191 srcsel.glade:427
 msgid "Very Low"
 msgstr ""
 
-#: const.py:210
+#: const.py:217
 msgid "Alternate Marriage"
 msgstr ""
 
-#: const.py:211
+#: const.py:218
 msgid "Annulment"
 msgstr ""
 
-#: const.py:212 const.py:306
+#: const.py:219 const.py:299
 msgid "Divorce Filing"
 msgstr ""
 
-#: const.py:213
+#: const.py:220
 msgid "Divorce"
 msgstr ""
 
-#: const.py:214
+#: const.py:221
 msgid "Engagement"
 msgstr ""
 
-#: const.py:215
+#: const.py:222
 msgid "Marriage Contract"
 msgstr ""
 
-#: const.py:216
+#: const.py:223
 msgid "Marriage License"
 msgstr ""
 
-#: const.py:217
+#: const.py:224
 msgid "Marriage Settlement"
 msgstr ""
 
-#: const.py:218
+#: const.py:225
 msgid "Marriage"
 msgstr ""
 
-#: const.py:292
+#: const.py:285
 msgid "Alternate Birth"
 msgstr ""
 
-#: const.py:293
+#: const.py:286
 msgid "Alternate Death"
 msgstr ""
 
-#: const.py:294
+#: const.py:287
 msgid "Adult Christening"
 msgstr ""
 
-#: const.py:295
+#: const.py:288
 msgid "Baptism"
 msgstr ""
 
-#: const.py:296
+#: const.py:289
 msgid "Bar Mitzvah"
 msgstr ""
 
-#: const.py:297
+#: const.py:290
 msgid "Bas Mitzvah"
 msgstr ""
 
-#: const.py:298
+#: const.py:291
 msgid "Blessing"
 msgstr ""
 
-#: const.py:299
+#: const.py:292
 msgid "Burial"
 msgstr ""
 
-#: const.py:300
+#: const.py:293
 msgid "Cause Of Death"
 msgstr ""
 
-#: const.py:301
+#: const.py:294
 msgid "Census"
 msgstr ""
 
-#: const.py:302
+#: const.py:295
 msgid "Christening"
 msgstr ""
 
-#: const.py:303
+#: const.py:296
 msgid "Confirmation"
 msgstr ""
 
-#: const.py:304
+#: const.py:297
 msgid "Cremation"
 msgstr ""
 
-#: const.py:305
+#: const.py:298
 msgid "Degree"
 msgstr ""
 
-#: const.py:307
+#: const.py:300
 msgid "Education"
 msgstr ""
 
-#: const.py:308
+#: const.py:301
 msgid "Elected"
 msgstr ""
 
-#: const.py:309
+#: const.py:302
 msgid "Emigration"
 msgstr ""
 
-#: const.py:310
+#: const.py:303
 msgid "First Communion"
 msgstr ""
 
-#: const.py:311
+#: const.py:304
 msgid "Immigration"
 msgstr ""
 
-#: const.py:312
+#: const.py:305
 msgid "Graduation"
 msgstr ""
 
-#: const.py:313
+#: const.py:306
 msgid "Medical Information"
 msgstr ""
 
-#: const.py:314
+#: const.py:307
 msgid "Military Service"
 msgstr ""
 
-#: const.py:315
+#: const.py:308
 msgid "Naturalization"
 msgstr ""
 
-#: const.py:316
+#: const.py:309
 msgid "Nobility Title"
 msgstr ""
 
-#: const.py:317
+#: const.py:310
 msgid "Number of Marriages"
 msgstr ""
 
-#: const.py:318
+#: const.py:311
 msgid "Occupation"
 msgstr ""
 
-#: const.py:319
+#: const.py:312
 msgid "Ordination"
 msgstr ""
 
-#: const.py:320
+#: const.py:313
 msgid "Probate"
 msgstr ""
 
-#: const.py:321
+#: const.py:314
 msgid "Property"
 msgstr ""
 
-#: const.py:322
+#: const.py:315
 msgid "Religion"
 msgstr ""
 
-#: const.py:323
+#: const.py:316
 msgid "Residence"
 msgstr ""
 
-#: const.py:324
+#: const.py:317
 msgid "Retirement"
 msgstr ""
 
-#: const.py:325
+#: const.py:318
 msgid "Will"
 msgstr ""
 
-#: const.py:392
+#: const.py:367
 msgid "Caste"
 msgstr ""
 
-#: const.py:394
+#: const.py:369
 msgid "Identification Number"
 msgstr ""
 
-#: const.py:395
+#: const.py:370
 msgid "National Origin"
 msgstr ""
 
-#: const.py:396
+#: const.py:371
 msgid "Social Security Number"
 msgstr ""
 
-#: const.py:435
+#: const.py:389
 msgid "Number of Children"
 msgstr ""
 
-#: const.py:493
+#: const.py:424
 msgid "A legal or common-law relationship between a husband and wife"
 msgstr ""
 
-#: const.py:494
+#: const.py:425
 msgid "No legal or common-law relationship between man and woman"
 msgstr ""
 
-#: const.py:494 const.py:502
+#: const.py:425 const.py:433
 msgid "Unmarried"
 msgstr ""
 
-#: const.py:495
+#: const.py:426
 msgid "An established relationship between members of the same sex"
 msgstr ""
 
-#: const.py:496
+#: const.py:427
 msgid "Unknown relationship between a man and woman"
 msgstr ""
 
-#: const.py:497
+#: const.py:428
 msgid "An unspecified relationship between a man and woman"
 msgstr ""
 
-#: const.py:521
+#: const.py:448
 msgid "No definition available"
 msgstr ""
 
-#: const.py:947
-msgid "Child"
-msgstr ""
-
-#: const.py:947 const.py:953 const.py:959
-msgid "<No Status>"
-msgstr ""
-
-#: const.py:947 const.py:953 const.py:959
-msgid "Cleared"
-msgstr ""
-
-#: const.py:947 const.py:953 const.py:959
-msgid "Completed"
-msgstr ""
-
-#: const.py:948
-msgid "Infant"
-msgstr ""
-
-#: const.py:948 const.py:954
-msgid "Stillborn"
-msgstr ""
-
-#: const.py:948 const.py:954 const.py:960
-msgid "Pre-1970"
-msgstr ""
-
-#: const.py:948 const.py:954 const.py:960
-msgid "Qualified"
-msgstr ""
-
-#: const.py:949 const.py:955 const.py:961
-msgid "Submitted"
-msgstr ""
-
-#: const.py:949 const.py:955 const.py:961
-msgid "Uncleared"
-msgstr ""
-
-#: const.py:953
-msgid "BIC"
-msgstr ""
-
-#: const.py:954 const.py:960
-msgid "DNS"
-msgstr ""
-
-#: const.py:959
-msgid "Canceled"
-msgstr ""
-
-#: const.py:960
-msgid "DNS/CAN"
-msgstr ""
-
-#: const.py:966 const.py:973
+#: const.py:463
 msgid "Also Known As"
 msgstr ""
 
-#: const.py:967 const.py:974
+#: const.py:464
 msgid "Birth Name"
 msgstr ""
 
-#: const.py:968 const.py:975
+#: const.py:465
 msgid "Married Name"
 msgstr ""
 
-#: const.py:969 const.py:976
+#: const.py:466
 msgid "Other Name"
 msgstr ""
 
-#: const.py:982
+#: const.py:861
+msgid "Child"
+msgstr ""
+
+#: const.py:861 const.py:867 const.py:873
+msgid "<No Status>"
+msgstr ""
+
+#: const.py:861 const.py:867 const.py:873
+msgid "Cleared"
+msgstr ""
+
+#: const.py:861 const.py:867 const.py:873
+msgid "Completed"
+msgstr ""
+
+#: const.py:862
+msgid "Infant"
+msgstr ""
+
+#: const.py:862 const.py:868
+msgid "Stillborn"
+msgstr ""
+
+#: const.py:862 const.py:868 const.py:874
+msgid "Pre-1970"
+msgstr ""
+
+#: const.py:862 const.py:868 const.py:874
+msgid "Qualified"
+msgstr ""
+
+#: const.py:863 const.py:869 const.py:875
+msgid "Submitted"
+msgstr ""
+
+#: const.py:863 const.py:869 const.py:875
+msgid "Uncleared"
+msgstr ""
+
+#: const.py:867
+msgid "BIC"
+msgstr ""
+
+#: const.py:868 const.py:874
+msgid "DNS"
+msgstr ""
+
+#: const.py:873
+msgid "Canceled"
+msgstr ""
+
+#: const.py:874
+msgid "DNS/CAN"
+msgstr ""
+
+#: const.py:881
 msgid "Flowed"
 msgstr ""
 
-#: const.py:983
+#: const.py:882
 msgid "Preformatted"
 msgstr ""
 
@@ -2736,6 +2771,10 @@ msgstr ""
 msgid "KWord"
 msgstr ""
 
+#: docgen/LPRDoc.py:230
+msgid "LPR"
+msgstr ""
+
 #: docgen/LaTeXDoc.py:429
 msgid "LaTeX"
 msgstr ""
@@ -2752,7 +2791,7 @@ msgstr ""
 msgid "OpenOffice.org Draw"
 msgstr ""
 
-#: docgen/PSDrawDoc.py:377 plugins/GraphViz.py:157 plugins/RelGraph.py:189
+#: docgen/PSDrawDoc.py:404 plugins/GraphViz.py:157 plugins/RelGraph.py:189
 msgid "PostScript"
 msgstr ""
 
@@ -2760,7 +2799,7 @@ msgstr ""
 msgid "The ReportLab modules are not installed"
 msgstr ""
 
-#: docgen/PdfDoc.py:588 docgen/PdfDoc.py:597 docgen/PdfDoc.py:607
+#: docgen/PdfDoc.py:595 docgen/PdfDoc.py:604 docgen/PdfDoc.py:614
 msgid "PDF"
 msgstr ""
 
@@ -3243,7 +3282,7 @@ msgstr ""
 #: plugins/AncestorReport.py:525 plugins/Ancestors.py:1130
 #: plugins/CustomBookText.py:378 plugins/DescendReport.py:415
 #: plugins/DetAncestralReport.py:1221 plugins/DetDescendantReport.py:1230
-#: plugins/FamilyGroup.py:770 plugins/FtmStyleAncestors.py:1263
+#: plugins/FamilyGroup.py:772 plugins/FtmStyleAncestors.py:1263
 #: plugins/FtmStyleDescendants.py:1672 plugins/IndivComplete.py:828
 #: plugins/IndivSummary.py:640 plugins/SimpleBookTitle.py:300
 #: plugins/SimpleBookTitle.py:301 plugins/SimpleBookTitle.py:302
@@ -3807,7 +3846,7 @@ msgstr ""
 msgid "An error was detected while attempting to create the file. The operating system reported \"%s\""
 msgstr ""
 
-#: gramps_main.py:1193 gramps_main.py:1203
+#: gramps_main.py:1193
 msgid "An error was detected while trying to create the file"
 msgstr ""
 
@@ -4090,7 +4129,7 @@ msgstr ""
 #: plugins/AncestorChart.py:225 plugins/AncestorChart2.py:422
 #: plugins/AncestorReport.py:411 plugins/Ancestors.py:791
 #: plugins/Ancestors.py:807 plugins/Ancestors.py:813 plugins/DesGraph.py:315
-#: plugins/FamilyGroup.py:621 plugins/FanChart.py:283
+#: plugins/FamilyGroup.py:623 plugins/FanChart.py:283
 #: plugins/FtmStyleAncestors.py:968 plugins/FtmStyleAncestors.py:973
 #: plugins/FtmStyleAncestors.py:978 plugins/FtmStyleAncestors.py:983
 #: plugins/FtmStyleDescendants.py:1377 plugins/FtmStyleDescendants.py:1382
@@ -4106,7 +4145,7 @@ msgid "Ancestor Chart"
 msgstr ""
 
 #: plugins/AncestorChart.py:242 plugins/AncestorChart.py:560
-#: plugins/AncestorChart2.py:462 plugins/AncestorChart2.py:818
+#: plugins/AncestorChart2.py:462 plugins/AncestorChart2.py:836
 #: plugins/DesGraph.py:329 plugins/DesGraph.py:586 plugins/FanChart.py:310
 #: plugins/FanChart.py:462 plugins/GraphViz.py:83 plugins/GraphViz.py:531
 #: plugins/RelGraph.py:111 plugins/RelGraph.py:912 plugins/TimeLine.py:396
@@ -4139,10 +4178,10 @@ msgstr ""
 msgid "Ancestor Chart for GRAMPS Book"
 msgstr ""
 
-#: plugins/AncestorChart.py:561 plugins/AncestorChart2.py:819
+#: plugins/AncestorChart.py:561 plugins/AncestorChart2.py:837
 #: plugins/AncestorReport.py:515 plugins/Ancestors.py:1120
 #: plugins/DescendReport.py:405 plugins/DetAncestralReport.py:1210
-#: plugins/DetDescendantReport.py:1219 plugins/FamilyGroup.py:762
+#: plugins/DetDescendantReport.py:1219 plugins/FamilyGroup.py:764
 #: plugins/FtmStyleAncestors.py:1253 plugins/FtmStyleDescendants.py:1662
 #: plugins/GraphViz.py:530 plugins/IndivComplete.py:820
 #: plugins/IndivSummary.py:629 plugins/RelGraph.py:911 plugins/Summary.py:162
@@ -4150,11 +4189,11 @@ msgstr ""
 msgid "Beta"
 msgstr ""
 
-#: plugins/AncestorChart.py:562 plugins/AncestorChart2.py:820
+#: plugins/AncestorChart.py:562 plugins/AncestorChart2.py:838
 msgid "Produces a graphical ancestral tree graph"
 msgstr ""
 
-#: plugins/AncestorChart.py:571 plugins/AncestorChart2.py:829
+#: plugins/AncestorChart.py:571 plugins/AncestorChart2.py:847
 #: plugins/DesGraph.py:597 plugins/FanChart.py:470 plugins/TimeLine.py:667
 msgid "Graphics"
 msgstr ""
@@ -4171,7 +4210,7 @@ msgstr ""
 msgid "Sc_ale to fit on a single page"
 msgstr ""
 
-#: plugins/AncestorChart2.py:817 plugins/AncestorChart2.py:828
+#: plugins/AncestorChart2.py:835 plugins/AncestorChart2.py:846
 msgid "Ancestor Chart (Wall Chart)"
 msgstr ""
 
@@ -4261,7 +4300,7 @@ msgstr ""
 #: plugins/Ancestors.py:846 plugins/Ancestors.py:1119
 #: plugins/DescendReport.py:132 plugins/DescendReport.py:404
 #: plugins/DetAncestralReport.py:1211 plugins/DetDescendantReport.py:1220
-#: plugins/FamilyGroup.py:361 plugins/FamilyGroup.py:761
+#: plugins/FamilyGroup.py:363 plugins/FamilyGroup.py:763
 #: plugins/FtmStyleAncestors.py:1006 plugins/FtmStyleAncestors.py:1252
 #: plugins/FtmStyleDescendants.py:1415 plugins/FtmStyleDescendants.py:1661
 #: plugins/IndivComplete.py:473 plugins/IndivComplete.py:821
@@ -4278,7 +4317,7 @@ msgid "Ahnentafel Report for GRAMPS Book"
 msgstr ""
 
 #: plugins/AncestorReport.py:397 plugins/Ancestors.py:776
-#: plugins/DescendReport.py:293 plugins/FamilyGroup.py:612
+#: plugins/DescendReport.py:293 plugins/FamilyGroup.py:614
 #: plugins/FtmStyleAncestors.py:953 plugins/FtmStyleDescendants.py:1362
 #: plugins/IndivComplete.py:662 plugins/IndivSummary.py:590
 #: plugins/SimpleBookTitle.py:118 plugins/TimeLine.py:339
@@ -4580,11 +4619,6 @@ msgstr ""
 msgid "Rename personal event types"
 msgstr ""
 
-#: plugins/ChangeTypes.py:106 plugins/Check.py:373 plugins/Merge.py:554
-#: plugins/PatchNames.py:209 plugins/ReorderIds.py:130
-msgid "Database Processing"
-msgstr ""
-
 #: plugins/ChangeTypes.py:107
 msgid "Allows all the events of a certain name to be renamed to a new name"
 msgstr ""
@@ -5170,8 +5204,8 @@ msgstr ""
 msgid "Event Comparison"
 msgstr ""
 
-#: plugins/EventCmp.py:308 plugins/FamilyGroup.py:171
-#: plugins/FamilyGroup.py:274 plugins/FamilyGroup.py:276
+#: plugins/EventCmp.py:308 plugins/FamilyGroup.py:173
+#: plugins/FamilyGroup.py:276 plugins/FamilyGroup.py:278
 msgid "Death"
 msgstr ""
 
@@ -5183,51 +5217,51 @@ msgstr ""
 msgid "Aids in the analysis of data by allowing the development of custom filters that can be applied to the database to find similar events"
 msgstr ""
 
-#: plugins/FamilyGroup.py:133
+#: plugins/FamilyGroup.py:135
 msgid "Husband"
 msgstr ""
 
-#: plugins/FamilyGroup.py:135
+#: plugins/FamilyGroup.py:137
 msgid "Wife"
 msgstr ""
 
-#: plugins/FamilyGroup.py:292 plugins/FamilyGroup.py:386
-#: plugins/FamilyGroup.py:500
+#: plugins/FamilyGroup.py:294 plugins/FamilyGroup.py:388
+#: plugins/FamilyGroup.py:502
 msgid "Spouse"
 msgstr ""
 
-#: plugins/FamilyGroup.py:318 plugins/FamilyGroup.py:361
-#: plugins/FamilyGroup.py:480 plugins/FamilyGroup.py:760
-#: plugins/FamilyGroup.py:769
+#: plugins/FamilyGroup.py:320 plugins/FamilyGroup.py:363
+#: plugins/FamilyGroup.py:482 plugins/FamilyGroup.py:762
+#: plugins/FamilyGroup.py:771
 msgid "Family Group Report"
 msgstr ""
 
-#: plugins/FamilyGroup.py:335 plugins/IndivComplete.py:287
+#: plugins/FamilyGroup.py:337 plugins/IndivComplete.py:287
 #: plugins/IndivSummary.py:185 plugins/WebPage.py:607
 msgid "Children"
 msgstr ""
 
-#: plugins/FamilyGroup.py:365
+#: plugins/FamilyGroup.py:367
 msgid "Family Group Report for %s"
 msgstr ""
 
-#: plugins/FamilyGroup.py:370
+#: plugins/FamilyGroup.py:372
 msgid "Save Family Group Report"
 msgstr ""
 
-#: plugins/FamilyGroup.py:484
+#: plugins/FamilyGroup.py:486
 msgid "Family Group Report for GRAMPS Book"
 msgstr ""
 
-#: plugins/FamilyGroup.py:630
+#: plugins/FamilyGroup.py:632
 msgid "The style used for the text related to the children."
 msgstr ""
 
-#: plugins/FamilyGroup.py:639
+#: plugins/FamilyGroup.py:641
 msgid "The style used for the parent's name"
 msgstr ""
 
-#: plugins/FamilyGroup.py:763
+#: plugins/FamilyGroup.py:765
 msgid "Creates a family group report, showing information on a set of parents and their children."
 msgstr ""
 
@@ -5268,64 +5302,60 @@ msgstr ""
 msgid "Select person from a list"
 msgstr ""
 
-#: plugins/FilterEditor.py:173
-msgid "Select Person"
-msgstr ""
-
 #: plugins/FilterEditor.py:189
 msgid "Not a valid person"
 msgstr ""
 
-#: plugins/FilterEditor.py:243
+#: plugins/FilterEditor.py:244
 msgid "User defined filters"
 msgstr ""
 
-#: plugins/FilterEditor.py:311
+#: plugins/FilterEditor.py:312
 msgid "Define filter"
 msgstr ""
 
-#: plugins/FilterEditor.py:394
+#: plugins/FilterEditor.py:395
 msgid "Add Rule"
 msgstr ""
 
-#: plugins/FilterEditor.py:400
+#: plugins/FilterEditor.py:401
 msgid "Edit Rule"
 msgstr ""
 
-#: plugins/FilterEditor.py:467
+#: plugins/FilterEditor.py:469
 msgid "Include original person"
 msgstr ""
 
-#: plugins/FilterEditor.py:480
+#: plugins/FilterEditor.py:482
 msgid "Rule Name"
 msgstr ""
 
-#: plugins/FilterEditor.py:543 rule.glade:1213
+#: plugins/FilterEditor.py:545 rule.glade:1213
 msgid "No rule selected"
 msgstr ""
 
-#: plugins/FilterEditor.py:593
+#: plugins/FilterEditor.py:597
 msgid "Filter Test"
 msgstr ""
 
-#: plugins/FilterEditor.py:632
+#: plugins/FilterEditor.py:636
 msgid "Custom Filter Editor"
 msgstr ""
 
-#: plugins/FilterEditor.py:633 plugins/FilterEditor.py:646
-#: plugins/RelCalc.py:160 plugins/Verify.py:418 plugins/soundgen.py:97
+#: plugins/FilterEditor.py:637 plugins/FilterEditor.py:650
+#: plugins/RelCalc.py:161 plugins/Verify.py:418 plugins/soundgen.py:97
 msgid "Utilities"
 msgstr ""
 
-#: plugins/FilterEditor.py:634
+#: plugins/FilterEditor.py:638
 msgid "The Custom Filter Editor builds custom filters that can be used to select people included in reports, exports, and other utilities."
 msgstr ""
 
-#: plugins/FilterEditor.py:645
+#: plugins/FilterEditor.py:649
 msgid "System Filter Editor"
 msgstr ""
 
-#: plugins/FilterEditor.py:647
+#: plugins/FilterEditor.py:651
 msgid "The System Filter Editor builds custom filters that can be used by anyone on the system to select people included in reports, exports, and other utilities."
 msgstr ""
 
@@ -6102,35 +6132,35 @@ msgstr ""
 msgid "Error extracting into %s"
 msgstr ""
 
-#: plugins/RelCalc.py:82 plugins/RelCalc.py:159
+#: plugins/RelCalc.py:83 plugins/RelCalc.py:160
 msgid "Relationship calculator"
 msgstr ""
 
-#: plugins/RelCalc.py:87 plugins/TimeLine.py:377
+#: plugins/RelCalc.py:88 plugins/TimeLine.py:377
 msgid "Birth Date"
 msgstr ""
 
-#: plugins/RelCalc.py:119
+#: plugins/RelCalc.py:120
 msgid "Their common ancestor is %s."
 msgstr ""
 
-#: plugins/RelCalc.py:123
+#: plugins/RelCalc.py:124
 msgid "Their common ancestors are %s and %s."
 msgstr ""
 
-#: plugins/RelCalc.py:128
+#: plugins/RelCalc.py:129
 msgid "Their common ancestors are : "
 msgstr ""
 
-#: plugins/RelCalc.py:143
+#: plugins/RelCalc.py:144
 msgid "%(person)s and %(active_person)s are not related."
 msgstr ""
 
-#: plugins/RelCalc.py:146
+#: plugins/RelCalc.py:147
 msgid "%(person)s is the %(relationship)s of %(active_person)s."
 msgstr ""
 
-#: plugins/RelCalc.py:161
+#: plugins/RelCalc.py:162
 msgid "Calculates the relationship between two people"
 msgstr ""
 
@@ -6162,14 +6192,6 @@ msgstr ""
 msgid "When no birth, marriage, or death date is available, the correspondent place field (or cause field when blank) will be used."
 msgstr ""
 
-#: plugins/ReorderIds.py:129
-msgid "Reorder gramps IDs"
-msgstr ""
-
-#: plugins/ReorderIds.py:131
-msgid "Reorders the gramps IDs according to gramps' default rules."
-msgstr ""
-
 #: plugins/SimpleBookTitle.py:128
 msgid "The style used for the subtitle."
 msgstr ""
@@ -6199,8 +6221,8 @@ msgstr ""
 msgid "Copyright %d %s"
 msgstr ""
 
-#: plugins/SimpleBookTitle.py:278
-msgid "Simple Book Title"
+#: plugins/SimpleBookTitle.py:278 plugins/SimpleBookTitle.py:563
+msgid "Title Page"
 msgstr ""
 
 #: plugins/SimpleBookTitle.py:282
@@ -6232,10 +6254,6 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: plugins/SimpleBookTitle.py:563
-msgid "Title Page"
-msgstr ""
-
 #: plugins/Summary.py:97
 msgid "Individuals"
 msgstr ""