From 57df3558497d1e0069699fa144c59a63d4266254 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 4 Apr 2003 05:48:25 +0000 Subject: [PATCH] Find support svn: r1423 --- gramps2/Makefile.in | 2 - gramps2/aclocal.m4 | 10 +- gramps2/configure | 989 +++++++++-------------------- gramps2/example/gramps/data.gramps | 93 +-- gramps2/src/AutoComp.py | 22 +- gramps2/src/EditPerson.py | 19 +- gramps2/src/Find.py | 121 ++-- gramps2/src/ListModel.py | 2 - gramps2/src/Makefile.in | 2 +- gramps2/src/MediaView.py | 23 +- gramps2/src/PedView.py | 5 +- gramps2/src/PlaceView.py | 6 +- gramps2/src/QuestionDialog.py | 6 + gramps2/src/RelLib.py | 3 + gramps2/src/Relationship.py | 22 +- gramps2/src/SourceView.py | 8 +- gramps2/src/Utils.py | 17 +- gramps2/src/errdialogs.glade | 6 - gramps2/src/gramps.glade | 181 +++--- gramps2/src/gramps.py | 30 +- gramps2/src/gramps_main.py | 36 +- gramps2/src/intl.py | 28 +- gramps2/src/po/template.po | 478 +++++++------- 23 files changed, 899 insertions(+), 1210 deletions(-) diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in index 746933829..94457b14e 100644 --- a/gramps2/Makefile.in +++ b/gramps2/Makefile.in @@ -466,8 +466,6 @@ uninstall-info: uninstall-info-recursive uninstall-info-recursive uninstall-local uninstall-recursive -#grampsdocdir = $(datadir)/doc/gramps-$(VERSION) - gramps: gramps.sh cp gramps.sh gramps diff --git a/gramps2/aclocal.m4 b/gramps2/aclocal.m4 index 43023e0ce..bcf9c02c5 100644 --- a/gramps2/aclocal.m4 +++ b/gramps2/aclocal.m4 @@ -809,9 +809,7 @@ AC_DEFUN([AM_PATH_PYTHON], m4_if([$1],[],[ dnl No version check is needed. # Find any Python interpreter. - AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST) - am_display_PYTHON=python - ], [ + AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)],[ dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. @@ -832,7 +830,6 @@ AC_DEFUN([AM_PATH_PYTHON], done]) # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) - am_display_PYTHON=$am_cv_pathless_PYTHON fi ]) @@ -840,7 +837,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl the best way to do this; it's what "site.py" does in the standard dnl library. - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + AC_CACHE_CHECK([for $am_cv_pathless_PYTHON version], [am_cv_python_version], [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) @@ -855,7 +852,8 @@ AC_DEFUN([AM_PATH_PYTHON], dnl At times (like when building shared libraries) you may want dnl to know which OS platform Python thinks this is. - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + AC_CACHE_CHECK([for $am_cv_pathless_PYTHON platform], + [am_cv_python_platform], [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) diff --git a/gramps2/configure b/gramps2/configure index 4b9599bef..d3271b624 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -1,11 +1,19 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.53. # # 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. + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -14,13 +22,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -28,42 +34,34 @@ else as_unset=false fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -74,7 +72,6 @@ echo X/"$0" | /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -85,15 +82,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conf$$.sh + rm -f conftest.sh fi @@ -141,8 +138,6 @@ do as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -215,12 +210,6 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -237,7 +226,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. @@ -251,7 +240,6 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local -ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= @@ -308,8 +296,6 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG PYTHON22 ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX P15_INCLUDES P20_INCLUDES P21_INCLUDES P22_INCLUDES GNOMEINC GNOMELIB GPREF INTLLIBS LIBOBJS LTLIBOBJS' -ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -733,9 +719,6 @@ if test ! -r $srcdir/$ac_unique_file; then { (exit 1); exit 1; }; } fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -895,7 +878,7 @@ 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_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` @@ -935,7 +918,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -987,54 +970,27 @@ _ACEOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= -ac_configure_args0= -ac_configure_args1= ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 +for ac_arg do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 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. - 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 - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done + case $ac_arg in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n ) continue ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + esac + # Get rid of the leading space. done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1045,7 +1001,6 @@ trap 'exit_status=$? # Save into config.log some information that might help in debugging. { echo - cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## @@ -1068,35 +1023,6 @@ _ASBOX esac; } echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## @@ -1104,7 +1030,7 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && @@ -1261,7 +1187,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - am__api_version="1.6" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -1477,15 +1402,15 @@ fi test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="$(MAKE)"' + @echo 'ac_maketemp="${MAKE}"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` @@ -1811,13 +1736,12 @@ else echo "${ECHO_T}no" >&6 fi - am_display_PYTHON=$am_cv_pathless_PYTHON fi - echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1835,8 +1759,8 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2112,15 +2036,15 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="$(MAKE)"' + @echo 'ac_maketemp="${MAKE}"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` @@ -2346,7 +2270,9 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + set dummy "$as_dir/$ac_word" ${1+"$@"} + shift + ac_cv_prog_CC="$@" fi fi fi @@ -2451,10 +2377,8 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. @@ -2479,12 +2403,14 @@ ac_compiler=`set X $ac_compile; echo $2` 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. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2494,7 +2420,7 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe" # 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. @@ -2513,39 +2439,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue +for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; esac done else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi @@ -2572,11 +2485,9 @@ if test "$cross_compiling" != yes; then cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 +If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} +If you meant to cross compile, use \`--host'." >&2;} { (exit 1); exit 1; }; } fi fi @@ -2584,7 +2495,7 @@ fi echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2604,10 +2515,9 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -2615,10 +2525,8 @@ for ac_file in conftest.exe conftest conftest.*; do esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi @@ -2636,12 +2544,14 @@ if test "${ac_cv_objext+set}" = set; then else 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. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2658,19 +2568,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi @@ -2687,12 +2594,14 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then else 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. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2719,8 +2628,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2740,12 +2648,14 @@ if test "${ac_cv_prog_cc_g+set}" = set; then else 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. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2769,8 +2679,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2792,102 +2701,6 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -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 -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2920,13 +2733,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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. */ +#include "confdefs.h" #include $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2950,19 +2765,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 continue fi 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 -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2986,8 +2802,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -3000,8 +2815,7 @@ fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -3020,7 +2834,7 @@ fi rmdir .deps 2>/dev/null - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -3177,28 +2991,18 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. 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. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3215,8 +3019,7 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3226,17 +3029,13 @@ rm -f conftest.err conftest.$ac_ext # can be detected and how. 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. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3254,8 +3053,7 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -3284,28 +3082,18 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. 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. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3322,8 +3110,7 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3333,17 +3120,13 @@ rm -f conftest.err conftest.$ac_ext # can be detected and how. 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. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3361,8 +3144,7 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -3375,10 +3157,8 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -3389,21 +3169,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -3411,59 +3176,48 @@ if test "${ac_cv_header_stdc+set}" = set; then else 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. */ +#include "confdefs.h" #include #include #include #include -int -main () -{ - - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 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. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then + egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -3476,16 +3230,12 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 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. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then + egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -3501,18 +3251,13 @@ if test $ac_cv_header_stdc = yes; then else 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. */ +#include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -3545,12 +3290,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3585,11 +3329,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then else 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. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> @@ -3609,8 +3349,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3641,11 +3380,7 @@ echo "$as_me:$LINENO: checking libintl.h usability" >&5 echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 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. */ +#include "confdefs.h" $ac_includes_default #include _ACEOF @@ -3664,8 +3399,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3677,17 +3411,13 @@ echo "$as_me:$LINENO: checking libintl.h presence" >&5 echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 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. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3704,8 +3434,7 @@ if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -3718,32 +3447,14 @@ case $ac_header_compiler:$ac_header_preproc in { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 @@ -3768,11 +3479,7 @@ else LIBS="-lc $LIBS" 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. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3781,6 +3488,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char textdomain (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3804,8 +3517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_lib_c_textdomain=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_c_textdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3825,11 +3537,7 @@ else LIBS="-lintl $LIBS" 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. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3838,6 +3546,12 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char textdomain (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3861,8 +3575,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_lib_intl_textdomain=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_intl_textdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4168,7 +3881,7 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile doc/extending-gramps/Makefile doc/extending-gramps/C/Makefile example/Makefile example/gramps/Makefile omf-install/Makefile gramps.spec gramps.sh" +ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile doc/extending-gramps/Makefile doc/extending-gramps/C/Makefile example/Makefile example/gramps/Makefile omf-install/Makefile gramps.spec gramps.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4179,7 +3892,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when +# `ac_cv_env_foo' variables (set or unset) will be overriden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -4214,7 +3927,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -4276,21 +3989,6 @@ DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -4312,12 +4010,11 @@ cat >$CONFIG_STATUS <<_ACEOF # configure, is in config.log if it exists. debug=false -ac_cs_recheck=false -ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -4326,13 +4023,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -4340,42 +4035,34 @@ else as_unset=false fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -4386,7 +4073,6 @@ echo X/"$0" | /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -4397,15 +4083,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conf$$.sh + rm -f conftest.sh fi @@ -4454,8 +4140,6 @@ do as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -4529,12 +4213,6 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -4551,7 +4229,7 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 @@ -4568,7 +4246,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4608,7 +4286,6 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit - -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -4626,7 +4303,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -4647,25 +4324,25 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift ;; + -*);; *) # This is not an option, so the user has probably given explicit # arguments. - ac_option=$1 ac_need_defaults=false;; esac - case $ac_option in + case $1 in # Handling of the options. _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) @@ -4680,16 +4357,13 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + shift + CONFIG_FILES="$CONFIG_FILES $1" ac_need_defaults=false;; --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 @@ -4704,20 +4378,6 @@ Try \`$0 --help' for more information." >&2;} shift done -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@ -4772,9 +4432,6 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -4783,17 +4440,17 @@ $debug || } # Create a (secure) tmp directory for tmp files. - +: ${TMPDIR=/tmp} { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM + tmp=$TMPDIR/cs$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in ." >&2 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 { (exit 1); exit 1; } } @@ -4892,7 +4549,6 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t s,@SK_CONFIG@,$SK_CONFIG,;t t s,@SCROLLKEEPER_BUILD_REQUIRED@,$SCROLLKEEPER_BUILD_REQUIRED,;t t @@ -4906,8 +4562,6 @@ s,@GNOMEINC@,$GNOMEINC,;t t s,@GNOMELIB@,$GNOMELIB,;t t s,@GPREF@,$GPREF,;t t s,@INTLLIBS@,$INTLLIBS,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF @@ -4978,30 +4632,25 @@ echo X"$ac_file" | /^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; }; }; } + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } ac_builddir=. @@ -5031,7 +4680,7 @@ 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_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` @@ -5161,7 +4810,7 @@ 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_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` @@ -5230,30 +4879,25 @@ echo X"$file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - 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 $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } + { case $dirpart/$fdir in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy=$dirpart/$fdir +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -5282,11 +4926,8 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/gramps2/example/gramps/data.gramps b/gramps2/example/gramps/data.gramps index b386f19cc..65d86ea43 100644 --- a/gramps2/example/gramps/data.gramps +++ b/gramps2/example/gramps/data.gramps @@ -2,7 +2,7 @@
- + Joe Smith Over There @@ -104,6 +104,35 @@ + + M + + Hjalmar + Smith + + + + + + + + + + + + + + + + + + + + BIOGRAPHY + +Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith. He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil +Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. + M @@ -335,34 +364,17 @@ - + M - Hjalmar + Lars Peter Smith - - + + - - - - - - - - - - - - - - - BIOGRAPHY - -Hjalmar sailed from Copenhagen, Denmark on the OSCAR II, 14 November 1912 arriving in New York 27 November 1912. He was seventeen years old. On the ship passenger list his trade was listed as a Blacksmith. He came to Reno, Nevada and lived with his sister Marie for a time before settling in Sparks. He worked for Southern Pacific Railroad as a car inspector for a time, then went to work for Standard Oil -Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corporal in the Medical Corp until his discharge 12 August 1919 at the Presidio in San Francisco, California. Both he and Marjorie are buried in the Masonic Memorial Gardens Mausoleum in Reno, he the 30th June 1975, and she the 25th of June 1980. + F @@ -544,18 +556,6 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - - F - - Darcy - Horne - - - - - - - F @@ -597,17 +597,17 @@ Company. He enlisted in the army at Sparks 7 December 1917 and served as a Corpo - - M + + F - Lars Peter - Smith + Darcy + Horne - - + + - + M @@ -839,6 +839,7 @@ Martin was listed as being a Husman, (owning a house as opposed to a farm) in th + @@ -846,15 +847,15 @@ Martin was listed as being a Husman, (owning a house as opposed to a farm) in th - - + + - + - + diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py index 2d89d2d7d..b318165bd 100644 --- a/gramps2/src/AutoComp.py +++ b/gramps2/src/AutoComp.py @@ -41,6 +41,14 @@ import string #------------------------------------------------------------------------- import gtk +_t = type(u'') + +def patch(n): + if type(n) != _t: + return (unicode(n).lower(),unicode(n)) + else: + return (n.lower(),n) + #------------------------------------------------------------------------- # # AutoCompBase @@ -63,10 +71,11 @@ class AutoCompBase: self.nlist = source.nlist else: self.nlist = [] - self.nlist = map((lambda n: (string.lower(n),n)),plist) - self.nlist.sort() + self.nlist = map(patch,plist) + self.nlist.sort() self.nl = "xzsdkdjecsc" self.l = 0 + self.t = type(u' ') def insert_text(self,entry,new_text,new_text_len,i_dont_care): """ @@ -182,6 +191,9 @@ class AutoCombo(AutoCompBase): typed = entry.get_text() if (not typed): return + if type(typed) != self.t: + typed = unicode(typed) + typed_lc = string.lower(typed) if typed_lc == self.nl: @@ -224,7 +236,7 @@ class AutoEntry(AutoCompBase): AutoCompBase.__init__(self,widget,plist,source) self.entry = widget self.entry.connect("insert-text",self.insert_text) - + def timer_callback(self,entry): """ The workhorse routine of file completion. This routine grabs the @@ -240,6 +252,10 @@ class AutoEntry(AutoCompBase): # Get the user's text typed = entry.get_text() + + if type(typed) != self.t: + typed = unicode(typed) + if (not typed): return typed_lc = string.lower(typed) diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index d6d411a32..3ef0968dc 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -677,8 +677,17 @@ class EditPerson: self.etree.select_row(0) # Remember old combo list input - prev_btext = Utils.strip_id(self.bplace.get_text()) - prev_dtext = Utils.strip_id(self.dplace.get_text()) + + bplace_text = self.bplace.get_text() + if type(bplace_text) == type(u''): + bplace_text = unicode(bplace_text) + + dplace_text = self.dplace.get_text() + if type(dplace_text) == type(u''): + dplace_text = unicode(dplace_text) + + prev_btext = Utils.strip_id(bplace_text) + prev_dtext = Utils.strip_id(dplace_text) # Update birth with new values, make sure death values don't change if self.update_birth: @@ -745,6 +754,9 @@ class EditPerson: event = self.birth event.setDate(self.bdate.get_text()) def_placename = self.bplace.get_text() + if type(def_placename) == type(u''): + def_placename = unicode(def_placename) + p = self.get_place(self.bplace) if p: event.setPlace(p) @@ -762,6 +774,9 @@ class EditPerson: event = self.death event.setDate(self.ddate.get_text()) def_placename = self.dplace.get_text() + if type(def_placename) == type(u''): + def_placename = unicode(def_placename) + p = self.get_place(self.dplace) if p: event.setPlace(p) diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py index e808f29dc..8bc7a09b3 100644 --- a/gramps2/src/Find.py +++ b/gramps2/src/Find.py @@ -57,16 +57,13 @@ from intl import gettext as _ class FindBase: """Opens find person dialog for gramps""" - def __init__(self,clist,task,name,db): + def __init__(self,task,name,db): """Opens a dialog box instance that allows users to search for a person. - - clist - GtkCList containing the people information task - function to call to change the active person""" + self.t = type(u' ') self.db = db - self.clist = clist - self.nlist = [] self.task = task self.glade = gtk.glade.XML(const.gladeFile,"find") self.glade.signal_autoconnect({ @@ -76,38 +73,46 @@ class FindBase: }) self.top = self.glade.get_widget('find') self.entry = self.glade.get_widget('entry') + self.forward_button = self.glade.get_widget('forward') + self.back_button = self.glade.get_widget('back') Utils.set_titles(self.top, self.glade.get_widget('title'), name) + self.index = 0 + def get_value(self,id): - return None - - def enable_autocomp(self): - if GrampsCfg.autocomp: - self.comp = AutoComp.AutoEntry(self.entry,self.nlist) + return id def advance(self,func): text = self.entry.get_text() + if type(text) != self.t: + text = unicode(text.upper()) + orow = self.index func() - while self.row != orow: - id = self.clist.get_row_data(self.row) + while self.index != orow: + vals = self.list[self.index] + id = vals[1] + name = vals[0] if id == None: func() continue - if string.find(string.upper(self.get_value(id)),string.upper(text)) >= 0: - self.task(self.row) + if string.find(name.upper(),text) >= 0: + self.back_button.set_sensitive(0) + self.forward_button.set_sensitive(0) + self.task(self.get_value(id)) + self.back_button.set_sensitive(1) + self.forward_button.set_sensitive(1) return func() - gtk.gdk_beep() def forward(self): - self.row = self.row + 1 - if self.row == self.clist.rows: - self.row = 0 + self.index = self.index + 1 + if self.index == len(self.list): + self.index = 0 def backward(self): - self.row = self.row - 1 - if self.row < 0: - self.row = self.clist.rows + self.index = self.index - 1 + if self.index < 0: + self.index = len(self.list) def on_close_clicked(self,obj): """Destroys the window in response to a close window button press""" @@ -129,23 +134,19 @@ class FindBase: class FindPerson(FindBase): """Opens a Find Person dialog for GRAMPS""" - def __init__(self,id,task,db): + def __init__(self,task,db): """Opens a dialog box instance that allows users to search for a person. - clist - GtkCList containing the people information task - function to call to change the active person""" - FindBase.__init__(self,id,task,_("Find Person"),db) - for n in self.db.getPersonKeys(): - val = self.db.getPersonDisplay(n) - self.nlist.append(val[0]) - self.enable_autocomp() + FindBase.__init__(self,task,_("Find Person"),db) + self.list = db.personTable.values() + self.list.sort() def get_value(self,id): - return self.db.getPersonDisplay(id)[0] + return self.db.getPerson(id) - #------------------------------------------------------------------------- # # FindPlace @@ -154,20 +155,15 @@ class FindPerson(FindBase): class FindPlace(FindBase): """Opens a Find Place dialog for GRAMPS""" - def __init__(self,clist,task,db): + def __init__(self,task,db): """Opens a dialog box instance that allows users to search for a place. - clist - GtkCList containing the people information task - function to call to change the active person""" - FindBase.__init__(self,clist,task,_("Find Place"),db) - for n in self.db.getPlaceKeys(): - self.nlist.append(self.db.getPlaceDisplay(n)[0]) - self.enable_autocomp() - - def get_value(self,id): - return self.db.getPlaceDisplay(id)[0] + FindBase.__init__(self,task,_("Find Place"),db) + self.list = db.placeTable.values() + self.list.sort() #------------------------------------------------------------------------- # @@ -177,20 +173,15 @@ class FindPlace(FindBase): class FindSource(FindBase): """Opens a Find Place dialog for GRAMPS""" - def __init__(self,clist,task,db): + def __init__(self,task,db): """Opens a dialog box instance that allows users to search for a place. - clist - GtkCList containing the people information task - function to call to change the active person""" - FindBase.__init__(self,clist,task,_("Find Source"),db) - for n in self.db.getSourceKeys(): - self.nlist.append(n[0]) - self.enable_autocomp() - - def get_value(self,id): - return self.db.getSourceDisplay(id)[0] + FindBase.__init__(self,task,_("Find Source"),db) + self.list = db.sourceTable.values() + self.list.sort() #------------------------------------------------------------------------- # @@ -200,39 +191,15 @@ class FindSource(FindBase): class FindMedia(FindBase): """Opens a Find Media Object dialog for GRAMPS""" - def __init__(self,clist,task,db): + def __init__(self,task,db): """Opens a dialog box instance that allows users to search for a place. - clist - GtkCList containing the people information task - function to call to change the active person""" - FindBase.__init__(self,clist,task,_("Find Media Object"),db) + FindBase.__init__(self,task,_("Find Media Object"),db) + self.list = [] for n in self.db.getObjectMap().values(): - self.nlist.append(n.getDescription()) - self.enable_autocomp() + self.list.append((n.getDescription(),n.getId())) + self.list.sort() - def advance(self,func): - try: - self.row = self.clist.selection[0] - except IndexError: - gtk.gdk_beep() - return - - text = self.entry.get_text() - if self.row == None or text == "": - gtk.gdk_beep() - return - orow = self.row - func() - while self.row != orow: - value = self.clist.get_row_data(self.row) - if value == None: - func() - continue - name = value.getDescription() - if string.find(string.upper(name),string.upper(text)) >= 0: - self.task(self.row) - return - func() - gtk.gdk_beep() diff --git a/gramps2/src/ListModel.py b/gramps2/src/ListModel.py index 47c0509dc..54a359f50 100644 --- a/gramps2/src/ListModel.py +++ b/gramps2/src/ListModel.py @@ -33,8 +33,6 @@ class ListModel: self.mylist = [TYPE_STRING]*l + [TYPE_PYOBJECT] self.tree.set_rules_hint(gtk.TRUE) - self.tree.set_enable_search(gtk.TRUE) - self.tree.set_search_column(gtk.TRUE) self.new_model() self.selection = self.tree.get_selection() self.selection.set_mode(mode) diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index 199f38c19..48822b80d 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -260,7 +260,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \ - ChangeLog Makefile.am Makefile.in NEWS const.py.in + ChangeLog Makefile.am Makefile.in NEWS TODO const.py.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py index 612196760..73538bddc 100644 --- a/gramps2/src/MediaView.py +++ b/gramps2/src/MediaView.py @@ -114,7 +114,11 @@ class MediaView: self.update = update self.list.connect('button-press-event',self.on_button_press_event) self.selection.connect('changed',self.on_select_row) - + + def goto(self,id): + self.selection.unselect_all() + self.selection.select_iter(self.id2col[id]) + def change_db(self,db): self.db = db @@ -214,23 +218,6 @@ class MediaView: self.id2col[id] = iter self.model.set(iter, 0, title, 1, id, 2, type, 3, path, 4, stitle) -# if index > 0: -# self.list.select_row(current_row,0) -# self.list.moveto(current_row) -# self.preview.show() -# else: -# self.mid.set_text("") -# self.mtype.set_text("") -# self.mdesc.set_text("") -# self.mpath.set_text("") -# self.mdetails.set_text("") -# self.preview.hide() - -# if current_row < self.list.rows: -# self.list.moveto(current_row) -# else: -# self.list.moveto(0) -# self.list.thaw() def on_add_clicked(self,obj): """Add a new media object to the media list""" diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index 20bb6d194..8d83a8582 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -182,8 +182,9 @@ class PedigreeView: for t in list: if t: for n in [GrampsCfg.nameof(t[0]), - "b. %s" % t[0].getBirth().getDate(), - "d. %s" % t[0].getDeath().getDate()]: + u'b. %s' % t[0].getBirth().getDate(), + u'd. %s' % t[0].getDeath().getDate()]: + print n, type(n) try: a.set_text(n,len(n)) except TypeError: diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index bbe571400..c6400bf40 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -92,6 +92,7 @@ class PlaceView: gobject.TYPE_STRING) self.list.set_model(self.model) self.list.get_column(0).clicked() + self.selection = self.list.get_selection() def change_db(self,db): self.db = db @@ -124,8 +125,11 @@ class PlaceView: self.list.set_model(self.model) self.list.get_column(0).clicked() - def merge(self): + def goto(self,id): + self.selection.unselect_all() + self.selection.select_iter(self.id2col[id]) + def merge(self): mlist = [] self.selection.selected_foreach(self.blist,mlist) diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py index 15ed0d602..513b6d004 100644 --- a/gramps2/src/QuestionDialog.py +++ b/gramps2/src/QuestionDialog.py @@ -39,6 +39,7 @@ class SaveDialog: label2.set_text(msg2) label2.set_use_markup(gtk.TRUE) + self.top.show() response = self.top.run() if response == gtk.RESPONSE_NO: self.task1() @@ -62,6 +63,7 @@ class QuestionDialog: self.xml.get_widget('okbutton').set_label(label) + self.top.show() response = self.top.run() if response == gtk.RESPONSE_ACCEPT: task() @@ -83,6 +85,7 @@ class OptionDialog: self.xml.get_widget('option1').set_label(btnmsg1) self.xml.get_widget('option2').set_label(btnmsg2) + self.top.show() response = self.top.run() if response == gtk.RESPONSE_NO: if task1: @@ -102,6 +105,7 @@ class ErrorDialog: label1.set_text('%s' % msg1) label1.set_use_markup(gtk.TRUE) label2.set_text(msg2) + self.top.show() self.top.run() self.top.destroy() @@ -116,6 +120,7 @@ class WarningDialog: label1.set_text('%s' % msg1) label1.set_use_markup(gtk.TRUE) label2.set_text(msg2) + self.top.show() self.top.run() self.top.destroy() @@ -130,6 +135,7 @@ class OkDialog: label1.set_text('%s' % msg1) label1.set_use_markup(gtk.TRUE) label2.set_text(msg2) + self.top.show() self.top.run() self.top.destroy() diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 40399ef75..ed47e9031 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -1935,6 +1935,9 @@ class GrampsDB(Persistent): def need_autosave(self): return 1 + def getPersonLength(self): + return len(self.personTable) + def getPersonKeys(self): return self.personTable.keys() diff --git a/gramps2/src/Relationship.py b/gramps2/src/Relationship.py index a698ce125..56cf7dcf0 100644 --- a/gramps2/src/Relationship.py +++ b/gramps2/src/Relationship.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -176,6 +176,12 @@ def get_nephew(f,s,level): def get_niece(f,s,level): return "%s of %s" % (niece_level[level],f) +def is_spouse(orig,other): + for f in orig.getFamilyList(): + if other == f.getFather() or other == f.getMother(): + return 1 + return 0 + def get_relationship(orig_person,other_person): firstMap = {} firstList = [] @@ -184,6 +190,17 @@ def get_relationship(orig_person,other_person): common = [] rank = 9999999 + if orig_person == None: + return "No home person has been defined" + + firstName = orig_person.getPrimaryName().getRegularName() + secondName = other_person.getPrimaryName().getRegularName() + + if orig_person == other_person: + return firstName + if is_spouse(orig_person,other_person): + return "Spouse of %s" % (firstName) + filter(orig_person,0,firstList,firstMap) filter(other_person,0,secondList,secondMap) @@ -199,9 +216,6 @@ def get_relationship(orig_person,other_person): firstRel = -1 secondRel = -1 - firstName = orig_person.getPrimaryName().getRegularName() - secondName = other_person.getPrimaryName().getRegularName() - length = len(common) if length == 1: diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 91a22efca..21716433a 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/src/SourceView.py @@ -82,7 +82,6 @@ class SourceView: column.set_min_width(title[2]) self.list.append_column(column) - self.list.set_search_column(0) self.model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) @@ -92,13 +91,18 @@ class SourceView: def change_db(self,db): self.db = db + def goto(self,id): + self.list.get_selection().select_iter(self.map[id]) + def load_sources(self): self.model.clear() - + self.map = {} + for key in self.db.getSourceKeys(): val = self.db.getSourceDisplay(key) iter = self.model.append() + self.map[val[1]] = iter self.model.set(iter, 0, val[0], 1, val[1], 2, val[2], 3, val[3], 4, val[4]) self.list.connect('button-press-event',self.button_press) diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 0498e374f..30290afbd 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -93,6 +93,19 @@ def clear_timer(): gtk.timeout_remove(_autosave_tim) _autosave_tim = None +#------------------------------------------------------------------------- +# +# force_unicode +# +#------------------------------------------------------------------------- +_t = type(u'') + +def force_unicode(n): + if type(n) != _t: + return (unicode(n).lower(),unicode(n)) + else: + return (n.lower(),n) + #------------------------------------------------------------------------- # # Clears the modified flag. Should be called after data is saved. @@ -120,7 +133,7 @@ def phonebook_name(person): if person: return person.getPrimaryName().getName() else: - return "" + return u'' def family_name(family): """Builds a name for the family from the parents names""" @@ -146,7 +159,7 @@ def normal_name(person): if person: return person.getPrimaryName().getRegularName() else: - return "" + return u'' #------------------------------------------------------------------------- # diff --git a/gramps2/src/errdialogs.glade b/gramps2/src/errdialogs.glade index c160c62c6..3e922de6e 100644 --- a/gramps2/src/errdialogs.glade +++ b/gramps2/src/errdialogs.glade @@ -4,7 +4,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -134,7 +133,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -289,7 +287,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -430,7 +427,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -571,7 +567,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -701,7 +696,6 @@ - True GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 5fc782a57..7741f5052 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -51,7 +51,7 @@ - + True gtk-new 1 @@ -73,7 +73,7 @@ - + True gtk-open 1 @@ -95,7 +95,7 @@ - + True gtk-save 1 @@ -108,6 +108,61 @@ + + + True + Save _As... + True + + + + + True + gtk-save-as + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + _Import + True + + + + + + True + _Export + True + + + + True + gtk-convert + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True @@ -116,7 +171,7 @@ - + True gtk-revert-to-saved 1 @@ -129,55 +184,6 @@ - - - True - _Import - True - - - - - - True - Save _As... - True - - - - - True - gtk-save-as - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Export - True - - - - True - gtk-convert - 1 - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -186,7 +192,7 @@ - + True gtk-refresh 1 @@ -213,7 +219,7 @@ - + True gtk-quit 1 @@ -245,9 +251,10 @@ _Find... True + - + True gtk-find 1 @@ -268,7 +275,7 @@ - + True gtk-convert 1 @@ -336,7 +343,7 @@ - + True gtk-index 1 @@ -358,7 +365,7 @@ - + True gnome-stock-book-open 1 @@ -422,7 +429,7 @@ - + True gtk-preferences 1 @@ -443,7 +450,7 @@ - + True gtk-home 1 @@ -472,14 +479,14 @@ True - _User's manual + _User manual True - + True - gnome-stock-book-red + gtk-go-forward 1 0.5 0.5 @@ -490,6 +497,12 @@ + + + True + + + True @@ -498,7 +511,7 @@ - + True gtk-jump-to 1 @@ -519,7 +532,7 @@ - + True gnome-stock-mail 1 @@ -541,6 +554,12 @@ + + + True + + + True @@ -567,7 +586,7 @@ - + True gnome-stock-about 1 @@ -757,7 +776,7 @@ - + True People False @@ -769,6 +788,7 @@ 0.5 0 0 + views 0 @@ -806,7 +826,7 @@ True Family - False + True False GTK_JUSTIFY_LEFT False @@ -815,6 +835,7 @@ 0.5 0 0 + views 0 @@ -852,7 +873,7 @@ True Pedigree - False + True False GTK_JUSTIFY_LEFT False @@ -861,6 +882,7 @@ 0.5 0 0 + views 0 @@ -898,7 +920,7 @@ True Sources - False + True False GTK_JUSTIFY_LEFT False @@ -907,6 +929,7 @@ 0.5 0 0 + views 0 @@ -944,7 +967,7 @@ True Places - False + True False GTK_JUSTIFY_LEFT False @@ -953,6 +976,7 @@ 0.5 0 0 + views 0 @@ -990,7 +1014,7 @@ True Media - False + True False GTK_JUSTIFY_LEFT False @@ -999,6 +1023,7 @@ 0.5 0 0 + views 0 @@ -1026,8 +1051,6 @@ False GTK_POS_TOP False - 6 - 2 False @@ -1267,8 +1290,6 @@ False GTK_POS_BOTTOM False - 4 - 2 False @@ -4634,8 +4655,6 @@ True GTK_POS_TOP False - 2 - 2 False @@ -6319,7 +6338,7 @@ GTK_BUTTONBOX_END - + True True True @@ -6332,7 +6351,7 @@ - + True True True diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index 4b1f754c3..fcdbf22fa 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -3,20 +3,15 @@ import sys import os import locale -import intl -#------------------------------------------------------------------------- -# -# Cope with versioned pygtk installation. -# -#------------------------------------------------------------------------- try: import pygtk pygtk.require('2.0') except ImportError: pass -import gtk +import gtk.glade +import intl #------------------------------------------------------------------------- # @@ -26,7 +21,21 @@ import gtk if os.environ.has_key("GRAMPSI18N"): loc = os.environ["GRAMPSI18N"] else: - loc = "locale" + loc = "/usr/share/locale" + +gtk.glade.bindtextdomain("gramps",loc) +intl.bindtextdomain("gramps",loc) +intl.bind_textdomain_codeset("gramps",'UTF-8') +intl.textdomain("gramps") +locale.setlocale(locale.LC_NUMERIC,"C") + +#------------------------------------------------------------------------- +# +# Cope with versioned pygtk installation. +# +#------------------------------------------------------------------------- + +import gtk #------------------------------------------------------------------------- # @@ -40,11 +49,6 @@ if len(sys.argv) > 1: else: arg = None -intl.bindtextdomain("gramps",loc) -intl.bind_textdomain_codeset("gramps",'UTF-8') -intl.textdomain("gramps") -locale.setlocale(locale.LC_NUMERIC,"C") - try: import StartupDialog diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 4f8dc84c7..9aa42175b 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -374,7 +374,11 @@ class Gramps: def row_changed(self,obj): mlist = self.person_tree.get_selected_objects() if mlist: - self.change_active_person(self.db.getPerson(mlist[0])) + try: + self.change_active_person(self.db.getPerson(mlist[0])) + except: + self.change_active_person(None) + self.person_tree.unselect() def on_show_plugin_status(self,obj): Plugins.PluginStatus() @@ -436,35 +440,35 @@ class Gramps: def on_find_activate(self,obj): """Display the find box""" if self.views.get_current_page() == 4: - Find.FindPlace(self.active_person.getId(),self.find_goto_place,self.db) + Find.FindPlace(self.find_goto_place,self.db) elif self.views.get_current_page() == 3: - Find.FindSource(self.source_view.source_list,self.find_goto_source,self.db) + Find.FindSource(self.find_goto_source,self.db) elif self.views.get_current_page() == 5: - Find.FindMedia(self.media_view.media_list,self.find_goto_media,self.db) + Find.FindMedia(self.find_goto_media,self.db) else: - Find.FindPerson(self.person_list,self.find_goto_to,self.db) + Find.FindPerson(self.find_goto_person,self.db) def on_findname_activate(self,obj): """Display the find box""" pass - def find_goto_to(self,id): + def find_goto_person(self,id): """Find callback to jump to the selected person""" self.change_active_person(id) self.goto_active_person() self.update_display(0) - def find_goto_place(self,row): + def find_goto_place(self,id): """Find callback to jump to the selected place""" - self.place_view.moveto(row) + self.place_view.goto(id) - def find_goto_source(self,row): + def find_goto_source(self,id): """Find callback to jump to the selected source""" - self.source_view.moveto(row) + self.source_view.goto(id) def find_goto_media(self,row): """Find callback to jump to the selected media""" - self.media_view.moveto(row) + self.media_view.goto(row) def home_page_activate(self,obj): gnome.url_show(_HOMEPAGE) @@ -499,7 +503,6 @@ class Gramps: def delete_event(self,widget, event): """Catch the destruction of the top window, prompt to save if needed""" - widget.hide() self.on_exit_activate(widget) return 1 @@ -681,8 +684,6 @@ class Gramps: dbname = obj.get_data("dbname") getoldrev = obj.get_data("getoldrev") filename = dbname.get_full_path(0) - print filename - Utils.destroy_passed_object(obj) if filename == "" or filename == None: @@ -981,8 +982,9 @@ class Gramps: model.tree.scroll_to_cell(itpath,col,1,0.5,0.0) def change_active_person(self,person): - self.active_person = person - self.modify_statusbar() + if person != self.active_person: + self.active_person = person + self.modify_statusbar() if person: val = 1 else: @@ -1349,7 +1351,7 @@ class Gramps: else: self.clear_database(0) - self.status_text(_("Loading %s ...") % name) + self.status_text(_("Loading %s...") % name) if self.db.load(filename,self.load_progress) == 0: self.status_text('') return 0 diff --git a/gramps2/src/intl.py b/gramps2/src/intl.py index 2fad7fb79..4258e5f87 100644 --- a/gramps2/src/intl.py +++ b/gramps2/src/intl.py @@ -25,38 +25,46 @@ everything else fails. import sys ver = sys.version[0:3] +_trans = None try: if ver == "2.2": from intl22 import * status = None else: + import gettext as foo + status = 'Internationalization library could not be loaded' print status def gettext(s): - return s + return foo.gettext(s) def textdomain(s): - return + return foo.textdomain(s) def bindtextdomain(s,x): - return + return foo.bindtextdomain(s,x) def bind_textdomain_codeset(s,x): return except: + import gettext as foo + status = 'Internationalization library could not be loaded' - print status - - def gettext(s): - return s def textdomain(s): - return + return foo.textdomain(s) def bindtextdomain(s,x): - return + return foo.bindtextdomain(s,x) + def null(s): + return s + def bind_textdomain_codeset(s,x): - return + global gettext + try: + gettext = foo.translation(s).ugettext + except: + gettext = null diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index 2d463aa79..eea9a0940 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 Mar 31 21:01:56 2003\n" +"POT-Creation-Date: Thu Apr 3 22:44:57 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -209,8 +209,8 @@ msgstr "" #: ChooseParents.py:127 ChooseParents.py:128 ChooseParents.py:378 #: ChooseParents.py:379 SelectChild.py:101 SelectChild.py:103 const.py:153 -#: gramps.glade:3526 gramps.glade:3719 gramps.glade:4163 gramps.glade:4343 -#: gramps.glade:5799 gramps.glade:6045 plugins/EventCmp.py:306 +#: gramps.glade:3547 gramps.glade:3740 gramps.glade:4184 gramps.glade:4364 +#: gramps.glade:5818 gramps.glade:6064 plugins/EventCmp.py:306 #: plugins/FamilyGroup.py:149 plugins/GraphViz.py:335 plugins/GraphViz.py:336 msgid "Birth" msgstr "" @@ -254,16 +254,16 @@ msgstr "" msgid "from %(start_date)s to %(stop_date)s" msgstr "" -#: DbPrompter.py:65 DbPrompter.py:117 gramps_main.py:1024 revision.glade:131 +#: DbPrompter.py:65 DbPrompter.py:117 gramps_main.py:1026 revision.glade:131 msgid "Open a database" msgstr "" -#: DbPrompter.py:97 gramps_main.py:1072 +#: DbPrompter.py:97 gramps_main.py:1074 msgid "Save database" msgstr "" -#: DbPrompter.py:106 gramps_main.py:783 gramps_main.py:1084 -#: gramps_main.py:1096 +#: DbPrompter.py:106 gramps_main.py:784 gramps_main.py:1086 +#: gramps_main.py:1098 msgid "No Comment Provided" msgstr "" @@ -325,9 +325,9 @@ msgstr "" msgid "Path" msgstr "" -#: EditPerson.py:399 GrampsCfg.py:62 const.py:158 gramps.glade:3614 -#: gramps.glade:3807 gramps.glade:4229 gramps.glade:4409 gramps.glade:5887 -#: gramps.glade:6133 +#: EditPerson.py:399 GrampsCfg.py:62 const.py:158 gramps.glade:3635 +#: gramps.glade:3828 gramps.glade:4250 gramps.glade:4430 gramps.glade:5906 +#: gramps.glade:6152 msgid "None" msgstr "" @@ -341,31 +341,31 @@ msgstr "" msgid "unknown" msgstr "" -#: EditPerson.py:815 EditPerson.py:832 +#: EditPerson.py:830 EditPerson.py:847 msgid "Save Changes to %s?" msgstr "" -#: EditPerson.py:816 EditPerson.py:833 Marriage.py:404 +#: EditPerson.py:831 EditPerson.py:848 Marriage.py:404 msgid "If you close without saving, the changes you have made will be lost" msgstr "" -#: EditPerson.py:1159 +#: EditPerson.py:1174 msgid "Make the selected name the preferred name" msgstr "" -#: EditPerson.py:1222 Marriage.py:429 +#: EditPerson.py:1237 Marriage.py:429 msgid "GRAMPS ID value was not changed." msgstr "" -#: EditPerson.py:1223 +#: EditPerson.py:1238 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s." msgstr "" -#: EditPerson.py:1337 +#: EditPerson.py:1352 msgid "Problem changing the gender" msgstr "" -#: EditPerson.py:1338 +#: EditPerson.py:1353 msgid "" "Changing the gender caused problems with marriage information.\n" "Please check the person's marriages." @@ -399,7 +399,7 @@ msgstr "" msgid "Internet Address Editor" msgstr "" -#: EditPlace.py:357 gramps.glade:762 +#: EditPlace.py:357 gramps.glade:781 msgid "People" msgstr "" @@ -448,7 +448,7 @@ msgstr "" msgid "Media Objects" msgstr "" -#: EditSource.py:186 gramps.glade:946 +#: EditSource.py:186 gramps.glade:969 msgid "Places" msgstr "" @@ -494,9 +494,9 @@ msgstr "" #: FamilyView.py:423 Plugins.py:417 Plugins.py:418 Plugins.py:419 #: Plugins.py:431 Plugins.py:432 Plugins.py:433 Witness.py:71 const.py:159 -#: const.py:434 const.py:442 gramps.glade:3636 gramps.glade:3829 -#: gramps.glade:4251 gramps.glade:4431 gramps.glade:5909 gramps.glade:6155 -#: gramps_main.py:1267 plugins/WebPage.py:288 +#: const.py:434 const.py:442 gramps.glade:3657 gramps.glade:3850 +#: gramps.glade:4272 gramps.glade:4452 gramps.glade:5928 gramps.glade:6174 +#: gramps_main.py:1269 plugins/WebPage.py:288 msgid "Unknown" msgstr "" @@ -536,7 +536,7 @@ msgstr "" msgid "Failed to load the module: %s" msgstr "" -#: Find.py:139 +#: Find.py:143 msgid "Find Person" msgstr "" @@ -544,11 +544,11 @@ msgstr "" msgid "Find Place" msgstr "" -#: Find.py:187 +#: Find.py:182 msgid "Find Source" msgstr "" -#: Find.py:210 +#: Find.py:200 msgid "Find Media Object" msgstr "" @@ -557,7 +557,7 @@ msgid "French Republican" msgstr "" #: GenericFilter.py:134 GenericFilter.py:167 GenericFilter.py:194 -#: GenericFilter.py:230 GenericFilter.py:257 gramps.glade:2421 +#: GenericFilter.py:230 GenericFilter.py:257 gramps.glade:2442 #: imagesel.glade:529 imagesel.glade:1275 mergedata.glade:468 #: mergedata.glade:1060 msgid "ID:" @@ -628,7 +628,7 @@ msgstr "" msgid "Given name:" msgstr "" -#: GenericFilter.py:558 edit_person.glade:1377 gramps.glade:2515 +#: GenericFilter.py:558 edit_person.glade:1377 gramps.glade:2536 #: imagesel.glade:695 msgid "Title:" msgstr "" @@ -861,7 +861,7 @@ msgstr "" msgid "Could not import %s" msgstr "" -#: ImageSelect.py:543 MediaView.py:166 +#: ImageSelect.py:543 MediaView.py:170 msgid "Media Object" msgstr "" @@ -869,15 +869,15 @@ msgstr "" msgid "Open in %s" msgstr "" -#: ImageSelect.py:551 MediaView.py:170 +#: ImageSelect.py:551 MediaView.py:174 msgid "Edit with the GIMP" msgstr "" -#: ImageSelect.py:553 MediaView.py:172 +#: ImageSelect.py:553 MediaView.py:176 msgid "Edit Object Properties" msgstr "" -#: ImageSelect.py:556 MediaView.py:175 +#: ImageSelect.py:556 MediaView.py:179 msgid "Convert to local copy" msgstr "" @@ -893,11 +893,11 @@ msgstr "" msgid "Person" msgstr "" -#: ImageSelect.py:835 gramps.glade:808 +#: ImageSelect.py:835 gramps.glade:828 msgid "Family" msgstr "" -#: ImageSelect.py:840 Utils.py:181 Utils.py:183 +#: ImageSelect.py:840 Utils.py:194 Utils.py:196 msgid "Source" msgstr "" @@ -913,7 +913,7 @@ msgstr "" msgid "Marriage/Relationship Editor" msgstr "" -#: Marriage.py:107 Marriage.py:565 Marriage.py:583 Utils.py:132 +#: Marriage.py:107 Marriage.py:565 Marriage.py:583 Utils.py:145 #: plugins/Check.py:162 plugins/Check.py:181 msgid "%s and %s" msgstr "" @@ -931,27 +931,27 @@ msgstr "" msgid "Title" msgstr "" -#: MediaView.py:148 +#: MediaView.py:152 msgid "The file no longer exists" msgstr "" -#: MediaView.py:168 +#: MediaView.py:172 msgid "View in the default viewer" msgstr "" -#: MediaView.py:258 +#: MediaView.py:245 msgid "Delete Media Object?" msgstr "" -#: MediaView.py:259 +#: MediaView.py:246 msgid "This media object is currently being used. If you delete this object, it will be removed from the database and from all records that reference it." msgstr "" -#: MediaView.py:263 +#: MediaView.py:250 msgid "_Delete Media Object?" msgstr "" -#: MediaView.py:332 +#: MediaView.py:319 msgid "Image import failed" msgstr "" @@ -995,7 +995,7 @@ msgstr "" msgid "Custom Size" msgstr "" -#: PedView.py:370 +#: PedView.py:371 msgid "Double clicking will make %s the active person" msgstr "" @@ -1007,23 +1007,23 @@ msgstr "" msgid "Place Name" msgstr "" -#: PlaceView.py:133 gramps_main.py:486 +#: PlaceView.py:137 gramps_main.py:490 msgid "Cannot merge people." msgstr "" -#: PlaceView.py:134 +#: PlaceView.py:138 msgid "Exactly two people must be selected to perform a merge." msgstr "" -#: PlaceView.py:189 +#: PlaceView.py:193 msgid "Delete %s" msgstr "" -#: PlaceView.py:190 +#: PlaceView.py:194 msgid "This place is currently being used 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:194 +#: PlaceView.py:198 msgid "_Delete Place" msgstr "" @@ -1092,7 +1092,7 @@ msgid "The file has been moved or deleted" msgstr "" #: RelImage.py:71 RelImage.py:74 RelImage.py:139 RelImage.py:142 -#: gramps_main.py:808 gramps_main.py:813 gramps_main.py:822 +#: gramps_main.py:809 gramps_main.py:814 gramps_main.py:823 #: plugins/AncestorChart.py:113 plugins/DesGraph.py:210 #: plugins/DesGraph.py:219 plugins/WriteGedcom.py:495 #: plugins/WriteGedcom.py:500 @@ -1374,15 +1374,15 @@ msgstr "" msgid "Author" msgstr "" -#: SourceView.py:130 gramps_main.py:889 +#: SourceView.py:134 gramps_main.py:890 msgid "Delete %s?" msgstr "" -#: SourceView.py:131 +#: SourceView.py:135 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:134 +#: SourceView.py:138 msgid "_Delete Source" msgstr "" @@ -1414,15 +1414,15 @@ msgstr "" msgid "No description available" msgstr "" -#: Utils.py:176 +#: Utils.py:189 msgid "Note" msgstr "" -#: Utils.py:186 Utils.py:188 +#: Utils.py:199 Utils.py:201 msgid "Private" msgstr "" -#: Utils.py:429 +#: Utils.py:442 msgid "default" msgstr "" @@ -1494,7 +1494,7 @@ msgstr "" #: config.glade:103 config.glade:946 edit_person.glade:1233 #: edit_person.glade:2013 edit_person.glade:2497 edit_person.glade:2903 -#: gramps.glade:5692 gramps.glade:5960 marriage.glade:434 marriage.glade:901 +#: gramps.glade:5711 gramps.glade:5979 marriage.glade:434 marriage.glade:901 #: mergedata.glade:402 mergedata.glade:1036 plugins/soundex.glade:89 #: rule.glade:601 msgid "Name:" @@ -1640,13 +1640,13 @@ msgstr "" msgid "female" msgstr "" -#: const.py:154 const.py:273 gramps.glade:3548 gramps.glade:3741 -#: gramps.glade:4185 gramps.glade:4365 gramps.glade:5821 gramps.glade:6067 +#: const.py:154 const.py:273 gramps.glade:3569 gramps.glade:3762 +#: gramps.glade:4206 gramps.glade:4386 gramps.glade:5840 gramps.glade:6086 msgid "Adopted" msgstr "" -#: const.py:155 gramps.glade:3570 gramps.glade:3763 gramps.glade:4207 -#: gramps.glade:4387 gramps.glade:5843 gramps.glade:6089 +#: const.py:155 gramps.glade:3591 gramps.glade:3784 gramps.glade:4228 +#: gramps.glade:4408 gramps.glade:5862 gramps.glade:6108 msgid "Stepchild" msgstr "" @@ -1654,12 +1654,12 @@ msgstr "" msgid "Sponsored" msgstr "" -#: const.py:157 gramps.glade:3592 gramps.glade:3785 gramps.glade:5865 -#: gramps.glade:6111 +#: const.py:157 gramps.glade:3613 gramps.glade:3806 gramps.glade:5884 +#: gramps.glade:6130 msgid "Foster" msgstr "" -#: const.py:160 const.py:435 const.py:443 gramps.glade:1304 +#: const.py:160 const.py:435 const.py:443 gramps.glade:1325 #: mergedata.glade:218 msgid "Other" msgstr "" @@ -1955,7 +1955,7 @@ msgid "_Private record" msgstr "" #: dialog.glade:504 dialog.glade:1164 dialog.glade:2258 dialog.glade:3296 -#: edit_person.glade:1192 gramps.glade:4809 imagesel.glade:1560 +#: edit_person.glade:1192 gramps.glade:4828 imagesel.glade:1560 #: marriage.glade:279 mergedata.glade:378 mergedata.glade:1228 #: places.glade:513 places.glade:543 plugins/verify.glade:553 msgid "General" @@ -1964,8 +1964,8 @@ msgstr "" #: dialog.glade:570 dialog.glade:773 dialog.glade:1230 dialog.glade:2324 #: dialog.glade:3363 edit_person.glade:1728 edit_person.glade:2277 #: edit_person.glade:2689 edit_person.glade:3319 edit_person.glade:3525 -#: edit_person.glade:3803 gramps.glade:2821 gramps.glade:3231 -#: gramps.glade:4041 gramps.glade:4930 imagesel.glade:981 imagesel.glade:1763 +#: edit_person.glade:3803 gramps.glade:2842 gramps.glade:3252 +#: gramps.glade:4062 gramps.glade:4949 imagesel.glade:981 imagesel.glade:1763 #: marriage.glade:746 marriage.glade:1140 marriage.glade:1327 places.glade:899 #: places.glade:1100 places.glade:1251 places.glade:1537 rule.glade:193 #: rule.glade:880 srcsel.glade:831 styles.glade:138 @@ -1975,7 +1975,7 @@ msgstr "" #: dialog.glade:585 dialog.glade:788 dialog.glade:1245 dialog.glade:2339 #: dialog.glade:3378 edit_person.glade:1746 edit_person.glade:2295 #: edit_person.glade:2707 edit_person.glade:3337 edit_person.glade:3542 -#: edit_person.glade:3820 gramps.glade:4946 imagesel.glade:997 +#: edit_person.glade:3820 gramps.glade:4965 imagesel.glade:997 #: imagesel.glade:1779 marriage.glade:762 marriage.glade:1156 #: marriage.glade:1343 places.glade:915 places.glade:1115 places.glade:1267 #: places.glade:1553 rule.glade:211 rule.glade:899 srcsel.glade:847 @@ -1986,7 +1986,7 @@ msgstr "" #: dialog.glade:601 dialog.glade:804 dialog.glade:1261 dialog.glade:2355 #: dialog.glade:3394 edit_person.glade:1765 edit_person.glade:2314 #: edit_person.glade:2726 edit_person.glade:3356 edit_person.glade:3910 -#: gramps.glade:4966 imagesel.glade:1015 imagesel.glade:1797 +#: gramps.glade:4985 imagesel.glade:1015 imagesel.glade:1797 #: marriage.glade:779 marriage.glade:1173 marriage.glade:1360 places.glade:931 #: places.glade:1131 places.glade:1283 places.glade:1639 rule.glade:229 #: rule.glade:934 srcsel.glade:864 styles.glade:162 @@ -1994,12 +1994,12 @@ msgid "_Delete" msgstr "" #: dialog.glade:652 dialog.glade:1312 dialog.glade:2406 dialog.glade:3445 -#: gramps.glade:2155 places.glade:1182 +#: gramps.glade:2176 places.glade:1182 msgid "Sources" msgstr "" #: dialog.glade:706 dialog.glade:1364 dialog.glade:2459 dialog.glade:3498 -#: gramps.glade:4860 places.glade:1034 +#: gramps.glade:4879 places.glade:1034 msgid "Note" msgstr "" @@ -2035,7 +2035,7 @@ msgstr "" msgid "Church _parish:" msgstr "" -#: dialog.glade:1794 dialog.glade:2531 dialog.glade:2778 gramps.glade:4581 +#: dialog.glade:1794 dialog.glade:2531 dialog.glade:2778 gramps.glade:4602 #: marriage.glade:48 msgid "Accept and close" msgstr "" @@ -2060,7 +2060,7 @@ msgstr "" msgid "_Description:" msgstr "" -#: dialog.glade:2764 gramps.glade:4567 marriage.glade:34 +#: dialog.glade:2764 gramps.glade:4588 marriage.glade:34 msgid "Reject changes and close" msgstr "" @@ -2080,7 +2080,7 @@ msgstr "" msgid "T_ype:" msgstr "" -#: dialog.glade:2962 edit_person.glade:229 gramps.glade:4655 +#: dialog.glade:2962 edit_person.glade:229 gramps.glade:4674 #: imagesel.glade:235 imagesel.glade:1434 places.glade:119 srcsel.glade:296 msgid "_Title:" msgstr "" @@ -2241,7 +2241,7 @@ msgstr "" msgid "Preferred name" msgstr "" -#: edit_person.glade:721 gramps.glade:5279 +#: edit_person.glade:721 gramps.glade:5298 msgid "_male" msgstr "" @@ -2295,7 +2295,7 @@ msgid "Family prefix:" msgstr "" #: edit_person.glade:1401 edit_person.glade:1941 edit_person.glade:2425 -#: gramps.glade:2396 imagesel.glade:812 imagesel.glade:1642 marriage.glade:338 +#: gramps.glade:2417 imagesel.glade:812 imagesel.glade:1642 marriage.glade:338 #: marriage.glade:925 msgid "Type:" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "Notes" msgstr "" -#: edit_person.glade:3522 gramps.glade:4927 marriage.glade:1324 +#: edit_person.glade:3522 gramps.glade:4946 marriage.glade:1324 msgid "Place new media object in this gallery" msgstr "" @@ -2405,7 +2405,7 @@ msgstr "" msgid "Edit the properties of the selected object" msgstr "" -#: edit_person.glade:3557 gramps.glade:4963 marriage.glade:1357 +#: edit_person.glade:3557 gramps.glade:4982 marriage.glade:1357 msgid "Remove selected object from this gallery only" msgstr "" @@ -2413,7 +2413,7 @@ msgstr "" msgid "_Remove" msgstr "" -#: edit_person.glade:3599 gramps.glade:5018 marriage.glade:1392 +#: edit_person.glade:3599 gramps.glade:5037 marriage.glade:1392 #: places.glade:1335 msgid "Gallery" msgstr "" @@ -2491,17 +2491,17 @@ msgstr "" msgid "LDS" msgstr "" -#: errdialogs.glade:61 errdialogs.glade:216 errdialogs.glade:357 -#: errdialogs.glade:498 errdialogs.glade:628 errdialogs.glade:758 +#: errdialogs.glade:60 errdialogs.glade:214 errdialogs.glade:354 +#: errdialogs.glade:494 errdialogs.glade:623 errdialogs.glade:752 msgid "label2" msgstr "" -#: errdialogs.glade:105 errdialogs.glade:260 errdialogs.glade:401 -#: errdialogs.glade:542 errdialogs.glade:672 errdialogs.glade:802 +#: errdialogs.glade:104 errdialogs.glade:258 errdialogs.glade:398 +#: errdialogs.glade:538 errdialogs.glade:667 errdialogs.glade:796 msgid "label1" msgstr "" -#: errdialogs.glade:162 +#: errdialogs.glade:160 msgid "Close _without saving" msgstr "" @@ -2609,432 +2609,432 @@ msgstr "" msgid "_Save" msgstr "" -#: gramps.glade:114 gramps_main.py:1041 -msgid "_Revert" -msgstr "" - -#: gramps.glade:135 -msgid "_Import" -msgstr "" - -#: gramps.glade:143 +#: gramps.glade:114 msgid "Save _As..." msgstr "" -#: gramps.glade:164 +#: gramps.glade:141 +msgid "_Import" +msgstr "" + +#: gramps.glade:149 msgid "_Export" msgstr "" -#: gramps.glade:184 +#: gramps.glade:169 gramps_main.py:1043 +msgid "_Revert" +msgstr "" + +#: gramps.glade:190 msgid "Re_load plugins" msgstr "" -#: gramps.glade:211 +#: gramps.glade:217 msgid "_Quit" msgstr "" -#: gramps.glade:236 +#: gramps.glade:242 msgid "_Edit" msgstr "" -#: gramps.glade:245 +#: gramps.glade:251 msgid "_Find..." msgstr "" -#: gramps.glade:266 plugins/merge.glade:126 +#: gramps.glade:273 plugins/merge.glade:126 msgid "_Merge" msgstr "" -#: gramps.glade:291 +#: gramps.glade:298 msgid "_View" msgstr "" -#: gramps.glade:300 +#: gramps.glade:307 msgid "_Sidebar" msgstr "" -#: gramps.glade:310 +#: gramps.glade:317 msgid "_Filter" msgstr "" -#: gramps.glade:324 +#: gramps.glade:331 msgid "_Bookmarks" msgstr "" -#: gramps.glade:333 +#: gramps.glade:340 msgid "_Add bookmark" msgstr "" -#: gramps.glade:355 +#: gramps.glade:362 msgid "_Edit bookmarks" msgstr "" -#: gramps.glade:383 +#: gramps.glade:390 msgid "_Go to bookmark" msgstr "" -#: gramps.glade:395 +#: gramps.glade:402 msgid "_Reports" msgstr "" -#: gramps.glade:403 +#: gramps.glade:410 msgid "_Tools" msgstr "" -#: gramps.glade:411 +#: gramps.glade:418 msgid "_Settings" msgstr "" -#: gramps.glade:420 +#: gramps.glade:427 msgid "Prefere_nces" msgstr "" -#: gramps.glade:441 +#: gramps.glade:448 msgid "_Default Person" msgstr "" -#: gramps.glade:466 +#: gramps.glade:473 msgid "_Help" msgstr "" -#: gramps.glade:475 -msgid "_User's manual" +#: gramps.glade:482 +msgid "_User manual" msgstr "" -#: gramps.glade:496 +#: gramps.glade:509 msgid "GRAMPS _home page" msgstr "" -#: gramps.glade:517 +#: gramps.glade:530 msgid "GRAMPS _mailing lists" msgstr "" -#: gramps.glade:538 +#: gramps.glade:551 msgid "_Report a bug" msgstr "" -#: gramps.glade:547 +#: gramps.glade:566 msgid "_Show plugin status" msgstr "" -#: gramps.glade:556 +#: gramps.glade:575 msgid "_Open example database" msgstr "" -#: gramps.glade:565 +#: gramps.glade:584 msgid "_About" msgstr "" -#: gramps.glade:615 +#: gramps.glade:634 msgid "Open file" msgstr "" -#: gramps.glade:616 +#: gramps.glade:635 msgid "Open" msgstr "" -#: gramps.glade:626 +#: gramps.glade:645 msgid "Save file" msgstr "" -#: gramps.glade:627 +#: gramps.glade:646 msgid "Save" msgstr "" -#: gramps.glade:637 +#: gramps.glade:656 msgid "Make the home person the active person" msgstr "" -#: gramps.glade:638 +#: gramps.glade:657 msgid "Home" msgstr "" -#: gramps.glade:648 +#: gramps.glade:667 msgid "Generate reports" msgstr "" -#: gramps.glade:649 +#: gramps.glade:668 msgid "Reports" msgstr "" -#: gramps.glade:662 +#: gramps.glade:681 msgid "Run a tool" msgstr "" -#: gramps.glade:663 +#: gramps.glade:682 msgid "Tools" msgstr "" -#: gramps.glade:673 +#: gramps.glade:692 msgid "Add a new item" msgstr "" -#: gramps.glade:674 +#: gramps.glade:693 msgid "Add" msgstr "" -#: gramps.glade:687 +#: gramps.glade:706 msgid "Remove the currently selected item" msgstr "" -#: gramps.glade:688 +#: gramps.glade:707 msgid "Remove" msgstr "" -#: gramps.glade:698 +#: gramps.glade:717 msgid "Edit the selected item" msgstr "" -#: gramps.glade:699 +#: gramps.glade:718 msgid "Edit" msgstr "" -#: gramps.glade:854 +#: gramps.glade:875 msgid "Pedigree" msgstr "" -#: gramps.glade:900 plugins/IndivComplete.py:299 plugins/WebPage.py:204 +#: gramps.glade:922 plugins/IndivComplete.py:299 plugins/WebPage.py:204 msgid "Sources" msgstr "" -#: gramps.glade:992 +#: gramps.glade:1016 msgid "Media" msgstr "" -#: gramps.glade:1055 +#: gramps.glade:1078 msgid "Filter:" msgstr "" -#: gramps.glade:1108 +#: gramps.glade:1131 msgid "Qualifier:" msgstr "" -#: gramps.glade:1161 +#: gramps.glade:1184 msgid "Show persons that do not match the filtering rule" msgstr "" -#: gramps.glade:1163 +#: gramps.glade:1186 msgid "Invert" msgstr "" -#: gramps.glade:1218 +#: gramps.glade:1241 msgid "_Apply" msgstr "" -#: gramps.glade:1336 +#: gramps.glade:1357 msgid "People" msgstr "" -#: gramps.glade:1365 +#: gramps.glade:1386 msgid "Exchange the current spouse with the active person" msgstr "" -#: gramps.glade:1430 +#: gramps.glade:1451 msgid "Adds a spouse" msgstr "" -#: gramps.glade:1456 +#: gramps.glade:1477 msgid "Removes the currently selected spouse" msgstr "" -#: gramps.glade:1498 +#: gramps.glade:1519 msgid "Make the active person's family the active family" msgstr "" -#: gramps.glade:1524 +#: gramps.glade:1545 msgid "Adds a new set of parents to the active person" msgstr "" -#: gramps.glade:1550 +#: gramps.glade:1571 msgid "Deletes the selected parents from the active person" msgstr "" -#: gramps.glade:1595 gramps.glade:1869 +#: gramps.glade:1616 gramps.glade:1890 msgid "Double-click to edit the selected parents" msgstr "" -#: gramps.glade:1622 +#: gramps.glade:1643 msgid "Make the selected spouse's family the active family" msgstr "" -#: gramps.glade:1648 +#: gramps.glade:1669 msgid "Adds a new set of parents to the selected spouse" msgstr "" -#: gramps.glade:1674 +#: gramps.glade:1695 msgid "Deletes the selected parents from the selected spouse" msgstr "" -#: gramps.glade:1710 +#: gramps.glade:1731 msgid "Children" msgstr "" -#: gramps.glade:1734 +#: gramps.glade:1755 msgid "Active person" msgstr "" -#: gramps.glade:1758 +#: gramps.glade:1779 msgid "Active person's parents" msgstr "" -#: gramps.glade:1782 +#: gramps.glade:1803 msgid "Spouse" msgstr "" -#: gramps.glade:1806 +#: gramps.glade:1827 msgid "Spouse's parents" msgstr "" -#: gramps.glade:1899 +#: gramps.glade:1920 msgid "Double-click to edit the active person" msgstr "" -#: gramps.glade:1929 +#: gramps.glade:1950 msgid "Double-click to edit the relationship information" msgstr "" -#: gramps.glade:1956 +#: gramps.glade:1977 msgid "Make the selected child the active person" msgstr "" -#: gramps.glade:1982 +#: gramps.glade:2003 msgid "Adds a new child to the selected family" msgstr "" -#: gramps.glade:2008 +#: gramps.glade:2029 msgid "Deletes the selected child from the selected family" msgstr "" -#: gramps.glade:2050 +#: gramps.glade:2071 msgid "Family" msgstr "" -#: gramps.glade:2097 +#: gramps.glade:2118 msgid "Pedigree" msgstr "" -#: gramps.glade:2213 +#: gramps.glade:2234 msgid "Places" msgstr "" -#: gramps.glade:2264 imagesel.glade:142 imagesel.glade:469 imagesel.glade:1215 +#: gramps.glade:2285 imagesel.glade:142 imagesel.glade:469 imagesel.glade:1215 msgid "Preview" msgstr "" -#: gramps.glade:2300 +#: gramps.glade:2321 msgid "Details:" msgstr "" -#: gramps.glade:2371 imagesel.glade:505 imagesel.glade:1251 +#: gramps.glade:2392 imagesel.glade:505 imagesel.glade:1251 msgid "Path:" msgstr "" -#: gramps.glade:2540 plugins/gedcomimport.glade:209 +#: gramps.glade:2561 plugins/gedcomimport.glade:209 msgid "Information" msgstr "" -#: gramps.glade:2612 +#: gramps.glade:2633 msgid "Media" msgstr "" -#: gramps.glade:2868 marriage.glade:127 +#: gramps.glade:2889 marriage.glade:127 msgid "_Relationship type:" msgstr "" -#: gramps.glade:2959 +#: gramps.glade:2980 msgid "" "Relationship definition\n" msgstr "" -#: gramps.glade:3116 +#: gramps.glade:3137 msgid "_Father's relationship to child:" msgstr "" -#: gramps.glade:3144 +#: gramps.glade:3165 msgid "_Mother's relationship to child:" msgstr "" -#: gramps.glade:3172 +#: gramps.glade:3193 msgid "_Parents' relationship to each other:" msgstr "" -#: gramps.glade:3200 gramps.glade:6230 +#: gramps.glade:3221 gramps.glade:6249 msgid "Father" msgstr "" -#: gramps.glade:3247 gramps.glade:4057 +#: gramps.glade:3268 gramps.glade:4078 msgid "_Show all" msgstr "" -#: gramps.glade:3282 gramps.glade:6254 +#: gramps.glade:3303 gramps.glade:6273 msgid "Mother" msgstr "" -#: gramps.glade:3306 +#: gramps.glade:3327 msgid "Relationships" msgstr "" -#: gramps.glade:3400 +#: gramps.glade:3421 msgid "Show _all" msgstr "" -#: gramps.glade:4484 +#: gramps.glade:4505 msgid "Relationship to father:" msgstr "" -#: gramps.glade:4508 +#: gramps.glade:4529 msgid "Relationship to mother:" msgstr "" -#: gramps.glade:4683 +#: gramps.glade:4702 msgid "_Author:" msgstr "" -#: gramps.glade:4711 +#: gramps.glade:4730 msgid "_Publication information:" msgstr "" -#: gramps.glade:5063 imagesel.glade:1944 places.glade:1742 +#: gramps.glade:5082 imagesel.glade:1944 places.glade:1742 msgid "References" msgstr "" -#: gramps.glade:5193 +#: gramps.glade:5212 msgid "_Surname:" msgstr "" -#: gramps.glade:5223 +#: gramps.glade:5242 msgid "Gender:" msgstr "" -#: gramps.glade:5297 +#: gramps.glade:5316 msgid "_female" msgstr "" -#: gramps.glade:5326 +#: gramps.glade:5345 msgid "_Given:" msgstr "" -#: gramps.glade:5525 +#: gramps.glade:5544 msgid "_Open an existing database" msgstr "" -#: gramps.glade:5544 +#: gramps.glade:5563 msgid "Create a new _XML database" msgstr "" -#: gramps.glade:5563 +#: gramps.glade:5582 msgid "Create a new _ZODB database" msgstr "" -#: gramps.glade:5739 +#: gramps.glade:5758 msgid "_Relationship:" msgstr "" -#: gramps.glade:5984 +#: gramps.glade:6003 msgid "Relation_ship:" msgstr "" -#: gramps.glade:6419 +#: gramps.glade:6438 msgid "_Text:" msgstr "" @@ -3050,175 +3050,171 @@ msgstr "" msgid "This account is not meant for normal appication use. Running user applications in the administrative account is rarely a wise idea, and can open up potential security risks." msgstr "" -#: gramps_main.py:487 +#: gramps_main.py:491 msgid "Exactly two people must be selected to perform a merge. A second person can be selected by holding down the control key while clicking on a the desired person." msgstr "" -#: gramps_main.py:510 +#: gramps_main.py:513 msgid "Save Changes Made to the Database?" msgstr "" -#: gramps_main.py:511 +#: gramps_main.py:514 msgid "Unsaved changes exist in the current database. If you close without saving, the changes you have made will be lost." msgstr "" -#: gramps_main.py:550 +#: gramps_main.py:553 msgid "Create a New Database" msgstr "" -#: gramps_main.py:551 +#: gramps_main.py:554 msgid "Creating a new database will close the existing database, discarding any unsaved changes. You will then be prompted to create a new database" msgstr "" -#: gramps_main.py:554 +#: gramps_main.py:557 msgid "_Create New Database" msgstr "" -#: gramps_main.py:634 gramps_main.py:661 gramps_main.py:1123 +#: gramps_main.py:637 gramps_main.py:664 gramps_main.py:1125 msgid "Updating display - this may take a few seconds..." msgstr "" -#: gramps_main.py:636 gramps_main.py:663 gramps_main.py:1125 -#: gramps_main.py:1386 +#: gramps_main.py:639 gramps_main.py:666 gramps_main.py:1127 +#: gramps_main.py:1388 msgid "Updating display..." msgstr "" -#: gramps_main.py:711 +#: gramps_main.py:712 msgid "" "An autosave file exists for %s.\n" "Should this be loaded instead of the last saved version?" msgstr "" -#: gramps_main.py:716 +#: gramps_main.py:717 msgid "An autosave file was detected" msgstr "" -#: gramps_main.py:717 +#: gramps_main.py:718 msgid "GRAMPS has detected an autosave file for the selected database. This file is more recent than the last saved database. This typically happens when GRAMPS was unexpected shutdown before the data was saved. You may load this file to try to recover any missing data." msgstr "" -#: gramps_main.py:723 +#: gramps_main.py:724 msgid "_Load autosave file" msgstr "" -#: gramps_main.py:725 +#: gramps_main.py:726 msgid "Load _saved database" msgstr "" -#: gramps_main.py:759 gramps_main.py:798 +#: gramps_main.py:760 gramps_main.py:799 msgid "Database could not be opened" msgstr "" -#: gramps_main.py:760 gramps_main.py:799 +#: gramps_main.py:761 gramps_main.py:800 msgid "%s is not a directory." msgstr "" -#: gramps_main.py:761 gramps_main.py:800 +#: gramps_main.py:762 gramps_main.py:801 msgid "The file you should attempt to open should be a directory that contains a data.gramps file or a gramps.zodb file." msgstr "" -#: gramps_main.py:791 +#: gramps_main.py:792 msgid "Saving %s ..." msgstr "" -#: gramps_main.py:809 +#: gramps_main.py:810 msgid "An was detected while attempting to create the file. The operating system reported \"%s\"" msgstr "" -#: gramps_main.py:814 gramps_main.py:823 +#: gramps_main.py:815 gramps_main.py:824 msgid "An error was detected while trying to create the file" msgstr "" -#: gramps_main.py:856 +#: gramps_main.py:857 msgid "autosaving..." msgstr "" -#: gramps_main.py:859 +#: gramps_main.py:860 msgid "autosave complete" msgstr "" -#: gramps_main.py:861 +#: gramps_main.py:862 msgid "autosave failed" msgstr "" -#: gramps_main.py:890 +#: gramps_main.py:891 msgid "Deleting the person will remove the person from from the database. The data can only be recovered by closing the database without saving changes. This change will become permanent after you save the database." msgstr "" -#: gramps_main.py:895 +#: gramps_main.py:896 msgid "_Delete Person" msgstr "" -#: gramps_main.py:1037 +#: gramps_main.py:1039 msgid "Revert to last saved database?" msgstr "" -#: gramps_main.py:1038 +#: gramps_main.py:1040 msgid "Reverting to the last saved database will cause all unsaved changes to be lost, and the last saved database will be loaded." msgstr "" -#: gramps_main.py:1044 +#: gramps_main.py:1046 msgid "Could Not Revert to the Previous Database." msgstr "" -#: gramps_main.py:1045 +#: gramps_main.py:1047 msgid "GRAMPS could not find a previous version of the database" msgstr "" -#: gramps_main.py:1352 -msgid "Loading %s ..." -msgstr "" - -#: gramps_main.py:1361 +#: gramps_main.py:1354 gramps_main.py:1363 msgid "Loading %s..." msgstr "" -#: gramps_main.py:1463 +#: gramps_main.py:1465 msgid "No home person has been set." msgstr "" -#: gramps_main.py:1464 +#: gramps_main.py:1466 msgid "The home person may be set from the Settings menu." msgstr "" -#: gramps_main.py:1470 +#: gramps_main.py:1472 msgid "%s has been bookmarked" msgstr "" -#: gramps_main.py:1473 +#: gramps_main.py:1475 msgid "Could Not Set a Bookmark." msgstr "" -#: gramps_main.py:1474 +#: gramps_main.py:1476 msgid "A bookmark could not be set because no one was selected." msgstr "" -#: gramps_main.py:1486 +#: gramps_main.py:1488 msgid "Set %s as the Home Person" msgstr "" -#: gramps_main.py:1487 +#: gramps_main.py:1489 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person." msgstr "" -#: gramps_main.py:1490 +#: gramps_main.py:1492 msgid "_Set Home Person" msgstr "" -#: gramps_main.py:1535 gramps_main.py:1539 gramps_main.py:1543 +#: gramps_main.py:1537 gramps_main.py:1541 gramps_main.py:1545 msgid "Could not create database" msgstr "" -#: gramps_main.py:1536 gramps_main.py:1540 +#: gramps_main.py:1538 gramps_main.py:1542 msgid "" "The directgory ~/.gramps/example could not be created.\n" msgstr "" -#: gramps_main.py:1544 +#: gramps_main.py:1546 msgid "The directgory ~/.gramps/example could not be created." msgstr "" -#: gramps_main.py:1552 gramps_main.py:1554 +#: gramps_main.py:1554 gramps_main.py:1556 msgid "Example database not created" msgstr ""