Add openbsd to config.guess. Remove use of 'category' in xfer dialog.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2458 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2000-06-12 22:33:37 +00:00 · 2000-06-12 22:33:37 +00:00 · 7cb10bab16
commit 7cb10bab16
parent eb7702ad53
11 changed files with 1834 additions and 1284 deletions
--- a/config.guess
+++ b/config.guess
@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -23,6 +24,7 @@

 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <autoconf-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@ -35,6 +37,20 @@
 # (but try to keep the structure clean).
 #

+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@ -46,40 +62,131 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15

 # Note: order is significant - the case branches are not exclusive.

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:V*:*)
-	# After 1.2, OSF1 uses "V1.3" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
-	exit 0 ;;
    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
+	cat <<EOF >$dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./$dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
    21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
    amiga:NetBSD:*:*)
      echo m68k-cbm-netbsd${UNAME_RELEASE}
      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    Pyramid*:OSx*:*:*)
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
 	else
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    sun4*:SunOS:5.*:*)
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    i86pc:SunOS:5.*:*)
-	echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@ -99,27 +206,119 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
    atari*:NetBSD:*:*)
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor 
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
    sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
    RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
    VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:4*:UMIPS)
-	echo mips-mips-riscos4sysv
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:5*:RISCos)
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
    m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
 	exit 0 ;;
@ -130,11 +329,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m88k-motorola-sysv3
 	exit 0 ;;
    AViiON:dgux:*:*)
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
 	exit 0 ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
@ -153,15 +360,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
-   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i[34]86:AIX:*:*)
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>

 		main()
@ -172,8 +379,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 			exit(0);
 			}
 EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@ -182,7 +389,8 @@ EOF
 	fi
 	exit 0 ;;
    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@ -201,7 +409,7 @@ EOF
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
    *:BOSX:*:*)
 	echo rs6000-bull-bosx
@ -215,18 +423,50 @@ EOF
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[79] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	    9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@ -251,8 +491,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@ -261,15 +501,28 @@ EOF
    9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
+    *9??*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
    hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
    parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
        exit 0 ;;
@ -294,87 +547,326 @@ EOF
    CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
-    CRAY*C90:*:*:*)
-	echo c90-cray-unicos${UNAME_RELEASE}
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE}
 	exit 0 ;;
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
    hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i386-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
    *:Linux:*:*)
+
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	if echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
-	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux ; exit 0
-	else
-	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; ld --help 2>&1`
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
 main(argc, argv)
-int argc;
-char *argv[];
+     int argc;
+     char *argv[];
 {
-#ifdef __ELF__
-  printf ("%s-unknown-linux\n", argv[1]);
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
 #else
-  printf ("%s-unknown-linuxaout\n", argv[1]);
+  printf("unkown\n");
 #endif
  return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >$dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac
+
+			objdump --private-headers $dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.s $dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
+	  # Determine whether the default compiler is a.out or elf
+	  cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i[34]86:DYNIX/ptx:4*:*)
+    i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i[34]86:*:3.2:*)
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv32
+		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
    Intel:Mach:3*:*)
-	echo i386-unknown-mach3
+	echo i386-pc-mach3
 	exit 0 ;;
    paragon:*:*:*)
 	echo i860-intel-osf1
@ -390,28 +882,39 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
-    m680[234]0:LynxOS:2.[23]*:*)
-	echo m68k-lynx-lynxos${UNAME_RELEASE}
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i[34]86:LynxOS:2.[23]*:*)
-	echo i386-lynx-lynxos${UNAME_RELEASE}
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    TSUNAMI:LynxOS:2.[23]*:*)
-	echo sparc-lynx-lynxos${UNAME_RELEASE}
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.[23]*:*)
-	echo rs6000-lynx-lynxos${UNAME_RELEASE}
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
 	exit 0 ;;
    RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
@ -424,12 +927,62 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-qnx-qnx${UNAME_VERSION}
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@ -467,7 +1020,10 @@ main ()
 #endif
  int version;
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  exit (0);
 #endif

@ -484,7 +1040,7 @@ main ()
 #endif

 #if defined (__386BSD__)
-  printf ("i386-unknown-bsd\n"); exit (0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif

 #if defined (sequent)
@ -527,8 +1083,8 @@ main ()
 }
 EOF

-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy

 # Apollos put the system type in the environment.

--- a/505
+++ b/505
--- a/configure.in
+++ b/configure.in
@ -27,6 +27,8 @@ AC_INIT(src/guile/gnucash.h)
 AM_INIT_AUTOMAKE(gnucash,1.3.100)
 AM_CONFIG_HEADER(config.h)

+AC_CANONICAL_HOST
+
 dnl Set of available languages.
 ALL_LINGUAS="fr de en_GB sv ja"

--- a/po/de.po
+++ b/po/de.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 1.3.1\n"
-"POT-Creation-Date: 2000-06-08 12:48-0700\n"
+"POT-Creation-Date: 2000-06-12 15:20-0700\n"
 "PO-Revision-Date: 2000-06-01 20:20+0100\n"
 "Last-Translator: Jan-Uwe Finck <Jan-Uwe.Finck@bigfoot.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -692,15 +692,15 @@ msgstr "Alle Buchungen anzeigen"
 msgid "Show transactions on single lines"
 msgstr "Anzeigen der Buchungen auf einer Zeile"

-#: messages-i18n.c:128 messages-i18n.c:256
+#: messages-i18n.c:128 messages-i18n.c:255
 msgid "Sort by Amount"
 msgstr "Sortiere nach Betrag"

-#: messages-i18n.c:129 messages-i18n.c:257
+#: messages-i18n.c:129 messages-i18n.c:256
 msgid "Sort by Date"
 msgstr "Sortiere nach Datum"

-#: messages-i18n.c:130 messages-i18n.c:258
+#: messages-i18n.c:130 messages-i18n.c:257
 msgid "Sort by Description"
 msgstr "Sortiere nach Beschreibung"

@ -708,11 +708,11 @@ msgstr "Sortiere nach Beschreibung"
 msgid "Sort by the date of entry"
 msgstr "Sortiere nach Datum der Einträge"

-#: messages-i18n.c:132 messages-i18n.c:260
+#: messages-i18n.c:132 messages-i18n.c:259
 msgid "Sort by Memo"
 msgstr "Sortiere nach Memo"

-#: messages-i18n.c:133 messages-i18n.c:261
+#: messages-i18n.c:133 messages-i18n.c:260
 msgid "Sort by Num"
 msgstr "Sortiere nach Nummer"

@ -1185,614 +1185,611 @@ msgid "Show All"
 msgstr "Alles anzeigen"

 #: messages-i18n.c:251
-msgid "Show Inc/Exp"
+#, fuzzy
+msgid "Show Income/Expense"
 msgstr "Einnahmen/Ausgaben anzeigen"

 #: messages-i18n.c:252
-msgid "Show Categories"
-msgstr "Kategorien Anzeigen"
-
-#: messages-i18n.c:253
 msgid "Show Earliest"
 msgstr "Zeige den ersten"

-#: messages-i18n.c:254
+#: messages-i18n.c:253
 msgid "Show Latest"
 msgstr "Zeige den letzten"

-#: messages-i18n.c:255 po/guile_strings.txt:190
+#: messages-i18n.c:254 po/guile_strings.txt:190
 msgid "Single Line"
 msgstr "Einfache Zeile"

-#: messages-i18n.c:259
+#: messages-i18n.c:258
 msgid "Sort by date of entry"
 msgstr "Nach Datum sortieren"

-#: messages-i18n.c:262
+#: messages-i18n.c:261
 msgid "Sort by statement date"
 msgstr "Nach Datum des Statement sortieren"

-#: messages-i18n.c:263
+#: messages-i18n.c:262
 msgid "Sort Order"
 msgstr "Sortierreihenfolge"

-#: messages-i18n.c:264
+#: messages-i18n.c:263
 msgid "Start date"
 msgstr "Anfangsdatum"

-#: messages-i18n.c:265
+#: messages-i18n.c:264
 msgid "Starting Balance"
 msgstr "Anfangssaldo"

-#: messages-i18n.c:266
+#: messages-i18n.c:265
 msgid "Standard order"
 msgstr "Standard Order"

-#: messages-i18n.c:267
+#: messages-i18n.c:266
 msgid "Statement Date:"
 msgstr "Datum des Statement:"

-#: messages-i18n.c:268
+#: messages-i18n.c:267
 msgid "Top level account"
 msgstr "Top Level Konto"

-#: messages-i18n.c:269
+#: messages-i18n.c:268
 msgid "Total Shares"
 msgstr "Anzahl Aktien gesamt"

-#: messages-i18n.c:270
+#: messages-i18n.c:269
 msgid "Verify Changes"
 msgstr "Änderungen überprüfen"

-#: messages-i18n.c:271
+#: messages-i18n.c:270
 msgid "Transfer Information"
 msgstr "Buchungs Information"

-#: messages-i18n.c:272
+#: messages-i18n.c:271
 msgid "Transfer Money"
 msgstr "Geld übertragen"

-#: messages-i18n.c:273
+#: messages-i18n.c:272
 msgid "Transfer From"
 msgstr "Gegenkonto"

-#: messages-i18n.c:274
+#: messages-i18n.c:273
 msgid "Transfer To"
 msgstr "Transferiere auf"

-#: messages-i18n.c:275
+#: messages-i18n.c:274
 msgid "About"
 msgstr "Über"

-#: messages-i18n.c:276 po/guile_strings.txt:65
+#: messages-i18n.c:275 po/guile_strings.txt:65
 #: src/gnome/glade-gnc-dialogs.c:1784
 msgid "Account"
 msgstr "Konto"

-#: messages-i18n.c:277 src/gnome/glade-gnc-dialogs.c:302
+#: messages-i18n.c:276 src/gnome/glade-gnc-dialogs.c:302
 #: src/gnome/glade-gnc-dialogs.c:462
 msgid "Accounts"
 msgstr "Konten"

-#: messages-i18n.c:278
+#: messages-i18n.c:277
 msgid "Account Information"
 msgstr "Kontenbeschreibung"

-#: messages-i18n.c:279
+#: messages-i18n.c:278
 msgid "AutoDep"
 msgstr "AutoDepot"

-#: messages-i18n.c:280 src/gnome/glade-gnc-dialogs.c:2398
+#: messages-i18n.c:279 src/gnome/glade-gnc-dialogs.c:2398
 msgid "Action"
 msgstr "Aktion"

-#: messages-i18n.c:281
+#: messages-i18n.c:280
 msgid "Activities"
 msgstr "Aktivitäten"

-#: messages-i18n.c:282
+#: messages-i18n.c:281
 msgid "Ago"
 msgstr "Vor"

-#: messages-i18n.c:283 po/guile_strings.txt:57
+#: messages-i18n.c:282 po/guile_strings.txt:57
 #: src/gnome/glade-gnc-dialogs.c:2138
 msgid "Amount"
 msgstr "Betrag"

-#: messages-i18n.c:284 po/guile_strings.txt:239
+#: messages-i18n.c:283 po/guile_strings.txt:239
 msgid "Appreciation"
 msgstr "Wertsteigerung"

-#: messages-i18n.c:285
+#: messages-i18n.c:284
 msgid "Phone"
 msgstr "Telefon"

-#: messages-i18n.c:286 po/guile_strings.txt:174
+#: messages-i18n.c:285 po/guile_strings.txt:174
 #: src/gnome/glade-gnc-dialogs.c:567
 msgid "Asset"
 msgstr "Haben"

-#: messages-i18n.c:287
+#: messages-i18n.c:286
 msgid "Assets"
 msgstr "Haben"

-#: messages-i18n.c:288
+#: messages-i18n.c:287
 msgid "ATM"
 msgstr "Geldautomat"

-#: messages-i18n.c:289
+#: messages-i18n.c:288
 msgid "Back"
 msgstr "Zurück"

-#: messages-i18n.c:290 messages-i18n.c:291 po/guile_strings.txt:13
+#: messages-i18n.c:289 messages-i18n.c:290 po/guile_strings.txt:13
 msgid "Balance"
 msgstr "Saldo"

-#: messages-i18n.c:292 po/guile_strings.txt:107
+#: messages-i18n.c:291 po/guile_strings.txt:107
 #: src/gnome/glade-gnc-dialogs.c:561
 msgid "Bank"
 msgstr "Bank"

-#: messages-i18n.c:293
+#: messages-i18n.c:292
 msgid "Blank"
 msgstr "Leer"

-#: messages-i18n.c:294 po/guile_strings.txt:124
+#: messages-i18n.c:293 po/guile_strings.txt:124
 msgid "Bought"
 msgstr "Gekauft"

-#: messages-i18n.c:295
+#: messages-i18n.c:294
 msgid "Buy"
 msgstr "Kauf"

-#: messages-i18n.c:296
+#: messages-i18n.c:295
 msgid "Cancel"
 msgstr "Abbrechen"

-#: messages-i18n.c:297 po/guile_strings.txt:137
+#: messages-i18n.c:296 po/guile_strings.txt:137
 #: src/gnome/glade-gnc-dialogs.c:564
 msgid "Cash"
 msgstr "Bargeld"

-#: messages-i18n.c:298
+#: messages-i18n.c:297
 msgid "Changed"
 msgstr "Geändert"

-#: messages-i18n.c:299 po/guile_strings.txt:205
+#: messages-i18n.c:298 po/guile_strings.txt:205
 msgid "Charge"
 msgstr "Belastung"

-#: messages-i18n.c:300
+#: messages-i18n.c:299
 msgid "Check"
 msgstr "Scheck"

-#: messages-i18n.c:301
+#: messages-i18n.c:300
 msgid "Checking"
 msgstr "Girokonto"

-#: messages-i18n.c:302 src/gnome/glade-gnc-dialogs.c:2449
+#: messages-i18n.c:301 src/gnome/glade-gnc-dialogs.c:2449
 msgid "Cleared"
 msgstr "Abgestimmt"

-#: messages-i18n.c:303
+#: messages-i18n.c:302
 msgid "Close"
 msgstr "Schliessen"

-#: messages-i18n.c:304
+#: messages-i18n.c:303
 msgid "Commit"
 msgstr "Überweisung"

-#: messages-i18n.c:305
+#: messages-i18n.c:304
 msgid "Create"
 msgstr "Anlegen"

-#: messages-i18n.c:306 po/guile_strings.txt:254
+#: messages-i18n.c:305 po/guile_strings.txt:254
 #: src/gnome/glade-gnc-dialogs.c:570 src/gnome/glade-gnc-dialogs.c:2082
 msgid "Credit"
 msgstr "Haben"

-#: messages-i18n.c:307
+#: messages-i18n.c:306
 msgid "Credits"
 msgstr "Kredite"

-#: messages-i18n.c:308 po/guile_strings.txt:134
+#: messages-i18n.c:307 po/guile_strings.txt:134
 #: src/gnome/glade-gnc-dialogs.c:582
 msgid "Currency"
 msgstr "Währung"

-#: messages-i18n.c:309 po/guile_strings.txt:6
+#: messages-i18n.c:308 po/guile_strings.txt:6
 #: src/gnome/glade-gnc-dialogs.c:1920
 msgid "Date"
 msgstr "Datum"

-#: messages-i18n.c:310
+#: messages-i18n.c:309
 msgid "Days"
 msgstr "Tage"

-#: messages-i18n.c:311 po/guile_strings.txt:38
+#: messages-i18n.c:310 po/guile_strings.txt:38
 #: src/gnome/glade-gnc-dialogs.c:2085
 msgid "Debit"
 msgstr "Soll"

-#: messages-i18n.c:312
+#: messages-i18n.c:311
 msgid "Debits"
 msgstr "Schulden"

-#: messages-i18n.c:313
+#: messages-i18n.c:312
 msgid "Decrease"
 msgstr "Abnahme"

-#: messages-i18n.c:314
+#: messages-i18n.c:313
 msgid "Deficit"
 msgstr "Defizit"

-#: messages-i18n.c:315 src/gnome/glade-gnc-dialogs.c:2868
+#: messages-i18n.c:314 src/gnome/glade-gnc-dialogs.c:2868
 msgid "Delete"
 msgstr "Löschen"

-#: messages-i18n.c:316 po/guile_strings.txt:200
+#: messages-i18n.c:315 po/guile_strings.txt:200
 msgid "Deposit"
 msgstr "Gutschrift"

-#: messages-i18n.c:317 po/guile_strings.txt:160
+#: messages-i18n.c:316 po/guile_strings.txt:160
 msgid "Depreciation"
 msgstr "Kursverlust"

-#: messages-i18n.c:318 po/guile_strings.txt:153
+#: messages-i18n.c:317 po/guile_strings.txt:153
 #: src/gnome/glade-gnc-dialogs.c:1978
 msgid "Description"
 msgstr "Beschreibung"

-#: messages-i18n.c:319
+#: messages-i18n.c:318
 msgid "Difference"
 msgstr "Diffenrenz"

-#: messages-i18n.c:320
+#: messages-i18n.c:319
 msgid "Direct Debit"
 msgstr "Soll"

-#: messages-i18n.c:321
+#: messages-i18n.c:320
 msgid "Dist"
 msgstr "Spende"

-#: messages-i18n.c:322
+#: messages-i18n.c:321
 msgid "Div"
 msgstr "Dividende"

-#: messages-i18n.c:323
+#: messages-i18n.c:322
 msgid "Duplicate"
 msgstr "Wiederholen"

-#: messages-i18n.c:324
+#: messages-i18n.c:323
 msgid "Edit"
 msgstr "Bearbeiten"

-#: messages-i18n.c:325 po/guile_strings.txt:8
+#: messages-i18n.c:324 po/guile_strings.txt:8
 #: src/gnome/glade-gnc-dialogs.c:591
 msgid "Equity"
 msgstr "Nettowert"

-#: messages-i18n.c:326
+#: messages-i18n.c:325
 msgid "Exit"
 msgstr "Beenden"

-#: messages-i18n.c:327 po/guile_strings.txt:327
+#: messages-i18n.c:326 po/guile_strings.txt:327
 #: src/gnome/glade-gnc-dialogs.c:588
 msgid "Expense"
 msgstr "Ausgabe"

-#: messages-i18n.c:328
+#: messages-i18n.c:327
 msgid "Export"
 msgstr "Exportieren"

-#: messages-i18n.c:329 po/guile_strings.txt:355
+#: messages-i18n.c:328 po/guile_strings.txt:355
 msgid "Extensions"
 msgstr "Erweiterungen"

-#: messages-i18n.c:330
+#: messages-i18n.c:329
 msgid "Fee"
 msgstr "Gebühr"

-#: messages-i18n.c:331
+#: messages-i18n.c:330
 msgid "Field"
 msgstr "Feld"

-#: messages-i18n.c:332
+#: messages-i18n.c:331
 msgid "File"
 msgstr "Datei"

-#: messages-i18n.c:333 src/gnome/glade-gnc-dialogs.c:2523
+#: messages-i18n.c:332 src/gnome/glade-gnc-dialogs.c:2523
 msgid "Find"
 msgstr "Suche"

-#: messages-i18n.c:334
+#: messages-i18n.c:333
 msgid "Forward"
 msgstr "Vorwärts"

-#: messages-i18n.c:335 po/guile_strings.txt:126
+#: messages-i18n.c:334 po/guile_strings.txt:126
 msgid "From"
 msgstr "Von"

-#: messages-i18n.c:336
+#: messages-i18n.c:335
 msgid "GnuCash Preferences"
 msgstr "GnuCash Einstellungen"

-#: messages-i18n.c:337
+#: messages-i18n.c:336
 msgid "Help"
 msgstr "Hilfe"

-#: messages-i18n.c:338
+#: messages-i18n.c:337
 msgid "Imbalance"
 msgstr "unausgeglichenes Saldo"

-#: messages-i18n.c:339
+#: messages-i18n.c:338
 msgid "Import"
 msgstr "QIF Import"

-#: messages-i18n.c:340 po/guile_strings.txt:244
+#: messages-i18n.c:339 po/guile_strings.txt:244
 #: src/gnome/glade-gnc-dialogs.c:585
 msgid "Income"
 msgstr "Einnahme"

-#: messages-i18n.c:341
+#: messages-i18n.c:340
 msgid "Increase"
 msgstr "Zunahme"

-#: messages-i18n.c:342
+#: messages-i18n.c:341
 msgid "Int"
 msgstr "Beteiligung"

-#: messages-i18n.c:343
+#: messages-i18n.c:342
 msgid "Jump"
 msgstr "Sprung"

-#: messages-i18n.c:344 po/guile_strings.txt:194
+#: messages-i18n.c:343 po/guile_strings.txt:194
 #: src/gnome/glade-gnc-dialogs.c:573
 msgid "Liability"
 msgstr "Verbindlichkeiten"

-#: messages-i18n.c:345
+#: messages-i18n.c:344
 msgid "License"
 msgstr "Lizenz"

-#: messages-i18n.c:346
+#: messages-i18n.c:345
 msgid "Loan"
 msgstr "Darlehen"

-#: messages-i18n.c:347
+#: messages-i18n.c:346
 msgid "LTCG"
 msgstr "Zinsen aus langfristigen Kapitalanlagen"

-#: messages-i18n.c:348 po/guile_strings.txt:32
+#: messages-i18n.c:347 po/guile_strings.txt:32
 #: src/gnome/glade-gnc-dialogs.c:2196
 msgid "Memo"
 msgstr "Memo"

-#: messages-i18n.c:349
+#: messages-i18n.c:348
 msgid "Months"
 msgstr "Monate"

-#: messages-i18n.c:350
+#: messages-i18n.c:349
 msgid "New"
 msgstr "Neu"

-#: messages-i18n.c:351
+#: messages-i18n.c:350
 msgid "No"
 msgstr "Nein"

-#: messages-i18n.c:352 src/gnome/print-session.c:111
+#: messages-i18n.c:351 src/gnome/print-session.c:111
 #: src/gnome/print-session.c:200
 msgid "(none)"
 msgstr "(kein(e))"

-#: messages-i18n.c:353 po/guile_strings.txt:209
+#: messages-i18n.c:352 po/guile_strings.txt:209
 msgid "Notes"
 msgstr "Notizen"

-#: messages-i18n.c:354 po/guile_strings.txt:176
+#: messages-i18n.c:353 po/guile_strings.txt:176
 msgid "Num"
 msgstr "Num"

-#: messages-i18n.c:355
+#: messages-i18n.c:354
 msgid "Ok"
 msgstr "Ok"

-#: messages-i18n.c:356
+#: messages-i18n.c:355
 msgid "Online"
 msgstr "Online"

-#: messages-i18n.c:357
+#: messages-i18n.c:356
 msgid "Open"
 msgstr "Öffnen"

-#: messages-i18n.c:358
+#: messages-i18n.c:357
 msgid "Orphan"
 msgstr "Waisenkind"

-#: messages-i18n.c:359
+#: messages-i18n.c:358
 msgid "Parameters"
 msgstr "Parameter"

-#: messages-i18n.c:360 po/guile_strings.txt:114
+#: messages-i18n.c:359 po/guile_strings.txt:114
 msgid "Payment"
 msgstr "Belastung"

-#: messages-i18n.c:361
+#: messages-i18n.c:360
 msgid "Portfolio"
 msgstr "Portfolio"

-#: messages-i18n.c:362
+#: messages-i18n.c:361
 msgid "POS"
 msgstr "Karten-Terminal"

-#: messages-i18n.c:363
+#: messages-i18n.c:362
 msgid "Preferences"
 msgstr "Einstellungen"

-#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:2340
+#: messages-i18n.c:363 src/gnome/glade-gnc-dialogs.c:2340
 msgid "Price"
 msgstr "Preis"

-#: messages-i18n.c:365 src/gnome/glade-gnc-dialogs.c:937
+#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:937
 msgid "Print"
 msgstr "Drucken"

-#: messages-i18n.c:366
+#: messages-i18n.c:365
 msgid "Profits"
 msgstr "Gewinn / Verlust"

-#: messages-i18n.c:367
+#: messages-i18n.c:366
 msgid "Quit"
 msgstr "Beenden"

-#: messages-i18n.c:368 po/guile_strings.txt:18
+#: messages-i18n.c:367 po/guile_strings.txt:18
 msgid "Rebate"
 msgstr "Rabatt"

-#: messages-i18n.c:369 po/guile_strings.txt:191
+#: messages-i18n.c:368 po/guile_strings.txt:191
 msgid "Receive"
 msgstr "Empfangen"

-#: messages-i18n.c:370
+#: messages-i18n.c:369
 msgid "Reconcile"
 msgstr "Abstimmen"

-#: messages-i18n.c:371
+#: messages-i18n.c:370
 msgid "Record"
 msgstr "Eintragen"

-#: messages-i18n.c:372 po/guile_strings.txt:215
+#: messages-i18n.c:371 po/guile_strings.txt:215
 msgid "Register"
 msgstr "Register"

-#: messages-i18n.c:373 po/guile_strings.txt:208
+#: messages-i18n.c:372 po/guile_strings.txt:208
 msgid "Report"
 msgstr "Bericht"

-#: messages-i18n.c:374
+#: messages-i18n.c:373
 msgid "Reports"
 msgstr "Berichte"

-#: messages-i18n.c:375
+#: messages-i18n.c:374
 msgid "Save"
 msgstr "Sichern"

-#: messages-i18n.c:376
+#: messages-i18n.c:375
 msgid "Savings"
 msgstr "Ersparnisse"

-#: messages-i18n.c:377
+#: messages-i18n.c:376
 msgid "Scrub"
 msgstr "Ausbuchen"

-#: messages-i18n.c:378
+#: messages-i18n.c:377
 msgid "Search Results"
 msgstr "Suchergebnisse"

-#: messages-i18n.c:379 po/guile_strings.txt:189
+#: messages-i18n.c:378 po/guile_strings.txt:189
 msgid "Security"
 msgstr "Sicherheit"

-#: messages-i18n.c:380
+#: messages-i18n.c:379
 msgid "Sell"
 msgstr "Verkauf"

-#: messages-i18n.c:381
+#: messages-i18n.c:380
 msgid "Settings"
 msgstr "Einstellungen"

-#: messages-i18n.c:382
+#: messages-i18n.c:381
 msgid "Simple"
 msgstr "Einfach"

-#: messages-i18n.c:383 po/guile_strings.txt:313
+#: messages-i18n.c:382 po/guile_strings.txt:313
 msgid "Sold"
 msgstr "Verkauft"

-#: messages-i18n.c:384 po/guile_strings.txt:51
+#: messages-i18n.c:383 po/guile_strings.txt:51
 msgid "Spend"
 msgstr "Ausgabe"

-#: messages-i18n.c:385
+#: messages-i18n.c:384
 msgid "Split"
 msgstr "Split"

-#: messages-i18n.c:386
+#: messages-i18n.c:385
 msgid "STCG"
 msgstr "Zinsen aus kurzfristigen Anlagen"

-#: messages-i18n.c:387 po/guile_strings.txt:353
+#: messages-i18n.c:386 po/guile_strings.txt:353
 #: src/gnome/glade-gnc-dialogs.c:576
 msgid "Stock"
 msgstr "Depot"

-#: messages-i18n.c:388 po/guile_strings.txt:246
+#: messages-i18n.c:387 po/guile_strings.txt:246
 msgid "Style"
 msgstr "Stil"

-#: messages-i18n.c:389
+#: messages-i18n.c:388
 msgid "Surplus"
 msgstr "Überschuß"

-#: messages-i18n.c:390
+#: messages-i18n.c:389
 msgid "Teller"
 msgstr "Zähler"

-#: messages-i18n.c:391 po/guile_strings.txt:302
+#: messages-i18n.c:390 po/guile_strings.txt:302
 msgid "To"
 msgstr "Zu"

-#: messages-i18n.c:392 src/gnome/glade-gnc-dialogs.c:2615
+#: messages-i18n.c:391 src/gnome/glade-gnc-dialogs.c:2615
 msgid "Today"
 msgstr "Heute"

-#: messages-i18n.c:393 messages-i18n.c:394 po/guile_strings.txt:207
+#: messages-i18n.c:392 messages-i18n.c:393 po/guile_strings.txt:207
 msgid "Total"
 msgstr "Gesamt"

-#: messages-i18n.c:395 po/guile_strings.txt:304
+#: messages-i18n.c:394 po/guile_strings.txt:304
 #: src/gnome/glade-gnc-dialogs.c:295 src/gnome/glade-gnc-dialogs.c:349
 msgid "Type"
 msgstr "Typ"

-#: messages-i18n.c:396
+#: messages-i18n.c:395
 msgid "Transaction"
 msgstr "Buchung"

-#: messages-i18n.c:397
+#: messages-i18n.c:396
 msgid "Transfer"
 msgstr "Transfer"

-#: messages-i18n.c:398 po/guile_strings.txt:66
+#: messages-i18n.c:397 po/guile_strings.txt:66
 msgid "Value"
 msgstr "Wert"

-#: messages-i18n.c:399
+#: messages-i18n.c:398
 msgid "WARNING"
 msgstr "WARNUNG"

-#: messages-i18n.c:400
+#: messages-i18n.c:399
 msgid "Weeks"
 msgstr "Wochen"

-#: messages-i18n.c:401
+#: messages-i18n.c:400
 msgid "Wire"
 msgstr "Telegrafische Zahlung"

-#: messages-i18n.c:402
+#: messages-i18n.c:401
 msgid "Withdraw"
 msgstr "Abhebung"

-#: messages-i18n.c:403 po/guile_strings.txt:60
+#: messages-i18n.c:402 po/guile_strings.txt:60
 #, fuzzy
 msgid "Withdrawal"
 msgstr "Abhebung"

-#: messages-i18n.c:404
+#: messages-i18n.c:403
 msgid "Years"
 msgstr "Jahre"

-#: messages-i18n.c:405
+#: messages-i18n.c:404
 msgid "Yes"
 msgstr "Ja"

@ -3637,6 +3634,9 @@ msgstr ""
 msgid "You must select a printer first."
 msgstr "Sie müssen erst einen Drucker auswählen"

+#~ msgid "Show Categories"
+#~ msgstr "Kategorien Anzeigen"
+
 #~ msgid "Import QIF File - Scripted in Guile."
 #~ msgstr "Importieren einer Quicken-Datei (QIF) - Skriptsprache Guile"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 1.3.0\n"
-"POT-Creation-Date: 2000-06-08 12:48-0700\n"
+"POT-Creation-Date: 2000-06-12 15:20-0700\n"
 "PO-Revision-Date: 2000-03-06 11:20+0000\n"
 "Last-Translator: David Woodhouse <dwmw2@infradead.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -615,15 +615,15 @@ msgstr ""
 msgid "Show transactions on single lines"
 msgstr ""

-#: messages-i18n.c:128 messages-i18n.c:256
+#: messages-i18n.c:128 messages-i18n.c:255
 msgid "Sort by Amount"
 msgstr ""

-#: messages-i18n.c:129 messages-i18n.c:257
+#: messages-i18n.c:129 messages-i18n.c:256
 msgid "Sort by Date"
 msgstr ""

-#: messages-i18n.c:130 messages-i18n.c:258
+#: messages-i18n.c:130 messages-i18n.c:257
 msgid "Sort by Description"
 msgstr ""

@ -631,11 +631,11 @@ msgstr ""
 msgid "Sort by the date of entry"
 msgstr ""

-#: messages-i18n.c:132 messages-i18n.c:260
+#: messages-i18n.c:132 messages-i18n.c:259
 msgid "Sort by Memo"
 msgstr ""

-#: messages-i18n.c:133 messages-i18n.c:261
+#: messages-i18n.c:133 messages-i18n.c:260
 msgid "Sort by Num"
 msgstr ""

@ -1114,613 +1114,609 @@ msgid "Show All"
 msgstr ""

 #: messages-i18n.c:251
-msgid "Show Inc/Exp"
+msgid "Show Income/Expense"
 msgstr ""

 #: messages-i18n.c:252
-msgid "Show Categories"
-msgstr ""
-
-#: messages-i18n.c:253
 msgid "Show Earliest"
 msgstr ""

-#: messages-i18n.c:254
+#: messages-i18n.c:253
 msgid "Show Latest"
 msgstr ""

-#: messages-i18n.c:255 po/guile_strings.txt:190
+#: messages-i18n.c:254 po/guile_strings.txt:190
 msgid "Single Line"
 msgstr ""

-#: messages-i18n.c:259
+#: messages-i18n.c:258
 msgid "Sort by date of entry"
 msgstr ""

-#: messages-i18n.c:262
+#: messages-i18n.c:261
 msgid "Sort by statement date"
 msgstr ""

-#: messages-i18n.c:263
+#: messages-i18n.c:262
 msgid "Sort Order"
 msgstr ""

-#: messages-i18n.c:264
+#: messages-i18n.c:263
 msgid "Start date"
 msgstr ""

-#: messages-i18n.c:265
+#: messages-i18n.c:264
 msgid "Starting Balance"
 msgstr ""

-#: messages-i18n.c:266
+#: messages-i18n.c:265
 msgid "Standard order"
 msgstr ""

-#: messages-i18n.c:267
+#: messages-i18n.c:266
 msgid "Statement Date:"
 msgstr ""

-#: messages-i18n.c:268
+#: messages-i18n.c:267
 msgid "Top level account"
 msgstr ""

-#: messages-i18n.c:269
+#: messages-i18n.c:268
 msgid "Total Shares"
 msgstr ""

-#: messages-i18n.c:270
+#: messages-i18n.c:269
 msgid "Verify Changes"
 msgstr ""

-#: messages-i18n.c:271
+#: messages-i18n.c:270
 msgid "Transfer Information"
 msgstr ""

-#: messages-i18n.c:272
+#: messages-i18n.c:271
 msgid "Transfer Money"
 msgstr ""

-#: messages-i18n.c:273
+#: messages-i18n.c:272
 msgid "Transfer From"
 msgstr ""

-#: messages-i18n.c:274
+#: messages-i18n.c:273
 msgid "Transfer To"
 msgstr ""

-#: messages-i18n.c:275
+#: messages-i18n.c:274
 msgid "About"
 msgstr ""

-#: messages-i18n.c:276 po/guile_strings.txt:65
+#: messages-i18n.c:275 po/guile_strings.txt:65
 #: src/gnome/glade-gnc-dialogs.c:1784
 msgid "Account"
 msgstr ""

-#: messages-i18n.c:277 src/gnome/glade-gnc-dialogs.c:302
+#: messages-i18n.c:276 src/gnome/glade-gnc-dialogs.c:302
 #: src/gnome/glade-gnc-dialogs.c:462
 msgid "Accounts"
 msgstr ""

-#: messages-i18n.c:278
+#: messages-i18n.c:277
 msgid "Account Information"
 msgstr ""

-#: messages-i18n.c:279
+#: messages-i18n.c:278
 msgid "AutoDep"
 msgstr ""

-#: messages-i18n.c:280 src/gnome/glade-gnc-dialogs.c:2398
+#: messages-i18n.c:279 src/gnome/glade-gnc-dialogs.c:2398
 msgid "Action"
 msgstr ""

-#: messages-i18n.c:281
+#: messages-i18n.c:280
 msgid "Activities"
 msgstr ""

-#: messages-i18n.c:282
+#: messages-i18n.c:281
 msgid "Ago"
 msgstr ""

-#: messages-i18n.c:283 po/guile_strings.txt:57
+#: messages-i18n.c:282 po/guile_strings.txt:57
 #: src/gnome/glade-gnc-dialogs.c:2138
 msgid "Amount"
 msgstr ""

-#: messages-i18n.c:284 po/guile_strings.txt:239
+#: messages-i18n.c:283 po/guile_strings.txt:239
 msgid "Appreciation"
 msgstr ""

-#: messages-i18n.c:285
+#: messages-i18n.c:284
 msgid "Phone"
 msgstr ""

-#: messages-i18n.c:286 po/guile_strings.txt:174
+#: messages-i18n.c:285 po/guile_strings.txt:174
 #: src/gnome/glade-gnc-dialogs.c:567
 msgid "Asset"
 msgstr ""

-#: messages-i18n.c:287
+#: messages-i18n.c:286
 msgid "Assets"
 msgstr ""

-#: messages-i18n.c:288
+#: messages-i18n.c:287
 msgid "ATM"
 msgstr ""

-#: messages-i18n.c:289
+#: messages-i18n.c:288
 msgid "Back"
 msgstr ""

-#: messages-i18n.c:290 messages-i18n.c:291 po/guile_strings.txt:13
+#: messages-i18n.c:289 messages-i18n.c:290 po/guile_strings.txt:13
 msgid "Balance"
 msgstr ""

-#: messages-i18n.c:292 po/guile_strings.txt:107
+#: messages-i18n.c:291 po/guile_strings.txt:107
 #: src/gnome/glade-gnc-dialogs.c:561
 msgid "Bank"
 msgstr ""

-#: messages-i18n.c:293
+#: messages-i18n.c:292
 msgid "Blank"
 msgstr ""

-#: messages-i18n.c:294 po/guile_strings.txt:124
+#: messages-i18n.c:293 po/guile_strings.txt:124
 msgid "Bought"
 msgstr ""

-#: messages-i18n.c:295
+#: messages-i18n.c:294
 msgid "Buy"
 msgstr ""

-#: messages-i18n.c:296
+#: messages-i18n.c:295
 msgid "Cancel"
 msgstr ""

-#: messages-i18n.c:297 po/guile_strings.txt:137
+#: messages-i18n.c:296 po/guile_strings.txt:137
 #: src/gnome/glade-gnc-dialogs.c:564
 msgid "Cash"
 msgstr ""

-#: messages-i18n.c:298
+#: messages-i18n.c:297
 msgid "Changed"
 msgstr ""

-#: messages-i18n.c:299 po/guile_strings.txt:205
+#: messages-i18n.c:298 po/guile_strings.txt:205
 msgid "Charge"
 msgstr ""

-#: messages-i18n.c:300
+#: messages-i18n.c:299
 msgid "Check"
 msgstr "Cheque"

-#: messages-i18n.c:301
+#: messages-i18n.c:300
 msgid "Checking"
 msgstr "Current"

-#: messages-i18n.c:302 src/gnome/glade-gnc-dialogs.c:2449
+#: messages-i18n.c:301 src/gnome/glade-gnc-dialogs.c:2449
 msgid "Cleared"
 msgstr ""

-#: messages-i18n.c:303
+#: messages-i18n.c:302
 msgid "Close"
 msgstr ""

-#: messages-i18n.c:304
+#: messages-i18n.c:303
 msgid "Commit"
 msgstr ""

-#: messages-i18n.c:305
+#: messages-i18n.c:304
 msgid "Create"
 msgstr ""

-#: messages-i18n.c:306 po/guile_strings.txt:254
+#: messages-i18n.c:305 po/guile_strings.txt:254
 #: src/gnome/glade-gnc-dialogs.c:570 src/gnome/glade-gnc-dialogs.c:2082
 msgid "Credit"
 msgstr ""

-#: messages-i18n.c:307
+#: messages-i18n.c:306
 msgid "Credits"
 msgstr ""

-#: messages-i18n.c:308 po/guile_strings.txt:134
+#: messages-i18n.c:307 po/guile_strings.txt:134
 #: src/gnome/glade-gnc-dialogs.c:582
 msgid "Currency"
 msgstr ""

-#: messages-i18n.c:309 po/guile_strings.txt:6
+#: messages-i18n.c:308 po/guile_strings.txt:6
 #: src/gnome/glade-gnc-dialogs.c:1920
 msgid "Date"
 msgstr ""

-#: messages-i18n.c:310
+#: messages-i18n.c:309
 msgid "Days"
 msgstr ""

-#: messages-i18n.c:311 po/guile_strings.txt:38
+#: messages-i18n.c:310 po/guile_strings.txt:38
 #: src/gnome/glade-gnc-dialogs.c:2085
 msgid "Debit"
 msgstr ""

-#: messages-i18n.c:312
+#: messages-i18n.c:311
 msgid "Debits"
 msgstr ""

-#: messages-i18n.c:313
+#: messages-i18n.c:312
 msgid "Decrease"
 msgstr ""

-#: messages-i18n.c:314
+#: messages-i18n.c:313
 msgid "Deficit"
 msgstr ""

-#: messages-i18n.c:315 src/gnome/glade-gnc-dialogs.c:2868
+#: messages-i18n.c:314 src/gnome/glade-gnc-dialogs.c:2868
 msgid "Delete"
 msgstr ""

-#: messages-i18n.c:316 po/guile_strings.txt:200
+#: messages-i18n.c:315 po/guile_strings.txt:200
 msgid "Deposit"
 msgstr ""

-#: messages-i18n.c:317 po/guile_strings.txt:160
+#: messages-i18n.c:316 po/guile_strings.txt:160
 msgid "Depreciation"
 msgstr ""

-#: messages-i18n.c:318 po/guile_strings.txt:153
+#: messages-i18n.c:317 po/guile_strings.txt:153
 #: src/gnome/glade-gnc-dialogs.c:1978
 msgid "Description"
 msgstr ""

-#: messages-i18n.c:319
+#: messages-i18n.c:318
 msgid "Difference"
 msgstr ""

-#: messages-i18n.c:320
+#: messages-i18n.c:319
 msgid "Direct Debit"
 msgstr ""

-#: messages-i18n.c:321
+#: messages-i18n.c:320
 msgid "Dist"
 msgstr ""

-#: messages-i18n.c:322
+#: messages-i18n.c:321
 msgid "Div"
 msgstr ""

-#: messages-i18n.c:323
+#: messages-i18n.c:322
 msgid "Duplicate"
 msgstr ""

-#: messages-i18n.c:324
+#: messages-i18n.c:323
 msgid "Edit"
 msgstr ""

-#: messages-i18n.c:325 po/guile_strings.txt:8
+#: messages-i18n.c:324 po/guile_strings.txt:8
 #: src/gnome/glade-gnc-dialogs.c:591
 msgid "Equity"
 msgstr ""

-#: messages-i18n.c:326
+#: messages-i18n.c:325
 msgid "Exit"
 msgstr ""

-#: messages-i18n.c:327 po/guile_strings.txt:327
+#: messages-i18n.c:326 po/guile_strings.txt:327
 #: src/gnome/glade-gnc-dialogs.c:588
 msgid "Expense"
 msgstr ""

-#: messages-i18n.c:328
+#: messages-i18n.c:327
 msgid "Export"
 msgstr ""

-#: messages-i18n.c:329 po/guile_strings.txt:355
+#: messages-i18n.c:328 po/guile_strings.txt:355
 msgid "Extensions"
 msgstr ""

-#: messages-i18n.c:330
+#: messages-i18n.c:329
 msgid "Fee"
 msgstr ""

-#: messages-i18n.c:331
+#: messages-i18n.c:330
 msgid "Field"
 msgstr ""

-#: messages-i18n.c:332
+#: messages-i18n.c:331
 msgid "File"
 msgstr ""

-#: messages-i18n.c:333 src/gnome/glade-gnc-dialogs.c:2523
+#: messages-i18n.c:332 src/gnome/glade-gnc-dialogs.c:2523
 msgid "Find"
 msgstr ""

-#: messages-i18n.c:334
+#: messages-i18n.c:333
 msgid "Forward"
 msgstr ""

-#: messages-i18n.c:335 po/guile_strings.txt:126
+#: messages-i18n.c:334 po/guile_strings.txt:126
 msgid "From"
 msgstr ""

-#: messages-i18n.c:336
+#: messages-i18n.c:335
 msgid "GnuCash Preferences"
 msgstr ""

-#: messages-i18n.c:337
+#: messages-i18n.c:336
 msgid "Help"
 msgstr ""

-#: messages-i18n.c:338
+#: messages-i18n.c:337
 msgid "Imbalance"
 msgstr ""

-#: messages-i18n.c:339
+#: messages-i18n.c:338
 msgid "Import"
 msgstr ""

-#: messages-i18n.c:340 po/guile_strings.txt:244
+#: messages-i18n.c:339 po/guile_strings.txt:244
 #: src/gnome/glade-gnc-dialogs.c:585
 msgid "Income"
 msgstr ""

-#: messages-i18n.c:341
+#: messages-i18n.c:340
 msgid "Increase"
 msgstr ""

-#: messages-i18n.c:342
+#: messages-i18n.c:341
 msgid "Int"
 msgstr ""

-#: messages-i18n.c:343
+#: messages-i18n.c:342
 msgid "Jump"
 msgstr ""

-#: messages-i18n.c:344 po/guile_strings.txt:194
+#: messages-i18n.c:343 po/guile_strings.txt:194
 #: src/gnome/glade-gnc-dialogs.c:573
 msgid "Liability"
 msgstr ""

-#: messages-i18n.c:345
+#: messages-i18n.c:344
 msgid "License"
 msgstr "Licence"

-#: messages-i18n.c:346
+#: messages-i18n.c:345
 msgid "Loan"
 msgstr ""

-#: messages-i18n.c:347
+#: messages-i18n.c:346
 msgid "LTCG"
 msgstr ""

-#: messages-i18n.c:348 po/guile_strings.txt:32
+#: messages-i18n.c:347 po/guile_strings.txt:32
 #: src/gnome/glade-gnc-dialogs.c:2196
 msgid "Memo"
 msgstr ""

-#: messages-i18n.c:349
+#: messages-i18n.c:348
 msgid "Months"
 msgstr ""

-#: messages-i18n.c:350
+#: messages-i18n.c:349
 msgid "New"
 msgstr ""

-#: messages-i18n.c:351
+#: messages-i18n.c:350
 msgid "No"
 msgstr ""

-#: messages-i18n.c:352 src/gnome/print-session.c:111
+#: messages-i18n.c:351 src/gnome/print-session.c:111
 #: src/gnome/print-session.c:200
 msgid "(none)"
 msgstr ""

-#: messages-i18n.c:353 po/guile_strings.txt:209
+#: messages-i18n.c:352 po/guile_strings.txt:209
 msgid "Notes"
 msgstr ""

-#: messages-i18n.c:354 po/guile_strings.txt:176
+#: messages-i18n.c:353 po/guile_strings.txt:176
 msgid "Num"
 msgstr ""

-#: messages-i18n.c:355
+#: messages-i18n.c:354
 msgid "Ok"
 msgstr ""

-#: messages-i18n.c:356
+#: messages-i18n.c:355
 msgid "Online"
 msgstr ""

-#: messages-i18n.c:357
+#: messages-i18n.c:356
 msgid "Open"
 msgstr ""

-#: messages-i18n.c:358
+#: messages-i18n.c:357
 msgid "Orphan"
 msgstr ""

-#: messages-i18n.c:359
+#: messages-i18n.c:358
 msgid "Parameters"
 msgstr ""

-#: messages-i18n.c:360 po/guile_strings.txt:114
+#: messages-i18n.c:359 po/guile_strings.txt:114
 msgid "Payment"
 msgstr ""

-#: messages-i18n.c:361
+#: messages-i18n.c:360
 msgid "Portfolio"
 msgstr ""

-#: messages-i18n.c:362
+#: messages-i18n.c:361
 msgid "POS"
 msgstr ""

-#: messages-i18n.c:363
+#: messages-i18n.c:362
 msgid "Preferences"
 msgstr ""

-#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:2340
+#: messages-i18n.c:363 src/gnome/glade-gnc-dialogs.c:2340
 msgid "Price"
 msgstr ""

-#: messages-i18n.c:365 src/gnome/glade-gnc-dialogs.c:937
+#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:937
 msgid "Print"
 msgstr ""

-#: messages-i18n.c:366
+#: messages-i18n.c:365
 msgid "Profits"
 msgstr ""

-#: messages-i18n.c:367
+#: messages-i18n.c:366
 msgid "Quit"
 msgstr ""

-#: messages-i18n.c:368 po/guile_strings.txt:18
+#: messages-i18n.c:367 po/guile_strings.txt:18
 msgid "Rebate"
 msgstr ""

-#: messages-i18n.c:369 po/guile_strings.txt:191
+#: messages-i18n.c:368 po/guile_strings.txt:191
 msgid "Receive"
 msgstr ""

-#: messages-i18n.c:370
+#: messages-i18n.c:369
 msgid "Reconcile"
 msgstr ""

-#: messages-i18n.c:371
+#: messages-i18n.c:370
 msgid "Record"
 msgstr ""

-#: messages-i18n.c:372 po/guile_strings.txt:215
+#: messages-i18n.c:371 po/guile_strings.txt:215
 msgid "Register"
 msgstr ""

-#: messages-i18n.c:373 po/guile_strings.txt:208
+#: messages-i18n.c:372 po/guile_strings.txt:208
 msgid "Report"
 msgstr ""

-#: messages-i18n.c:374
+#: messages-i18n.c:373
 msgid "Reports"
 msgstr ""

-#: messages-i18n.c:375
+#: messages-i18n.c:374
 msgid "Save"
 msgstr ""

-#: messages-i18n.c:376
+#: messages-i18n.c:375
 msgid "Savings"
 msgstr ""

-#: messages-i18n.c:377
+#: messages-i18n.c:376
 msgid "Scrub"
 msgstr ""

-#: messages-i18n.c:378
+#: messages-i18n.c:377
 msgid "Search Results"
 msgstr ""

-#: messages-i18n.c:379 po/guile_strings.txt:189
+#: messages-i18n.c:378 po/guile_strings.txt:189
 msgid "Security"
 msgstr ""

-#: messages-i18n.c:380
+#: messages-i18n.c:379
 msgid "Sell"
 msgstr ""

-#: messages-i18n.c:381
+#: messages-i18n.c:380
 msgid "Settings"
 msgstr ""

-#: messages-i18n.c:382
+#: messages-i18n.c:381
 msgid "Simple"
 msgstr ""

-#: messages-i18n.c:383 po/guile_strings.txt:313
+#: messages-i18n.c:382 po/guile_strings.txt:313
 msgid "Sold"
 msgstr ""

-#: messages-i18n.c:384 po/guile_strings.txt:51
+#: messages-i18n.c:383 po/guile_strings.txt:51
 msgid "Spend"
 msgstr ""

-#: messages-i18n.c:385
+#: messages-i18n.c:384
 msgid "Split"
 msgstr ""

-#: messages-i18n.c:386
+#: messages-i18n.c:385
 msgid "STCG"
 msgstr ""

-#: messages-i18n.c:387 po/guile_strings.txt:353
+#: messages-i18n.c:386 po/guile_strings.txt:353
 #: src/gnome/glade-gnc-dialogs.c:576
 msgid "Stock"
 msgstr "Share"

-#: messages-i18n.c:388 po/guile_strings.txt:246
+#: messages-i18n.c:387 po/guile_strings.txt:246
 msgid "Style"
 msgstr ""

-#: messages-i18n.c:389
+#: messages-i18n.c:388
 msgid "Surplus"
 msgstr ""

-#: messages-i18n.c:390
+#: messages-i18n.c:389
 msgid "Teller"
 msgstr ""

-#: messages-i18n.c:391 po/guile_strings.txt:302
+#: messages-i18n.c:390 po/guile_strings.txt:302
 msgid "To"
 msgstr ""

-#: messages-i18n.c:392 src/gnome/glade-gnc-dialogs.c:2615
+#: messages-i18n.c:391 src/gnome/glade-gnc-dialogs.c:2615
 msgid "Today"
 msgstr ""

-#: messages-i18n.c:393 messages-i18n.c:394 po/guile_strings.txt:207
+#: messages-i18n.c:392 messages-i18n.c:393 po/guile_strings.txt:207
 msgid "Total"
 msgstr ""

-#: messages-i18n.c:395 po/guile_strings.txt:304
+#: messages-i18n.c:394 po/guile_strings.txt:304
 #: src/gnome/glade-gnc-dialogs.c:295 src/gnome/glade-gnc-dialogs.c:349
 msgid "Type"
 msgstr ""

-#: messages-i18n.c:396
+#: messages-i18n.c:395
 msgid "Transaction"
 msgstr ""

-#: messages-i18n.c:397
+#: messages-i18n.c:396
 msgid "Transfer"
 msgstr ""

-#: messages-i18n.c:398 po/guile_strings.txt:66
+#: messages-i18n.c:397 po/guile_strings.txt:66
 msgid "Value"
 msgstr ""

-#: messages-i18n.c:399
+#: messages-i18n.c:398
 msgid "WARNING"
 msgstr ""

-#: messages-i18n.c:400
+#: messages-i18n.c:399
 msgid "Weeks"
 msgstr ""

-#: messages-i18n.c:401
+#: messages-i18n.c:400
 msgid "Wire"
 msgstr ""

-#: messages-i18n.c:402
+#: messages-i18n.c:401
 msgid "Withdraw"
 msgstr ""

-#: messages-i18n.c:403 po/guile_strings.txt:60
+#: messages-i18n.c:402 po/guile_strings.txt:60
 msgid "Withdrawal"
 msgstr ""

-#: messages-i18n.c:404
+#: messages-i18n.c:403
 msgid "Years"
 msgstr ""

-#: messages-i18n.c:405
+#: messages-i18n.c:404
 msgid "Yes"
 msgstr ""

--- a/po/fr.po
+++ b/po/fr.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnucash 1.3.X\n"
-"POT-Creation-Date: 2000-06-08 12:48-0700\n"
+"POT-Creation-Date: 2000-06-12 15:20-0700\n"
 "PO-Revision-Date: 2000-06-04 23:00+0100\n"
 "Last-Translator: Yannick LE NY <y-le-ny@ifrance.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -816,17 +816,17 @@ msgid "Show transactions on single lines"
 msgstr "Montrer les transactions sur des lignes simples"

 # messages-i18n.c:221
-#: messages-i18n.c:128 messages-i18n.c:256
+#: messages-i18n.c:128 messages-i18n.c:255
 msgid "Sort by Amount"
 msgstr "Trier par montant"

 # messages-i18n.c:222
-#: messages-i18n.c:129 messages-i18n.c:257
+#: messages-i18n.c:129 messages-i18n.c:256
 msgid "Sort by Date"
 msgstr "Trier par date"

 # messages-i18n.c:223
-#: messages-i18n.c:130 messages-i18n.c:258
+#: messages-i18n.c:130 messages-i18n.c:257
 msgid "Sort by Description"
 msgstr "Trier par description"

@ -836,12 +836,12 @@ msgid "Sort by the date of entry"
 msgstr "Trier par la date de l'entrée"

 # messages-i18n.c:224
-#: messages-i18n.c:132 messages-i18n.c:260
+#: messages-i18n.c:132 messages-i18n.c:259
 msgid "Sort by Memo"
 msgstr "Trier par mémo"

 # messages-i18n.c:225
-#: messages-i18n.c:133 messages-i18n.c:261
+#: messages-i18n.c:133 messages-i18n.c:260
 msgid "Sort by Num"
 msgstr "Trier par num"

@ -1432,771 +1432,767 @@ msgstr "Montrer Tout"

 # messages-i18n.c:216
 #: messages-i18n.c:251
-msgid "Show Inc/Exp"
+#, fuzzy
+msgid "Show Income/Expense"
 msgstr "Montrer Revenus/Dépenses"

-# messages-i18n.c:217
-#: messages-i18n.c:252
-msgid "Show Categories"
-msgstr "Montrer les catégories"
-
 # messages-i18n.c:218
-#: messages-i18n.c:253
+#: messages-i18n.c:252
 msgid "Show Earliest"
 msgstr "Montrer le premier"

 # messages-i18n.c:219
-#: messages-i18n.c:254
+#: messages-i18n.c:253
 msgid "Show Latest"
 msgstr "Montrer le dernier"

 # messages-i18n.c:220 po/guile_strings.txt:162
-#: messages-i18n.c:255 po/guile_strings.txt:190
+#: messages-i18n.c:254 po/guile_strings.txt:190
 msgid "Single Line"
 msgstr "Ligne unique"

 # po/guile_strings.txt:37
-#: messages-i18n.c:259
+#: messages-i18n.c:258
 msgid "Sort by date of entry"
 msgstr "Trier par date d'entrée"

 # po/guile_strings.txt:37
-#: messages-i18n.c:262
+#: messages-i18n.c:261
 msgid "Sort by statement date"
 msgstr "Trier par l'état de la date"

 # messages-i18n.c:226
-#: messages-i18n.c:263
+#: messages-i18n.c:262
 msgid "Sort Order"
 msgstr "Ordre de tri"

 # messages-i18n.c:227
-#: messages-i18n.c:264
+#: messages-i18n.c:263
 msgid "Start date"
 msgstr "Date de départ"

 # messages-i18n.c:179
-#: messages-i18n.c:265
+#: messages-i18n.c:264
 msgid "Starting Balance"
 msgstr "Solde du début"

 # messages-i18n.c:228
-#: messages-i18n.c:266
+#: messages-i18n.c:265
 msgid "Standard order"
 msgstr "Ordre standard"

 # messages-i18n.c:210
-#: messages-i18n.c:267
+#: messages-i18n.c:266
 msgid "Statement Date:"
 msgstr "Etat de la date:"

 # messages-i18n.c:229
-#: messages-i18n.c:268
+#: messages-i18n.c:267
 msgid "Top level account"
 msgstr "Nouveau compte de niveau supérieur/base."

 # messages-i18n.c:230
-#: messages-i18n.c:269
+#: messages-i18n.c:268
 msgid "Total Shares"
 msgstr "Total titres"

-#: messages-i18n.c:270
+#: messages-i18n.c:269
 msgid "Verify Changes"
 msgstr "Vérifier les changements"

 # messages-i18n.c:231
-#: messages-i18n.c:271
+#: messages-i18n.c:270
 msgid "Transfer Information"
 msgstr "Informations du transfert"

 # messages-i18n.c:232
-#: messages-i18n.c:272
+#: messages-i18n.c:271
 msgid "Transfer Money"
 msgstr "Transfert d'argent"

 # messages-i18n.c:233
-#: messages-i18n.c:273
+#: messages-i18n.c:272
 msgid "Transfer From"
 msgstr "Transfert depuis"

 # messages-i18n.c:234
-#: messages-i18n.c:274
+#: messages-i18n.c:273
 msgid "Transfer To"
 msgstr "Transferer vers"

 # messages-i18n.c:235
-#: messages-i18n.c:275
+#: messages-i18n.c:274
 msgid "About"
 msgstr "A propos de"

 # messages-i18n.c:236 po/guile_strings.txt:56
-#: messages-i18n.c:276 po/guile_strings.txt:65
+#: messages-i18n.c:275 po/guile_strings.txt:65
 #: src/gnome/glade-gnc-dialogs.c:1784
 msgid "Account"
 msgstr "Compte"

 # messages-i18n.c:237 src/gnome/glade-gnc-dialogs.c:361
 # src/gnome/glade-gnc-dialogs.c:521
-#: messages-i18n.c:277 src/gnome/glade-gnc-dialogs.c:302
+#: messages-i18n.c:276 src/gnome/glade-gnc-dialogs.c:302
 #: src/gnome/glade-gnc-dialogs.c:462
 msgid "Accounts"
 msgstr "Comptes"

 # messages-i18n.c:238
-#: messages-i18n.c:278
+#: messages-i18n.c:277
 msgid "Account Information"
 msgstr "Informations du compte"

 # messages-i18n.c:239
-#: messages-i18n.c:279
+#: messages-i18n.c:278
 msgid "AutoDep"
 msgstr "Dépot Automatique"

 # messages-i18n.c:240
-#: messages-i18n.c:280 src/gnome/glade-gnc-dialogs.c:2398
+#: messages-i18n.c:279 src/gnome/glade-gnc-dialogs.c:2398
 msgid "Action"
 msgstr "Action"

 # messages-i18n.c:241
-#: messages-i18n.c:281
+#: messages-i18n.c:280
 msgid "Activities"
 msgstr "Activitées"

-#: messages-i18n.c:282
+#: messages-i18n.c:281
 msgid "Ago"
 msgstr "Il y a"

 # messages-i18n.c:242 po/guile_strings.txt:50
-#: messages-i18n.c:283 po/guile_strings.txt:57
+#: messages-i18n.c:282 po/guile_strings.txt:57
 #: src/gnome/glade-gnc-dialogs.c:2138
 msgid "Amount"
 msgstr "Montant"

 # messages-i18n.c:243
-#: messages-i18n.c:284 po/guile_strings.txt:239
+#: messages-i18n.c:283 po/guile_strings.txt:239
 msgid "Appreciation"
 msgstr "Appréciation"

 # messages-i18n.c:244
-#: messages-i18n.c:285
+#: messages-i18n.c:284
 msgid "Phone"
 msgstr "Téléphone"

 # messages-i18n.c:245 po/guile_strings.txt:146
 # src/gnome/glade-gnc-dialogs.c:626
-#: messages-i18n.c:286 po/guile_strings.txt:174
+#: messages-i18n.c:285 po/guile_strings.txt:174
 #: src/gnome/glade-gnc-dialogs.c:567
 msgid "Asset"
 msgstr "Actif(Avoirs)"

 # messages-i18n.c:246
-#: messages-i18n.c:287
+#: messages-i18n.c:286
 msgid "Assets"
 msgstr "Actif(Avoirs)"

 # messages-i18n.c:247
-#: messages-i18n.c:288
+#: messages-i18n.c:287
 msgid "ATM"
 msgstr "ATM"

 # messages-i18n.c:248
-#: messages-i18n.c:289
+#: messages-i18n.c:288
 msgid "Back"
 msgstr "Précédent"

 # messages-i18n.c:249 po/guile_strings.txt:12
-#: messages-i18n.c:290 messages-i18n.c:291 po/guile_strings.txt:13
+#: messages-i18n.c:289 messages-i18n.c:290 po/guile_strings.txt:13
 msgid "Balance"
 msgstr "Solde"

 # messages-i18n.c:250 po/guile_strings.txt:94
 # src/gnome/glade-gnc-dialogs.c:620
-#: messages-i18n.c:292 po/guile_strings.txt:107
+#: messages-i18n.c:291 po/guile_strings.txt:107
 #: src/gnome/glade-gnc-dialogs.c:561
 msgid "Bank"
 msgstr "Banque"

 # messages-i18n.c:251
-#: messages-i18n.c:293
+#: messages-i18n.c:292
 msgid "Blank"
 msgstr "Vierge"

 # messages-i18n.c:252
-#: messages-i18n.c:294 po/guile_strings.txt:124
+#: messages-i18n.c:293 po/guile_strings.txt:124
 msgid "Bought"
 msgstr "Acheté"

 # messages-i18n.c:253
-#: messages-i18n.c:295
+#: messages-i18n.c:294
 msgid "Buy"
 msgstr "Acheter"

 # messages-i18n.c:254
-#: messages-i18n.c:296
+#: messages-i18n.c:295
 msgid "Cancel"
 msgstr "Annuler"

 # messages-i18n.c:255 po/guile_strings.txt:116
 # src/gnome/glade-gnc-dialogs.c:623
-#: messages-i18n.c:297 po/guile_strings.txt:137
+#: messages-i18n.c:296 po/guile_strings.txt:137
 #: src/gnome/glade-gnc-dialogs.c:564
 msgid "Cash"
 msgstr "Espèces"

 # messages-i18n.c:256
-#: messages-i18n.c:298
+#: messages-i18n.c:297
 msgid "Changed"
 msgstr "Changé"

 # messages-i18n.c:257
-#: messages-i18n.c:299 po/guile_strings.txt:205
+#: messages-i18n.c:298 po/guile_strings.txt:205
 msgid "Charge"
 msgstr "Prix"

 # messages-i18n.c:258
-#: messages-i18n.c:300
+#: messages-i18n.c:299
 msgid "Check"
 msgstr "Vérifier"

 # messages-i18n.c:259
-#: messages-i18n.c:301
+#: messages-i18n.c:300
 msgid "Checking"
 msgstr "Vérification"

 # messages-i18n.c:260
-#: messages-i18n.c:302 src/gnome/glade-gnc-dialogs.c:2449
+#: messages-i18n.c:301 src/gnome/glade-gnc-dialogs.c:2449
 msgid "Cleared"
 msgstr "Pointé"

 # messages-i18n.c:261
-#: messages-i18n.c:303
+#: messages-i18n.c:302
 msgid "Close"
 msgstr "Fermer"

 # messages-i18n.c:262
-#: messages-i18n.c:304
+#: messages-i18n.c:303
 msgid "Commit"
 msgstr "Livrer"

 # messages-i18n.c:263
-#: messages-i18n.c:305
+#: messages-i18n.c:304
 msgid "Create"
 msgstr "Créér"

 # messages-i18n.c:264 po/guile_strings.txt:211
 # src/gnome/glade-gnc-dialogs.c:629
-#: messages-i18n.c:306 po/guile_strings.txt:254
+#: messages-i18n.c:305 po/guile_strings.txt:254
 #: src/gnome/glade-gnc-dialogs.c:570 src/gnome/glade-gnc-dialogs.c:2082
 msgid "Credit"
 msgstr "Crédit"

 # messages-i18n.c:265
-#: messages-i18n.c:307
+#: messages-i18n.c:306
 msgid "Credits"
 msgstr "Crédits"

 # messages-i18n.c:266 po/guile_strings.txt:112
 # src/gnome/glade-gnc-dialogs.c:641
-#: messages-i18n.c:308 po/guile_strings.txt:134
+#: messages-i18n.c:307 po/guile_strings.txt:134
 #: src/gnome/glade-gnc-dialogs.c:582
 msgid "Currency"
 msgstr "Monnaie"

 # messages-i18n.c:267 po/guile_strings.txt:6
-#: messages-i18n.c:309 po/guile_strings.txt:6
+#: messages-i18n.c:308 po/guile_strings.txt:6
 #: src/gnome/glade-gnc-dialogs.c:1920
 msgid "Date"
 msgstr "Date"

 # po/guile_strings.txt:101
-#: messages-i18n.c:310
+#: messages-i18n.c:309
 msgid "Days"
 msgstr "Jours"

 # messages-i18n.c:268 po/guile_strings.txt:32
-#: messages-i18n.c:311 po/guile_strings.txt:38
+#: messages-i18n.c:310 po/guile_strings.txt:38
 #: src/gnome/glade-gnc-dialogs.c:2085
 msgid "Debit"
 msgstr "Débiter"

 # messages-i18n.c:269
-#: messages-i18n.c:312
+#: messages-i18n.c:311
 msgid "Debits"
 msgstr "Débits"

 # messages-i18n.c:270
-#: messages-i18n.c:313
+#: messages-i18n.c:312
 msgid "Decrease"
 msgstr "Réduire"

 # messages-i18n.c:271
-#: messages-i18n.c:314
+#: messages-i18n.c:313
 msgid "Deficit"
 msgstr "Déficit"

 # messages-i18n.c:272
-#: messages-i18n.c:315 src/gnome/glade-gnc-dialogs.c:2868
+#: messages-i18n.c:314 src/gnome/glade-gnc-dialogs.c:2868
 msgid "Delete"
 msgstr "Supprimer"

 # messages-i18n.c:273
-#: messages-i18n.c:316 po/guile_strings.txt:200
+#: messages-i18n.c:315 po/guile_strings.txt:200
 msgid "Deposit"
 msgstr "Dépot"

 # messages-i18n.c:274
-#: messages-i18n.c:317 po/guile_strings.txt:160
+#: messages-i18n.c:316 po/guile_strings.txt:160
 msgid "Depreciation"
 msgstr "Dépréciation/Moins-values"

 # messages-i18n.c:275 po/guile_strings.txt:129
-#: messages-i18n.c:318 po/guile_strings.txt:153
+#: messages-i18n.c:317 po/guile_strings.txt:153
 #: src/gnome/glade-gnc-dialogs.c:1978
 msgid "Description"
 msgstr "Description"

 # messages-i18n.c:276
-#: messages-i18n.c:319
+#: messages-i18n.c:318
 msgid "Difference"
 msgstr "Différence"

 # messages-i18n.c:277
-#: messages-i18n.c:320
+#: messages-i18n.c:319
 msgid "Direct Debit"
 msgstr "Débit direct"

 # messages-i18n.c:278
-#: messages-i18n.c:321
+#: messages-i18n.c:320
 msgid "Dist"
 msgstr "Dist"

 # messages-i18n.c:279
-#: messages-i18n.c:322
+#: messages-i18n.c:321
 msgid "Div"
 msgstr "Div"

 # messages-i18n.c:280
-#: messages-i18n.c:323
+#: messages-i18n.c:322
 msgid "Duplicate"
 msgstr "Dupliquer"

 # messages-i18n.c:281
-#: messages-i18n.c:324
+#: messages-i18n.c:323
 msgid "Edit"
 msgstr "Afficher"

 # messages-i18n.c:282 po/guile_strings.txt:8
 # src/gnome/glade-gnc-dialogs.c:650
-#: messages-i18n.c:325 po/guile_strings.txt:8
+#: messages-i18n.c:324 po/guile_strings.txt:8
 #: src/gnome/glade-gnc-dialogs.c:591
 msgid "Equity"
 msgstr "Capitaux propres"

 # messages-i18n.c:283
-#: messages-i18n.c:326
+#: messages-i18n.c:325
 msgid "Exit"
 msgstr "Quitter"

 # messages-i18n.c:284 po/guile_strings.txt:274
 # src/gnome/glade-gnc-dialogs.c:647
-#: messages-i18n.c:327 po/guile_strings.txt:327
+#: messages-i18n.c:326 po/guile_strings.txt:327
 #: src/gnome/glade-gnc-dialogs.c:588
 msgid "Expense"
 msgstr "Dépenses"

 # messages-i18n.c:285
-#: messages-i18n.c:328
+#: messages-i18n.c:327
 msgid "Export"
 msgstr "Exporter"

 # messages-i18n.c:286 po/guile_strings.txt:300
-#: messages-i18n.c:329 po/guile_strings.txt:355
+#: messages-i18n.c:328 po/guile_strings.txt:355
 msgid "Extensions"
 msgstr "Extensions"

 # messages-i18n.c:287
-#: messages-i18n.c:330
+#: messages-i18n.c:329
 msgid "Fee"
 msgstr "Taxes/Impots"

 # messages-i18n.c:288
-#: messages-i18n.c:331
+#: messages-i18n.c:330
 msgid "Field"
 msgstr "Champ"

 # messages-i18n.c:288
-#: messages-i18n.c:332
+#: messages-i18n.c:331
 msgid "File"
 msgstr "Fichier"

 # messages-i18n.c:182
-#: messages-i18n.c:333 src/gnome/glade-gnc-dialogs.c:2523
+#: messages-i18n.c:332 src/gnome/glade-gnc-dialogs.c:2523
 msgid "Find"
 msgstr "Chercher"

 # messages-i18n.c:289
-#: messages-i18n.c:334
+#: messages-i18n.c:333
 msgid "Forward"
 msgstr "Suivant"

 # messages-i18n.c:290 po/guile_strings.txt:106
-#: messages-i18n.c:335 po/guile_strings.txt:126
+#: messages-i18n.c:334 po/guile_strings.txt:126
 msgid "From"
 msgstr "Depuis"

 # messages-i18n.c:291
-#: messages-i18n.c:336
+#: messages-i18n.c:335
 msgid "GnuCash Preferences"
 msgstr "Préférences de GnuCash"

 # messages-i18n.c:292
-#: messages-i18n.c:337
+#: messages-i18n.c:336
 msgid "Help"
 msgstr "Aide"

 # messages-i18n.c:249 po/guile_strings.txt:12
-#: messages-i18n.c:338
+#: messages-i18n.c:337
 msgid "Imbalance"
 msgstr "Non soldé"

 # messages-i18n.c:293
-#: messages-i18n.c:339
+#: messages-i18n.c:338
 msgid "Import"
 msgstr "Importer"

 # messages-i18n.c:294 po/guile_strings.txt:205
 # src/gnome/glade-gnc-dialogs.c:644
-#: messages-i18n.c:340 po/guile_strings.txt:244
+#: messages-i18n.c:339 po/guile_strings.txt:244
 #: src/gnome/glade-gnc-dialogs.c:585
 msgid "Income"
 msgstr "Revenus"

 # messages-i18n.c:295
-#: messages-i18n.c:341
+#: messages-i18n.c:340
 msgid "Increase"
 msgstr "Augmenter"

 # messages-i18n.c:296
-#: messages-i18n.c:342
+#: messages-i18n.c:341
 msgid "Int"
 msgstr "Int"

 # messages-i18n.c:297
-#: messages-i18n.c:343
+#: messages-i18n.c:342
 msgid "Jump"
 msgstr "Sauter"

 # messages-i18n.c:298 po/guile_strings.txt:165
 # src/gnome/glade-gnc-dialogs.c:632
-#: messages-i18n.c:344 po/guile_strings.txt:194
+#: messages-i18n.c:343 po/guile_strings.txt:194
 #: src/gnome/glade-gnc-dialogs.c:573
 msgid "Liability"
 msgstr "Passif(Dettes)"

 # messages-i18n.c:299
-#: messages-i18n.c:345
+#: messages-i18n.c:344
 msgid "License"
 msgstr "Licence"

 # messages-i18n.c:300
-#: messages-i18n.c:346
+#: messages-i18n.c:345
 msgid "Loan"
 msgstr "Emprunt"

 # messages-i18n.c:301
-#: messages-i18n.c:347
+#: messages-i18n.c:346
 msgid "LTCG"
 msgstr "PVLT"

 # messages-i18n.c:302 po/guile_strings.txt:26
-#: messages-i18n.c:348 po/guile_strings.txt:32
+#: messages-i18n.c:347 po/guile_strings.txt:32
 #: src/gnome/glade-gnc-dialogs.c:2196
 msgid "Memo"
 msgstr "Mémo"

 # po/guile_strings.txt:184
-#: messages-i18n.c:349
+#: messages-i18n.c:348
 msgid "Months"
 msgstr "Mois"

 # messages-i18n.c:303
-#: messages-i18n.c:350
+#: messages-i18n.c:349
 msgid "New"
 msgstr "Nouveau"

 # messages-i18n.c:304
-#: messages-i18n.c:351
+#: messages-i18n.c:350
 msgid "No"
 msgstr "Non"

 # messages-i18n.c:305 src/gnome/print-session.c:108
 # src/gnome/print-session.c:197
-#: messages-i18n.c:352 src/gnome/print-session.c:111
+#: messages-i18n.c:351 src/gnome/print-session.c:111
 #: src/gnome/print-session.c:200
 msgid "(none)"
 msgstr "(aucun)"

 # messages-i18n.c:306 po/guile_strings.txt:176
-#: messages-i18n.c:353 po/guile_strings.txt:209
+#: messages-i18n.c:352 po/guile_strings.txt:209
 msgid "Notes"
 msgstr "Notes"

 # messages-i18n.c:307 po/guile_strings.txt:148
-#: messages-i18n.c:354 po/guile_strings.txt:176
+#: messages-i18n.c:353 po/guile_strings.txt:176
 msgid "Num"
 msgstr "Num"

 # messages-i18n.c:308
-#: messages-i18n.c:355
+#: messages-i18n.c:354
 msgid "Ok"
 msgstr "Ok"

 # messages-i18n.c:309
-#: messages-i18n.c:356
+#: messages-i18n.c:355
 msgid "Online"
 msgstr "En ligne"

 # messages-i18n.c:310
-#: messages-i18n.c:357
+#: messages-i18n.c:356
 msgid "Open"
 msgstr "Ouvrir"

 # messages-i18n.c:310
-#: messages-i18n.c:358
+#: messages-i18n.c:357
 msgid "Orphan"
 msgstr "Orphelin"

 # messages-i18n.c:311
-#: messages-i18n.c:359
+#: messages-i18n.c:358
 msgid "Parameters"
 msgstr "Paramètres"

 # messages-i18n.c:312
-#: messages-i18n.c:360 po/guile_strings.txt:114
+#: messages-i18n.c:359 po/guile_strings.txt:114
 msgid "Payment"
 msgstr "Paiement"

 # messages-i18n.c:313
-#: messages-i18n.c:361
+#: messages-i18n.c:360
 msgid "Portfolio"
 msgstr "Portefeuille"

 # messages-i18n.c:314
-#: messages-i18n.c:362
+#: messages-i18n.c:361
 msgid "POS"
 msgstr "DAB"

 # messages-i18n.c:315
-#: messages-i18n.c:363
+#: messages-i18n.c:362
 msgid "Preferences"
 msgstr "Préferences"

 # messages-i18n.c:316
-#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:2340
+#: messages-i18n.c:363 src/gnome/glade-gnc-dialogs.c:2340
 msgid "Price"
 msgstr "Cours"

 # messages-i18n.c:317 src/gnome/glade-gnc-dialogs.c:971
-#: messages-i18n.c:365 src/gnome/glade-gnc-dialogs.c:937
+#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:937
 msgid "Print"
 msgstr "Imprimer"

 # messages-i18n.c:318
-#: messages-i18n.c:366
+#: messages-i18n.c:365
 msgid "Profits"
 msgstr "Profits"

 # messages-i18n.c:319
-#: messages-i18n.c:367
+#: messages-i18n.c:366
 msgid "Quit"
 msgstr "Quitter"

 # messages-i18n.c:320
-#: messages-i18n.c:368 po/guile_strings.txt:18
+#: messages-i18n.c:367 po/guile_strings.txt:18
 msgid "Rebate"
 msgstr "Rabais"

 # messages-i18n.c:321
-#: messages-i18n.c:369 po/guile_strings.txt:191
+#: messages-i18n.c:368 po/guile_strings.txt:191
 msgid "Receive"
 msgstr "Reçu"

 # messages-i18n.c:322
-#: messages-i18n.c:370
+#: messages-i18n.c:369
 msgid "Reconcile"
 msgstr "Rapprocher"

 # messages-i18n.c:323
-#: messages-i18n.c:371
+#: messages-i18n.c:370
 msgid "Record"
 msgstr "Enregistrer"

 # messages-i18n.c:324 po/guile_strings.txt:181
-#: messages-i18n.c:372 po/guile_strings.txt:215
+#: messages-i18n.c:371 po/guile_strings.txt:215
 msgid "Register"
 msgstr "Registre"

 # messages-i18n.c:325 po/guile_strings.txt:175
-#: messages-i18n.c:373 po/guile_strings.txt:208
+#: messages-i18n.c:372 po/guile_strings.txt:208
 msgid "Report"
 msgstr "Rapport"

 # messages-i18n.c:326
-#: messages-i18n.c:374
+#: messages-i18n.c:373
 msgid "Reports"
 msgstr "Rapports"

 # messages-i18n.c:327
-#: messages-i18n.c:375
+#: messages-i18n.c:374
 msgid "Save"
 msgstr "Sauvegarder"

 # messages-i18n.c:328
-#: messages-i18n.c:376
+#: messages-i18n.c:375
 msgid "Savings"
 msgstr "Epargne"

 # messages-i18n.c:329
-#: messages-i18n.c:377
+#: messages-i18n.c:376
 msgid "Scrub"
 msgstr "Nettoyer"

-#: messages-i18n.c:378
+#: messages-i18n.c:377
 msgid "Search Results"
 msgstr "Résultats de la recherche"

 # messages-i18n.c:330 po/guile_strings.txt:161
-#: messages-i18n.c:379 po/guile_strings.txt:189
+#: messages-i18n.c:378 po/guile_strings.txt:189
 msgid "Security"
 msgstr "Valeur"

 # messages-i18n.c:331
-#: messages-i18n.c:380
+#: messages-i18n.c:379
 msgid "Sell"
 msgstr "Vendre"

 # messages-i18n.c:332
-#: messages-i18n.c:381
+#: messages-i18n.c:380
 msgid "Settings"
 msgstr "Paramètres"

 # messages-i18n.c:333
-#: messages-i18n.c:382
+#: messages-i18n.c:381
 msgid "Simple"
 msgstr "Simple"

 # messages-i18n.c:334
-#: messages-i18n.c:383 po/guile_strings.txt:313
+#: messages-i18n.c:382 po/guile_strings.txt:313
 msgid "Sold"
 msgstr "Vendu"

 # messages-i18n.c:335
-#: messages-i18n.c:384 po/guile_strings.txt:51
+#: messages-i18n.c:383 po/guile_strings.txt:51
 msgid "Spend"
 msgstr "Dépenser"

 # messages-i18n.c:336
-#: messages-i18n.c:385
+#: messages-i18n.c:384
 msgid "Split"
 msgstr "Répartition"

 # messages-i18n.c:337
-#: messages-i18n.c:386
+#: messages-i18n.c:385
 msgid "STCG"
 msgstr "PVCT"

 # messages-i18n.c:338 po/guile_strings.txt:298
 # src/gnome/glade-gnc-dialogs.c:635
-#: messages-i18n.c:387 po/guile_strings.txt:353
+#: messages-i18n.c:386 po/guile_strings.txt:353
 #: src/gnome/glade-gnc-dialogs.c:576
 msgid "Stock"
 msgstr "Actions"

 # messages-i18n.c:339
-#: messages-i18n.c:388 po/guile_strings.txt:246
+#: messages-i18n.c:387 po/guile_strings.txt:246
 msgid "Style"
 msgstr "Style"

 # messages-i18n.c:340
-#: messages-i18n.c:389
+#: messages-i18n.c:388
 msgid "Surplus"
 msgstr "Excédent"

 # messages-i18n.c:341
-#: messages-i18n.c:390
+#: messages-i18n.c:389
 msgid "Teller"
 msgstr "Caissier"

 # messages-i18n.c:342 po/guile_strings.txt:252
-#: messages-i18n.c:391 po/guile_strings.txt:302
+#: messages-i18n.c:390 po/guile_strings.txt:302
 msgid "To"
 msgstr "Vers"

 # messages-i18n.c:343
-#: messages-i18n.c:392 src/gnome/glade-gnc-dialogs.c:2615
+#: messages-i18n.c:391 src/gnome/glade-gnc-dialogs.c:2615
 msgid "Today"
 msgstr "Aujourd'hui"

 # messages-i18n.c:344
-#: messages-i18n.c:393 messages-i18n.c:394 po/guile_strings.txt:207
+#: messages-i18n.c:392 messages-i18n.c:393 po/guile_strings.txt:207
 msgid "Total"
 msgstr "Total"

 # messages-i18n.c:345 po/guile_strings.txt:254
 # src/gnome/glade-gnc-dialogs.c:354 src/gnome/glade-gnc-dialogs.c:408
-#: messages-i18n.c:395 po/guile_strings.txt:304
+#: messages-i18n.c:394 po/guile_strings.txt:304
 #: src/gnome/glade-gnc-dialogs.c:295 src/gnome/glade-gnc-dialogs.c:349
 msgid "Type"
 msgstr "Type"

 # messages-i18n.c:346
-#: messages-i18n.c:396
+#: messages-i18n.c:395
 msgid "Transaction"
 msgstr "Transaction"

 # messages-i18n.c:347
-#: messages-i18n.c:397
+#: messages-i18n.c:396
 msgid "Transfer"
 msgstr "Transférer"

 # messages-i18n.c:348 po/guile_strings.txt:57
-#: messages-i18n.c:398 po/guile_strings.txt:66
+#: messages-i18n.c:397 po/guile_strings.txt:66
 msgid "Value"
 msgstr "Montant"

 # messages-i18n.c:349
-#: messages-i18n.c:399
+#: messages-i18n.c:398
 msgid "WARNING"
 msgstr "ATTENTION"

 # po/guile_strings.txt:113
-#: messages-i18n.c:400
+#: messages-i18n.c:399
 msgid "Weeks"
 msgstr "Semaines"

 # messages-i18n.c:350
-#: messages-i18n.c:401
+#: messages-i18n.c:400
 msgid "Wire"
 msgstr "Télétransmission"

 # messages-i18n.c:351
-#: messages-i18n.c:402
+#: messages-i18n.c:401
 msgid "Withdraw"
 msgstr "Se retirer"

 # messages-i18n.c:351
-#: messages-i18n.c:403 po/guile_strings.txt:60
+#: messages-i18n.c:402 po/guile_strings.txt:60
 #, fuzzy
 msgid "Withdrawal"
 msgstr "Se retirer"

 # po/guile_strings.txt:182
-#: messages-i18n.c:404
+#: messages-i18n.c:403
 msgid "Years"
 msgstr "Années"

 # messages-i18n.c:352
-#: messages-i18n.c:405
+#: messages-i18n.c:404
 msgid "Yes"
 msgstr "Oui"

@ -4437,6 +4433,10 @@ msgstr ""
 msgid "You must select a printer first."
 msgstr "Vous devez dabord sélectionner une imprimante."

+# messages-i18n.c:217
+#~ msgid "Show Categories"
+#~ msgstr "Montrer les catégories"
+
 # messages-i18n.c:45
 #~ msgid "QIF file load failed. Check settings and reload."
 #~ msgstr ""
--- a/po/gnucash.pot
+++ b/po/gnucash.pot
@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-08 12:48-0700\n"
+"POT-Creation-Date: 2000-06-12 15:20-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -609,15 +609,15 @@ msgstr ""
 msgid "Show transactions on single lines"
 msgstr ""

-#: messages-i18n.c:128 messages-i18n.c:256
+#: messages-i18n.c:128 messages-i18n.c:255
 msgid "Sort by Amount"
 msgstr ""

-#: messages-i18n.c:129 messages-i18n.c:257
+#: messages-i18n.c:129 messages-i18n.c:256
 msgid "Sort by Date"
 msgstr ""

-#: messages-i18n.c:130 messages-i18n.c:258
+#: messages-i18n.c:130 messages-i18n.c:257
 msgid "Sort by Description"
 msgstr ""

@ -625,11 +625,11 @@ msgstr ""
 msgid "Sort by the date of entry"
 msgstr ""

-#: messages-i18n.c:132 messages-i18n.c:260
+#: messages-i18n.c:132 messages-i18n.c:259
 msgid "Sort by Memo"
 msgstr ""

-#: messages-i18n.c:133 messages-i18n.c:261
+#: messages-i18n.c:133 messages-i18n.c:260
 msgid "Sort by Num"
 msgstr ""

@ -1102,613 +1102,609 @@ msgid "Show All"
 msgstr ""

 #: messages-i18n.c:251
-msgid "Show Inc/Exp"
+msgid "Show Income/Expense"
 msgstr ""

 #: messages-i18n.c:252
-msgid "Show Categories"
-msgstr ""
-
-#: messages-i18n.c:253
 msgid "Show Earliest"
 msgstr ""

-#: messages-i18n.c:254
+#: messages-i18n.c:253
 msgid "Show Latest"
 msgstr ""

-#: messages-i18n.c:255 po/guile_strings.txt:190
+#: messages-i18n.c:254 po/guile_strings.txt:190
 msgid "Single Line"
 msgstr ""

-#: messages-i18n.c:259
+#: messages-i18n.c:258
 msgid "Sort by date of entry"
 msgstr ""

-#: messages-i18n.c:262
+#: messages-i18n.c:261
 msgid "Sort by statement date"
 msgstr ""

-#: messages-i18n.c:263
+#: messages-i18n.c:262
 msgid "Sort Order"
 msgstr ""

-#: messages-i18n.c:264
+#: messages-i18n.c:263
 msgid "Start date"
 msgstr ""

-#: messages-i18n.c:265
+#: messages-i18n.c:264
 msgid "Starting Balance"
 msgstr ""

-#: messages-i18n.c:266
+#: messages-i18n.c:265
 msgid "Standard order"
 msgstr ""

-#: messages-i18n.c:267
+#: messages-i18n.c:266
 msgid "Statement Date:"
 msgstr ""

-#: messages-i18n.c:268
+#: messages-i18n.c:267
 msgid "Top level account"
 msgstr ""

-#: messages-i18n.c:269
+#: messages-i18n.c:268
 msgid "Total Shares"
 msgstr ""

-#: messages-i18n.c:270
+#: messages-i18n.c:269
 msgid "Verify Changes"
 msgstr ""

-#: messages-i18n.c:271
+#: messages-i18n.c:270
 msgid "Transfer Information"
 msgstr ""

-#: messages-i18n.c:272
+#: messages-i18n.c:271
 msgid "Transfer Money"
 msgstr ""

-#: messages-i18n.c:273
+#: messages-i18n.c:272
 msgid "Transfer From"
 msgstr ""

-#: messages-i18n.c:274
+#: messages-i18n.c:273
 msgid "Transfer To"
 msgstr ""

-#: messages-i18n.c:275
+#: messages-i18n.c:274
 msgid "About"
 msgstr ""

-#: messages-i18n.c:276 po/guile_strings.txt:65
+#: messages-i18n.c:275 po/guile_strings.txt:65
 #: src/gnome/glade-gnc-dialogs.c:1784
 msgid "Account"
 msgstr ""

-#: messages-i18n.c:277 src/gnome/glade-gnc-dialogs.c:302
+#: messages-i18n.c:276 src/gnome/glade-gnc-dialogs.c:302
 #: src/gnome/glade-gnc-dialogs.c:462
 msgid "Accounts"
 msgstr ""

-#: messages-i18n.c:278
+#: messages-i18n.c:277
 msgid "Account Information"
 msgstr ""

-#: messages-i18n.c:279
+#: messages-i18n.c:278
 msgid "AutoDep"
 msgstr ""

-#: messages-i18n.c:280 src/gnome/glade-gnc-dialogs.c:2398
+#: messages-i18n.c:279 src/gnome/glade-gnc-dialogs.c:2398
 msgid "Action"
 msgstr ""

-#: messages-i18n.c:281
+#: messages-i18n.c:280
 msgid "Activities"
 msgstr ""

-#: messages-i18n.c:282
+#: messages-i18n.c:281
 msgid "Ago"
 msgstr ""

-#: messages-i18n.c:283 po/guile_strings.txt:57
+#: messages-i18n.c:282 po/guile_strings.txt:57
 #: src/gnome/glade-gnc-dialogs.c:2138
 msgid "Amount"
 msgstr ""

-#: messages-i18n.c:284 po/guile_strings.txt:239
+#: messages-i18n.c:283 po/guile_strings.txt:239
 msgid "Appreciation"
 msgstr ""

-#: messages-i18n.c:285
+#: messages-i18n.c:284
 msgid "Phone"
 msgstr ""

-#: messages-i18n.c:286 po/guile_strings.txt:174
+#: messages-i18n.c:285 po/guile_strings.txt:174
 #: src/gnome/glade-gnc-dialogs.c:567
 msgid "Asset"
 msgstr ""

-#: messages-i18n.c:287
+#: messages-i18n.c:286
 msgid "Assets"
 msgstr ""

-#: messages-i18n.c:288
+#: messages-i18n.c:287
 msgid "ATM"
 msgstr ""

-#: messages-i18n.c:289
+#: messages-i18n.c:288
 msgid "Back"
 msgstr ""

-#: messages-i18n.c:290 messages-i18n.c:291 po/guile_strings.txt:13
+#: messages-i18n.c:289 messages-i18n.c:290 po/guile_strings.txt:13
 msgid "Balance"
 msgstr ""

-#: messages-i18n.c:292 po/guile_strings.txt:107
+#: messages-i18n.c:291 po/guile_strings.txt:107
 #: src/gnome/glade-gnc-dialogs.c:561
 msgid "Bank"
 msgstr ""

-#: messages-i18n.c:293
+#: messages-i18n.c:292
 msgid "Blank"
 msgstr ""

-#: messages-i18n.c:294 po/guile_strings.txt:124
+#: messages-i18n.c:293 po/guile_strings.txt:124
 msgid "Bought"
 msgstr ""

-#: messages-i18n.c:295
+#: messages-i18n.c:294
 msgid "Buy"
 msgstr ""

-#: messages-i18n.c:296
+#: messages-i18n.c:295
 msgid "Cancel"
 msgstr ""

-#: messages-i18n.c:297 po/guile_strings.txt:137
+#: messages-i18n.c:296 po/guile_strings.txt:137
 #: src/gnome/glade-gnc-dialogs.c:564
 msgid "Cash"
 msgstr ""

-#: messages-i18n.c:298
+#: messages-i18n.c:297
 msgid "Changed"
 msgstr ""

-#: messages-i18n.c:299 po/guile_strings.txt:205
+#: messages-i18n.c:298 po/guile_strings.txt:205
 msgid "Charge"
 msgstr ""

-#: messages-i18n.c:300
+#: messages-i18n.c:299
 msgid "Check"
 msgstr ""

-#: messages-i18n.c:301
+#: messages-i18n.c:300
 msgid "Checking"
 msgstr ""

-#: messages-i18n.c:302 src/gnome/glade-gnc-dialogs.c:2449
+#: messages-i18n.c:301 src/gnome/glade-gnc-dialogs.c:2449
 msgid "Cleared"
 msgstr ""

-#: messages-i18n.c:303
+#: messages-i18n.c:302
 msgid "Close"
 msgstr ""

-#: messages-i18n.c:304
+#: messages-i18n.c:303
 msgid "Commit"
 msgstr ""

-#: messages-i18n.c:305
+#: messages-i18n.c:304
 msgid "Create"
 msgstr ""

-#: messages-i18n.c:306 po/guile_strings.txt:254
+#: messages-i18n.c:305 po/guile_strings.txt:254
 #: src/gnome/glade-gnc-dialogs.c:570 src/gnome/glade-gnc-dialogs.c:2082
 msgid "Credit"
 msgstr ""

-#: messages-i18n.c:307
+#: messages-i18n.c:306
 msgid "Credits"
 msgstr ""

-#: messages-i18n.c:308 po/guile_strings.txt:134
+#: messages-i18n.c:307 po/guile_strings.txt:134
 #: src/gnome/glade-gnc-dialogs.c:582
 msgid "Currency"
 msgstr ""

-#: messages-i18n.c:309 po/guile_strings.txt:6
+#: messages-i18n.c:308 po/guile_strings.txt:6
 #: src/gnome/glade-gnc-dialogs.c:1920
 msgid "Date"
 msgstr ""

-#: messages-i18n.c:310
+#: messages-i18n.c:309
 msgid "Days"
 msgstr ""

-#: messages-i18n.c:311 po/guile_strings.txt:38
+#: messages-i18n.c:310 po/guile_strings.txt:38
 #: src/gnome/glade-gnc-dialogs.c:2085
 msgid "Debit"
 msgstr ""

-#: messages-i18n.c:312
+#: messages-i18n.c:311
 msgid "Debits"
 msgstr ""

-#: messages-i18n.c:313
+#: messages-i18n.c:312
 msgid "Decrease"
 msgstr ""

-#: messages-i18n.c:314
+#: messages-i18n.c:313
 msgid "Deficit"
 msgstr ""

-#: messages-i18n.c:315 src/gnome/glade-gnc-dialogs.c:2868
+#: messages-i18n.c:314 src/gnome/glade-gnc-dialogs.c:2868
 msgid "Delete"
 msgstr ""

-#: messages-i18n.c:316 po/guile_strings.txt:200
+#: messages-i18n.c:315 po/guile_strings.txt:200
 msgid "Deposit"
 msgstr ""

-#: messages-i18n.c:317 po/guile_strings.txt:160
+#: messages-i18n.c:316 po/guile_strings.txt:160
 msgid "Depreciation"
 msgstr ""

-#: messages-i18n.c:318 po/guile_strings.txt:153
+#: messages-i18n.c:317 po/guile_strings.txt:153
 #: src/gnome/glade-gnc-dialogs.c:1978
 msgid "Description"
 msgstr ""

-#: messages-i18n.c:319
+#: messages-i18n.c:318
 msgid "Difference"
 msgstr ""

-#: messages-i18n.c:320
+#: messages-i18n.c:319
 msgid "Direct Debit"
 msgstr ""

-#: messages-i18n.c:321
+#: messages-i18n.c:320
 msgid "Dist"
 msgstr ""

-#: messages-i18n.c:322
+#: messages-i18n.c:321
 msgid "Div"
 msgstr ""

-#: messages-i18n.c:323
+#: messages-i18n.c:322
 msgid "Duplicate"
 msgstr ""

-#: messages-i18n.c:324
+#: messages-i18n.c:323
 msgid "Edit"
 msgstr ""

-#: messages-i18n.c:325 po/guile_strings.txt:8
+#: messages-i18n.c:324 po/guile_strings.txt:8
 #: src/gnome/glade-gnc-dialogs.c:591
 msgid "Equity"
 msgstr ""

-#: messages-i18n.c:326
+#: messages-i18n.c:325
 msgid "Exit"
 msgstr ""

-#: messages-i18n.c:327 po/guile_strings.txt:327
+#: messages-i18n.c:326 po/guile_strings.txt:327
 #: src/gnome/glade-gnc-dialogs.c:588
 msgid "Expense"
 msgstr ""

-#: messages-i18n.c:328
+#: messages-i18n.c:327
 msgid "Export"
 msgstr ""

-#: messages-i18n.c:329 po/guile_strings.txt:355
+#: messages-i18n.c:328 po/guile_strings.txt:355
 msgid "Extensions"
 msgstr ""

-#: messages-i18n.c:330
+#: messages-i18n.c:329
 msgid "Fee"
 msgstr ""

-#: messages-i18n.c:331
+#: messages-i18n.c:330
 msgid "Field"
 msgstr ""

-#: messages-i18n.c:332
+#: messages-i18n.c:331
 msgid "File"
 msgstr ""

-#: messages-i18n.c:333 src/gnome/glade-gnc-dialogs.c:2523
+#: messages-i18n.c:332 src/gnome/glade-gnc-dialogs.c:2523
 msgid "Find"
 msgstr ""

-#: messages-i18n.c:334
+#: messages-i18n.c:333
 msgid "Forward"
 msgstr ""

-#: messages-i18n.c:335 po/guile_strings.txt:126
+#: messages-i18n.c:334 po/guile_strings.txt:126
 msgid "From"
 msgstr ""

-#: messages-i18n.c:336
+#: messages-i18n.c:335
 msgid "GnuCash Preferences"
 msgstr ""

-#: messages-i18n.c:337
+#: messages-i18n.c:336
 msgid "Help"
 msgstr ""

-#: messages-i18n.c:338
+#: messages-i18n.c:337
 msgid "Imbalance"
 msgstr ""

-#: messages-i18n.c:339
+#: messages-i18n.c:338
 msgid "Import"
 msgstr ""

-#: messages-i18n.c:340 po/guile_strings.txt:244
+#: messages-i18n.c:339 po/guile_strings.txt:244
 #: src/gnome/glade-gnc-dialogs.c:585
 msgid "Income"
 msgstr ""

-#: messages-i18n.c:341
+#: messages-i18n.c:340
 msgid "Increase"
 msgstr ""

-#: messages-i18n.c:342
+#: messages-i18n.c:341
 msgid "Int"
 msgstr ""

-#: messages-i18n.c:343
+#: messages-i18n.c:342
 msgid "Jump"
 msgstr ""

-#: messages-i18n.c:344 po/guile_strings.txt:194
+#: messages-i18n.c:343 po/guile_strings.txt:194
 #: src/gnome/glade-gnc-dialogs.c:573
 msgid "Liability"
 msgstr ""

-#: messages-i18n.c:345
+#: messages-i18n.c:344
 msgid "License"
 msgstr ""

-#: messages-i18n.c:346
+#: messages-i18n.c:345
 msgid "Loan"
 msgstr ""

-#: messages-i18n.c:347
+#: messages-i18n.c:346
 msgid "LTCG"
 msgstr ""

-#: messages-i18n.c:348 po/guile_strings.txt:32
+#: messages-i18n.c:347 po/guile_strings.txt:32
 #: src/gnome/glade-gnc-dialogs.c:2196
 msgid "Memo"
 msgstr ""

-#: messages-i18n.c:349
+#: messages-i18n.c:348
 msgid "Months"
 msgstr ""

-#: messages-i18n.c:350
+#: messages-i18n.c:349
 msgid "New"
 msgstr ""

-#: messages-i18n.c:351
+#: messages-i18n.c:350
 msgid "No"
 msgstr ""

-#: messages-i18n.c:352 src/gnome/print-session.c:111
+#: messages-i18n.c:351 src/gnome/print-session.c:111
 #: src/gnome/print-session.c:200
 msgid "(none)"
 msgstr ""

-#: messages-i18n.c:353 po/guile_strings.txt:209
+#: messages-i18n.c:352 po/guile_strings.txt:209
 msgid "Notes"
 msgstr ""

-#: messages-i18n.c:354 po/guile_strings.txt:176
+#: messages-i18n.c:353 po/guile_strings.txt:176
 msgid "Num"
 msgstr ""

-#: messages-i18n.c:355
+#: messages-i18n.c:354
 msgid "Ok"
 msgstr ""

-#: messages-i18n.c:356
+#: messages-i18n.c:355
 msgid "Online"
 msgstr ""

-#: messages-i18n.c:357
+#: messages-i18n.c:356
 msgid "Open"
 msgstr ""

-#: messages-i18n.c:358
+#: messages-i18n.c:357
 msgid "Orphan"
 msgstr ""

-#: messages-i18n.c:359
+#: messages-i18n.c:358
 msgid "Parameters"
 msgstr ""

-#: messages-i18n.c:360 po/guile_strings.txt:114
+#: messages-i18n.c:359 po/guile_strings.txt:114
 msgid "Payment"
 msgstr ""

-#: messages-i18n.c:361
+#: messages-i18n.c:360
 msgid "Portfolio"
 msgstr ""

-#: messages-i18n.c:362
+#: messages-i18n.c:361
 msgid "POS"
 msgstr ""

-#: messages-i18n.c:363
+#: messages-i18n.c:362
 msgid "Preferences"
 msgstr ""

-#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:2340
+#: messages-i18n.c:363 src/gnome/glade-gnc-dialogs.c:2340
 msgid "Price"
 msgstr ""

-#: messages-i18n.c:365 src/gnome/glade-gnc-dialogs.c:937
+#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:937
 msgid "Print"
 msgstr ""

-#: messages-i18n.c:366
+#: messages-i18n.c:365
 msgid "Profits"
 msgstr ""

-#: messages-i18n.c:367
+#: messages-i18n.c:366
 msgid "Quit"
 msgstr ""

-#: messages-i18n.c:368 po/guile_strings.txt:18
+#: messages-i18n.c:367 po/guile_strings.txt:18
 msgid "Rebate"
 msgstr ""

-#: messages-i18n.c:369 po/guile_strings.txt:191
+#: messages-i18n.c:368 po/guile_strings.txt:191
 msgid "Receive"
 msgstr ""

-#: messages-i18n.c:370
+#: messages-i18n.c:369
 msgid "Reconcile"
 msgstr ""

-#: messages-i18n.c:371
+#: messages-i18n.c:370
 msgid "Record"
 msgstr ""

-#: messages-i18n.c:372 po/guile_strings.txt:215
+#: messages-i18n.c:371 po/guile_strings.txt:215
 msgid "Register"
 msgstr ""

-#: messages-i18n.c:373 po/guile_strings.txt:208
+#: messages-i18n.c:372 po/guile_strings.txt:208
 msgid "Report"
 msgstr ""

-#: messages-i18n.c:374
+#: messages-i18n.c:373
 msgid "Reports"
 msgstr ""

-#: messages-i18n.c:375
+#: messages-i18n.c:374
 msgid "Save"
 msgstr ""

-#: messages-i18n.c:376
+#: messages-i18n.c:375
 msgid "Savings"
 msgstr ""

-#: messages-i18n.c:377
+#: messages-i18n.c:376
 msgid "Scrub"
 msgstr ""

-#: messages-i18n.c:378
+#: messages-i18n.c:377
 msgid "Search Results"
 msgstr ""

-#: messages-i18n.c:379 po/guile_strings.txt:189
+#: messages-i18n.c:378 po/guile_strings.txt:189
 msgid "Security"
 msgstr ""

-#: messages-i18n.c:380
+#: messages-i18n.c:379
 msgid "Sell"
 msgstr ""

-#: messages-i18n.c:381
+#: messages-i18n.c:380
 msgid "Settings"
 msgstr ""

-#: messages-i18n.c:382
+#: messages-i18n.c:381
 msgid "Simple"
 msgstr ""

-#: messages-i18n.c:383 po/guile_strings.txt:313
+#: messages-i18n.c:382 po/guile_strings.txt:313
 msgid "Sold"
 msgstr ""

-#: messages-i18n.c:384 po/guile_strings.txt:51
+#: messages-i18n.c:383 po/guile_strings.txt:51
 msgid "Spend"
 msgstr ""

-#: messages-i18n.c:385
+#: messages-i18n.c:384
 msgid "Split"
 msgstr ""

-#: messages-i18n.c:386
+#: messages-i18n.c:385
 msgid "STCG"
 msgstr ""

-#: messages-i18n.c:387 po/guile_strings.txt:353
+#: messages-i18n.c:386 po/guile_strings.txt:353
 #: src/gnome/glade-gnc-dialogs.c:576
 msgid "Stock"
 msgstr ""

-#: messages-i18n.c:388 po/guile_strings.txt:246
+#: messages-i18n.c:387 po/guile_strings.txt:246
 msgid "Style"
 msgstr ""

-#: messages-i18n.c:389
+#: messages-i18n.c:388
 msgid "Surplus"
 msgstr ""

-#: messages-i18n.c:390
+#: messages-i18n.c:389
 msgid "Teller"
 msgstr ""

-#: messages-i18n.c:391 po/guile_strings.txt:302
+#: messages-i18n.c:390 po/guile_strings.txt:302
 msgid "To"
 msgstr ""

-#: messages-i18n.c:392 src/gnome/glade-gnc-dialogs.c:2615
+#: messages-i18n.c:391 src/gnome/glade-gnc-dialogs.c:2615
 msgid "Today"
 msgstr ""

-#: messages-i18n.c:393 messages-i18n.c:394 po/guile_strings.txt:207
+#: messages-i18n.c:392 messages-i18n.c:393 po/guile_strings.txt:207
 msgid "Total"
 msgstr ""

-#: messages-i18n.c:395 po/guile_strings.txt:304
+#: messages-i18n.c:394 po/guile_strings.txt:304
 #: src/gnome/glade-gnc-dialogs.c:295 src/gnome/glade-gnc-dialogs.c:349
 msgid "Type"
 msgstr ""

-#: messages-i18n.c:396
+#: messages-i18n.c:395
 msgid "Transaction"
 msgstr ""

-#: messages-i18n.c:397
+#: messages-i18n.c:396
 msgid "Transfer"
 msgstr ""

-#: messages-i18n.c:398 po/guile_strings.txt:66
+#: messages-i18n.c:397 po/guile_strings.txt:66
 msgid "Value"
 msgstr ""

-#: messages-i18n.c:399
+#: messages-i18n.c:398
 msgid "WARNING"
 msgstr ""

-#: messages-i18n.c:400
+#: messages-i18n.c:399
 msgid "Weeks"
 msgstr ""

-#: messages-i18n.c:401
+#: messages-i18n.c:400
 msgid "Wire"
 msgstr ""

-#: messages-i18n.c:402
+#: messages-i18n.c:401
 msgid "Withdraw"
 msgstr ""

-#: messages-i18n.c:403 po/guile_strings.txt:60
+#: messages-i18n.c:402 po/guile_strings.txt:60
 msgid "Withdrawal"
 msgstr ""

-#: messages-i18n.c:404
+#: messages-i18n.c:403
 msgid "Years"
 msgstr ""

-#: messages-i18n.c:405
+#: messages-i18n.c:404
 msgid "Yes"
 msgstr ""

--- a/po/ja.po
+++ b/po/ja.po
@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-08 12:48-0700\n"
+"POT-Creation-Date: 2000-06-12 15:20-0700\n"
 "PO-Revision-Date: 2000-04-25 00:00+0900\n"
 "Last-Translator: Shimpei Yamashita <shimpei@gol.com>\n"
 "Language-Team: \n"
@ -680,15 +680,15 @@ msgstr "
 msgid "Show transactions on single lines"
 msgstr "取引を一行で表示する"

-#: messages-i18n.c:128 messages-i18n.c:256
+#: messages-i18n.c:128 messages-i18n.c:255
 msgid "Sort by Amount"
 msgstr "数量順に並べる"

-#: messages-i18n.c:129 messages-i18n.c:257
+#: messages-i18n.c:129 messages-i18n.c:256
 msgid "Sort by Date"
 msgstr "日付順に並べる"

-#: messages-i18n.c:130 messages-i18n.c:258
+#: messages-i18n.c:130 messages-i18n.c:257
 msgid "Sort by Description"
 msgstr "説明順に並べる"

@ -696,11 +696,11 @@ msgstr "
 msgid "Sort by the date of entry"
 msgstr "入力日付順に並べ替え"

-#: messages-i18n.c:132 messages-i18n.c:260
+#: messages-i18n.c:132 messages-i18n.c:259
 msgid "Sort by Memo"
 msgstr "詳細順に並べる"

-#: messages-i18n.c:133 messages-i18n.c:261
+#: messages-i18n.c:133 messages-i18n.c:260
 msgid "Sort by Num"
 msgstr "番号順に並べる"

@ -1178,623 +1178,620 @@ msgid "Show All"
 msgstr "全部見せる"

 #: messages-i18n.c:251
-msgid "Show Inc/Exp"
+#, fuzzy
+msgid "Show Income/Expense"
 msgstr "収入・費用を表示する"

 #: messages-i18n.c:252
-msgid "Show Categories"
-msgstr "¶èÊ¬¤òÉ½¼¨¤¹¤ë"
-
-#: messages-i18n.c:253
 msgid "Show Earliest"
 msgstr "最古を表示する"

-#: messages-i18n.c:254
+#: messages-i18n.c:253
 msgid "Show Latest"
 msgstr "最新を表示する"

-#: messages-i18n.c:255 po/guile_strings.txt:190
+#: messages-i18n.c:254 po/guile_strings.txt:190
 msgid "Single Line"
 msgstr "単行"

-#: messages-i18n.c:259
+#: messages-i18n.c:258
 msgid "Sort by date of entry"
 msgstr "日付順で並べる"

-#: messages-i18n.c:262
+#: messages-i18n.c:261
 #, fuzzy
 msgid "Sort by statement date"
 msgstr "日付順で並べる"

-#: messages-i18n.c:263
+#: messages-i18n.c:262
 msgid "Sort Order"
 msgstr "ソート順番"

-#: messages-i18n.c:264
+#: messages-i18n.c:263
 msgid "Start date"
 msgstr "開始日付"

-#: messages-i18n.c:265
+#: messages-i18n.c:264
 #, fuzzy
 msgid "Starting Balance"
 msgstr "期首残高"

-#: messages-i18n.c:266
+#: messages-i18n.c:265
 msgid "Standard order"
 msgstr "標準の順番"

-#: messages-i18n.c:267
+#: messages-i18n.c:266
 #, fuzzy
 msgid "Statement Date:"
 msgstr "日付選択"

-#: messages-i18n.c:268
+#: messages-i18n.c:267
 msgid "Top level account"
 msgstr "基本勘定科目"

-#: messages-i18n.c:269
+#: messages-i18n.c:268
 msgid "Total Shares"
 msgstr "株式合計"

-#: messages-i18n.c:270
+#: messages-i18n.c:269
 msgid "Verify Changes"
 msgstr "変更を確認する"

-#: messages-i18n.c:271
+#: messages-i18n.c:270
 msgid "Transfer Information"
 msgstr "情報を転送"

-#: messages-i18n.c:272
+#: messages-i18n.c:271
 msgid "Transfer Money"
 msgstr "資金を転送"

-#: messages-i18n.c:273
+#: messages-i18n.c:272
 msgid "Transfer From"
 msgstr "転送元"

-#: messages-i18n.c:274
+#: messages-i18n.c:273
 msgid "Transfer To"
 msgstr "転送先"

-#: messages-i18n.c:275
+#: messages-i18n.c:274
 msgid "About"
 msgstr ""

-#: messages-i18n.c:276 po/guile_strings.txt:65
+#: messages-i18n.c:275 po/guile_strings.txt:65
 #: src/gnome/glade-gnc-dialogs.c:1784
 msgid "Account"
 msgstr "勘定科目"

-#: messages-i18n.c:277 src/gnome/glade-gnc-dialogs.c:302
+#: messages-i18n.c:276 src/gnome/glade-gnc-dialogs.c:302
 #: src/gnome/glade-gnc-dialogs.c:462
 msgid "Accounts"
 msgstr "勘定科目"

-#: messages-i18n.c:278
+#: messages-i18n.c:277
 msgid "Account Information"
 msgstr "勘定科目情報"

-#: messages-i18n.c:279
+#: messages-i18n.c:278
 msgid "AutoDep"
 msgstr ""

-#: messages-i18n.c:280 src/gnome/glade-gnc-dialogs.c:2398
+#: messages-i18n.c:279 src/gnome/glade-gnc-dialogs.c:2398
 msgid "Action"
 msgstr ""

-#: messages-i18n.c:281
+#: messages-i18n.c:280
 msgid "Activities"
 msgstr ""

-#: messages-i18n.c:282
+#: messages-i18n.c:281
 msgid "Ago"
 msgstr ""

-#: messages-i18n.c:283 po/guile_strings.txt:57
+#: messages-i18n.c:282 po/guile_strings.txt:57
 #: src/gnome/glade-gnc-dialogs.c:2138
 msgid "Amount"
 msgstr "金額"

-#: messages-i18n.c:284 po/guile_strings.txt:239
+#: messages-i18n.c:283 po/guile_strings.txt:239
 msgid "Appreciation"
 msgstr "増加"

-#: messages-i18n.c:285
+#: messages-i18n.c:284
 msgid "Phone"
 msgstr "電話"

-#: messages-i18n.c:286 po/guile_strings.txt:174
+#: messages-i18n.c:285 po/guile_strings.txt:174
 #: src/gnome/glade-gnc-dialogs.c:567
 msgid "Asset"
 msgstr "資産"

-#: messages-i18n.c:287
+#: messages-i18n.c:286
 msgid "Assets"
 msgstr "資産"

-#: messages-i18n.c:288
+#: messages-i18n.c:287
 msgid "ATM"
 msgstr "キャッシュマシーン"

-#: messages-i18n.c:289
+#: messages-i18n.c:288
 msgid "Back"
 msgstr "戻る"

-#: messages-i18n.c:290 messages-i18n.c:291 po/guile_strings.txt:13
+#: messages-i18n.c:289 messages-i18n.c:290 po/guile_strings.txt:13
 msgid "Balance"
 msgstr "残高"

-#: messages-i18n.c:292 po/guile_strings.txt:107
+#: messages-i18n.c:291 po/guile_strings.txt:107
 #: src/gnome/glade-gnc-dialogs.c:561
 msgid "Bank"
 msgstr "銀行"

-#: messages-i18n.c:293
+#: messages-i18n.c:292
 msgid "Blank"
 msgstr "空白"

-#: messages-i18n.c:294 po/guile_strings.txt:124
+#: messages-i18n.c:293 po/guile_strings.txt:124
 msgid "Bought"
 msgstr ""

-#: messages-i18n.c:295
+#: messages-i18n.c:294
 msgid "Buy"
 msgstr "買う"

-#: messages-i18n.c:296
+#: messages-i18n.c:295
 msgid "Cancel"
 msgstr "キャンセル"

-#: messages-i18n.c:297 po/guile_strings.txt:137
+#: messages-i18n.c:296 po/guile_strings.txt:137
 #: src/gnome/glade-gnc-dialogs.c:564
 msgid "Cash"
 msgstr "現金"

-#: messages-i18n.c:298
+#: messages-i18n.c:297
 msgid "Changed"
 msgstr ""

-#: messages-i18n.c:299 po/guile_strings.txt:205
+#: messages-i18n.c:298 po/guile_strings.txt:205
 msgid "Charge"
 msgstr ""

-#: messages-i18n.c:300
+#: messages-i18n.c:299
 msgid "Check"
 msgstr ""

-#: messages-i18n.c:301
+#: messages-i18n.c:300
 msgid "Checking"
 msgstr ""

-#: messages-i18n.c:302 src/gnome/glade-gnc-dialogs.c:2449
+#: messages-i18n.c:301 src/gnome/glade-gnc-dialogs.c:2449
 msgid "Cleared"
 msgstr ""

-#: messages-i18n.c:303
+#: messages-i18n.c:302
 msgid "Close"
 msgstr ""

-#: messages-i18n.c:304
+#: messages-i18n.c:303
 msgid "Commit"
 msgstr ""

-#: messages-i18n.c:305
+#: messages-i18n.c:304
 msgid "Create"
 msgstr ""

-#: messages-i18n.c:306 po/guile_strings.txt:254
+#: messages-i18n.c:305 po/guile_strings.txt:254
 #: src/gnome/glade-gnc-dialogs.c:570 src/gnome/glade-gnc-dialogs.c:2082
 msgid "Credit"
 msgstr "貸方"

-#: messages-i18n.c:307
+#: messages-i18n.c:306
 msgid "Credits"
 msgstr "貸方"

-#: messages-i18n.c:308 po/guile_strings.txt:134
+#: messages-i18n.c:307 po/guile_strings.txt:134
 #: src/gnome/glade-gnc-dialogs.c:582
 msgid "Currency"
 msgstr "通貨"

-#: messages-i18n.c:309 po/guile_strings.txt:6
+#: messages-i18n.c:308 po/guile_strings.txt:6
 #: src/gnome/glade-gnc-dialogs.c:1920
 msgid "Date"
 msgstr "日付"

-#: messages-i18n.c:310
+#: messages-i18n.c:309
 #, fuzzy
 msgid "Days"
 msgstr "日"

-#: messages-i18n.c:311 po/guile_strings.txt:38
+#: messages-i18n.c:310 po/guile_strings.txt:38
 #: src/gnome/glade-gnc-dialogs.c:2085
 msgid "Debit"
 msgstr "借方"

-#: messages-i18n.c:312
+#: messages-i18n.c:311
 msgid "Debits"
 msgstr "借方"

-#: messages-i18n.c:313
+#: messages-i18n.c:312
 msgid "Decrease"
 msgstr "減少"

-#: messages-i18n.c:314
+#: messages-i18n.c:313
 msgid "Deficit"
 msgstr "赤字"

-#: messages-i18n.c:315 src/gnome/glade-gnc-dialogs.c:2868
+#: messages-i18n.c:314 src/gnome/glade-gnc-dialogs.c:2868
 msgid "Delete"
 msgstr "削除"

-#: messages-i18n.c:316 po/guile_strings.txt:200
+#: messages-i18n.c:315 po/guile_strings.txt:200
 msgid "Deposit"
 msgstr "入金"

-#: messages-i18n.c:317 po/guile_strings.txt:160
+#: messages-i18n.c:316 po/guile_strings.txt:160
 msgid "Depreciation"
 msgstr "減価償却"

-#: messages-i18n.c:318 po/guile_strings.txt:153
+#: messages-i18n.c:317 po/guile_strings.txt:153
 #: src/gnome/glade-gnc-dialogs.c:1978
 msgid "Description"
 msgstr "説明"

-#: messages-i18n.c:319
+#: messages-i18n.c:318
 msgid "Difference"
 msgstr "差分"

-#: messages-i18n.c:320
+#: messages-i18n.c:319
 msgid "Direct Debit"
 msgstr ""

-#: messages-i18n.c:321
+#: messages-i18n.c:320
 msgid "Dist"
 msgstr ""

-#: messages-i18n.c:322
+#: messages-i18n.c:321
 msgid "Div"
 msgstr ""

-#: messages-i18n.c:323
+#: messages-i18n.c:322
 msgid "Duplicate"
 msgstr "複製"

-#: messages-i18n.c:324
+#: messages-i18n.c:323
 msgid "Edit"
 msgstr "編集"

-#: messages-i18n.c:325 po/guile_strings.txt:8
+#: messages-i18n.c:324 po/guile_strings.txt:8
 #: src/gnome/glade-gnc-dialogs.c:591
 msgid "Equity"
 msgstr "資本"

-#: messages-i18n.c:326
+#: messages-i18n.c:325
 msgid "Exit"
 msgstr "終了"

-#: messages-i18n.c:327 po/guile_strings.txt:327
+#: messages-i18n.c:326 po/guile_strings.txt:327
 #: src/gnome/glade-gnc-dialogs.c:588
 msgid "Expense"
 msgstr "費用"

-#: messages-i18n.c:328
+#: messages-i18n.c:327
 msgid "Export"
 msgstr "出力"

-#: messages-i18n.c:329 po/guile_strings.txt:355
+#: messages-i18n.c:328 po/guile_strings.txt:355
 msgid "Extensions"
 msgstr "拡張機能"

-#: messages-i18n.c:330
+#: messages-i18n.c:329
 msgid "Fee"
 msgstr "費用"

-#: messages-i18n.c:331
+#: messages-i18n.c:330
 msgid "Field"
 msgstr ""

-#: messages-i18n.c:332
+#: messages-i18n.c:331
 msgid "File"
 msgstr "ファイル"

-#: messages-i18n.c:333 src/gnome/glade-gnc-dialogs.c:2523
+#: messages-i18n.c:332 src/gnome/glade-gnc-dialogs.c:2523
 msgid "Find"
 msgstr "検索"

-#: messages-i18n.c:334
+#: messages-i18n.c:333
 msgid "Forward"
 msgstr "先へ"

-#: messages-i18n.c:335 po/guile_strings.txt:126
+#: messages-i18n.c:334 po/guile_strings.txt:126
 msgid "From"
 msgstr ""

-#: messages-i18n.c:336
+#: messages-i18n.c:335
 msgid "GnuCash Preferences"
 msgstr "GnuCash 設定"

-#: messages-i18n.c:337
+#: messages-i18n.c:336
 msgid "Help"
 msgstr "ヘルプ"

-#: messages-i18n.c:338
+#: messages-i18n.c:337
 #, fuzzy
 msgid "Imbalance"
 msgstr "残高"

-#: messages-i18n.c:339
+#: messages-i18n.c:338
 msgid "Import"
 msgstr "インポート"

-#: messages-i18n.c:340 po/guile_strings.txt:244
+#: messages-i18n.c:339 po/guile_strings.txt:244
 #: src/gnome/glade-gnc-dialogs.c:585
 msgid "Income"
 msgstr "収入"

-#: messages-i18n.c:341
+#: messages-i18n.c:340
 msgid "Increase"
 msgstr "増加"

-#: messages-i18n.c:342
+#: messages-i18n.c:341
 msgid "Int"
 msgstr ""

-#: messages-i18n.c:343
+#: messages-i18n.c:342
 msgid "Jump"
 msgstr "飛ぶ"

-#: messages-i18n.c:344 po/guile_strings.txt:194
+#: messages-i18n.c:343 po/guile_strings.txt:194
 #: src/gnome/glade-gnc-dialogs.c:573
 msgid "Liability"
 msgstr "負債"

-#: messages-i18n.c:345
+#: messages-i18n.c:344
 msgid "License"
 msgstr "ライセンス"

-#: messages-i18n.c:346
+#: messages-i18n.c:345
 msgid "Loan"
 msgstr "借入金"

-#: messages-i18n.c:347
+#: messages-i18n.c:346
 msgid "LTCG"
 msgstr "長期キャピタルゲイン"

-#: messages-i18n.c:348 po/guile_strings.txt:32
+#: messages-i18n.c:347 po/guile_strings.txt:32
 #: src/gnome/glade-gnc-dialogs.c:2196
 msgid "Memo"
 msgstr "詳細"

-#: messages-i18n.c:349
+#: messages-i18n.c:348
 #, fuzzy
 msgid "Months"
 msgstr "月"

-#: messages-i18n.c:350
+#: messages-i18n.c:349
 msgid "New"
 msgstr ""

-#: messages-i18n.c:351
+#: messages-i18n.c:350
 msgid "No"
 msgstr ""

-#: messages-i18n.c:352 src/gnome/print-session.c:111
+#: messages-i18n.c:351 src/gnome/print-session.c:111
 #: src/gnome/print-session.c:200
 msgid "(none)"
 msgstr "(なし)"

-#: messages-i18n.c:353 po/guile_strings.txt:209
+#: messages-i18n.c:352 po/guile_strings.txt:209
 msgid "Notes"
 msgstr "詳細"

-#: messages-i18n.c:354 po/guile_strings.txt:176
+#: messages-i18n.c:353 po/guile_strings.txt:176
 msgid "Num"
 msgstr ""

-#: messages-i18n.c:355
+#: messages-i18n.c:354
 msgid "Ok"
 msgstr ""

-#: messages-i18n.c:356
+#: messages-i18n.c:355
 msgid "Online"
 msgstr "オンライン"

-#: messages-i18n.c:357
+#: messages-i18n.c:356
 msgid "Open"
 msgstr "開く"

-#: messages-i18n.c:358
+#: messages-i18n.c:357
 #, fuzzy
 msgid "Orphan"
 msgstr "開く"

-#: messages-i18n.c:359
+#: messages-i18n.c:358
 msgid "Parameters"
 msgstr "変数"

-#: messages-i18n.c:360 po/guile_strings.txt:114
+#: messages-i18n.c:359 po/guile_strings.txt:114
 msgid "Payment"
 msgstr "支払"

-#: messages-i18n.c:361
+#: messages-i18n.c:360
 msgid "Portfolio"
 msgstr "ポートフォリオ"

-#: messages-i18n.c:362
+#: messages-i18n.c:361
 msgid "POS"
 msgstr ""

-#: messages-i18n.c:363
+#: messages-i18n.c:362
 msgid "Preferences"
 msgstr "設定"

-#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:2340
+#: messages-i18n.c:363 src/gnome/glade-gnc-dialogs.c:2340
 msgid "Price"
 msgstr "価値"

-#: messages-i18n.c:365 src/gnome/glade-gnc-dialogs.c:937
+#: messages-i18n.c:364 src/gnome/glade-gnc-dialogs.c:937
 msgid "Print"
 msgstr "印刷"

-#: messages-i18n.c:366
+#: messages-i18n.c:365
 msgid "Profits"
 msgstr "利益"

-#: messages-i18n.c:367
+#: messages-i18n.c:366
 msgid "Quit"
 msgstr "終了"

-#: messages-i18n.c:368 po/guile_strings.txt:18
+#: messages-i18n.c:367 po/guile_strings.txt:18
 msgid "Rebate"
 msgstr "リベート"

-#: messages-i18n.c:369 po/guile_strings.txt:191
+#: messages-i18n.c:368 po/guile_strings.txt:191
 msgid "Receive"
 msgstr ""

-#: messages-i18n.c:370
+#: messages-i18n.c:369
 msgid "Reconcile"
 msgstr ""

-#: messages-i18n.c:371
+#: messages-i18n.c:370
 msgid "Record"
 msgstr "記録"

-#: messages-i18n.c:372 po/guile_strings.txt:215
+#: messages-i18n.c:371 po/guile_strings.txt:215
 msgid "Register"
 msgstr ""

-#: messages-i18n.c:373 po/guile_strings.txt:208
+#: messages-i18n.c:372 po/guile_strings.txt:208
 msgid "Report"
 msgstr "帳票"

-#: messages-i18n.c:374
+#: messages-i18n.c:373
 msgid "Reports"
 msgstr "帳票"

-#: messages-i18n.c:375
+#: messages-i18n.c:374
 msgid "Save"
 msgstr "保存"

-#: messages-i18n.c:376
+#: messages-i18n.c:375
 msgid "Savings"
 msgstr "貯蓄"

-#: messages-i18n.c:377
+#: messages-i18n.c:376
 msgid "Scrub"
 msgstr "掃除"

-#: messages-i18n.c:378
+#: messages-i18n.c:377
 msgid "Search Results"
 msgstr "検索結果"

-#: messages-i18n.c:379 po/guile_strings.txt:189
+#: messages-i18n.c:378 po/guile_strings.txt:189
 msgid "Security"
 msgstr "証券"

-#: messages-i18n.c:380
+#: messages-i18n.c:379
 msgid "Sell"
 msgstr "売る"

-#: messages-i18n.c:381
+#: messages-i18n.c:380
 msgid "Settings"
 msgstr "設定"

-#: messages-i18n.c:382
+#: messages-i18n.c:381
 msgid "Simple"
 msgstr ""

-#: messages-i18n.c:383 po/guile_strings.txt:313
+#: messages-i18n.c:382 po/guile_strings.txt:313
 msgid "Sold"
 msgstr ""

-#: messages-i18n.c:384 po/guile_strings.txt:51
+#: messages-i18n.c:383 po/guile_strings.txt:51
 msgid "Spend"
 msgstr ""

-#: messages-i18n.c:385
+#: messages-i18n.c:384
 msgid "Split"
 msgstr ""

-#: messages-i18n.c:386
+#: messages-i18n.c:385
 msgid "STCG"
 msgstr "短期キャピタルゲイン"

-#: messages-i18n.c:387 po/guile_strings.txt:353
+#: messages-i18n.c:386 po/guile_strings.txt:353
 #: src/gnome/glade-gnc-dialogs.c:576
 msgid "Stock"
 msgstr "株"

-#: messages-i18n.c:388 po/guile_strings.txt:246
+#: messages-i18n.c:387 po/guile_strings.txt:246
 msgid "Style"
 msgstr "スタイル"

-#: messages-i18n.c:389
+#: messages-i18n.c:388
 msgid "Surplus"
 msgstr "剰余"

-#: messages-i18n.c:390
+#: messages-i18n.c:389
 msgid "Teller"
 msgstr "銀行窓口"

-#: messages-i18n.c:391 po/guile_strings.txt:302
+#: messages-i18n.c:390 po/guile_strings.txt:302
 msgid "To"
 msgstr ""

-#: messages-i18n.c:392 src/gnome/glade-gnc-dialogs.c:2615
+#: messages-i18n.c:391 src/gnome/glade-gnc-dialogs.c:2615
 msgid "Today"
 msgstr "本日"

-#: messages-i18n.c:393 messages-i18n.c:394 po/guile_strings.txt:207
+#: messages-i18n.c:392 messages-i18n.c:393 po/guile_strings.txt:207
 msgid "Total"
 msgstr "合計"

-#: messages-i18n.c:395 po/guile_strings.txt:304
+#: messages-i18n.c:394 po/guile_strings.txt:304
 #: src/gnome/glade-gnc-dialogs.c:295 src/gnome/glade-gnc-dialogs.c:349
 msgid "Type"
 msgstr "型"

-#: messages-i18n.c:396
+#: messages-i18n.c:395
 msgid "Transaction"
 msgstr "取引"

-#: messages-i18n.c:397
+#: messages-i18n.c:396
 msgid "Transfer"
 msgstr "移動"

-#: messages-i18n.c:398 po/guile_strings.txt:66
+#: messages-i18n.c:397 po/guile_strings.txt:66
 msgid "Value"
 msgstr "価値"

-#: messages-i18n.c:399
+#: messages-i18n.c:398
 msgid "WARNING"
 msgstr "警告"

-#: messages-i18n.c:400
+#: messages-i18n.c:399
 #, fuzzy
 msgid "Weeks"
 msgstr "週"

-#: messages-i18n.c:401
+#: messages-i18n.c:400
 msgid "Wire"
 msgstr ""

-#: messages-i18n.c:402
+#: messages-i18n.c:401
 msgid "Withdraw"
 msgstr "引出し"

-#: messages-i18n.c:403 po/guile_strings.txt:60
+#: messages-i18n.c:402 po/guile_strings.txt:60
 #, fuzzy
 msgid "Withdrawal"
 msgstr "引出し"

-#: messages-i18n.c:404
+#: messages-i18n.c:403
 #, fuzzy
 msgid "Years"
 msgstr "年"

-#: messages-i18n.c:405
+#: messages-i18n.c:404
 msgid "Yes"
 msgstr "はい"

@ -3628,6 +3625,9 @@ msgstr ""
 msgid "You must select a printer first."
 msgstr "プリンターをまず選択して下さい。"

+#~ msgid "Show Categories"
+#~ msgstr "¶èÊ¬¤òÉ½¼¨¤¹¤ë"
+
 #~ msgid "Import QIF File - Scripted in Guile."
 #~ msgstr "QIF形式ファイルのインポート - Guileのスクリプトで書かれています。"

--- a/po/sv.po
+++ b/po/sv.po
--- a/src/gnome/dialog-transfer.c
+++ b/src/gnome/dialog-transfer.c
@ -116,10 +116,10 @@ gnc_xfer_dialog_create_tree_frame(Account *initial, gchar *title,
    }
  }

-  button = gtk_check_button_new_with_label(SHOW_CATEGORIES_STR);
+  button = gtk_check_button_new_with_label(SHOW_INC_EXP_STR);
  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), is_category);
  gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip(tooltips, button, SHOW_CAT_MSG, NULL);
+  gtk_tooltips_set_tip(tooltips, button, SHOW_INC_EXP_MSG, NULL);

  gtk_signal_connect(GTK_OBJECT(button), "toggled",
 		     GTK_SIGNAL_FUNC(gnc_xfer_dialog_toggle_cb),
--- a/src/messages_i18n.h
+++ b/src/messages_i18n.h
@ -143,7 +143,7 @@
                            "currency.")
 #define REPORT_ERR_MSG    _("Error executing scheme report.")
 #define REPORT_NOPARM_MSG _("This report has no parameters.")
-#define SHOW_CAT_MSG      _("Show the income and expense accounts.")
+#define SHOW_INC_EXP_MSG  _("Show the income and expense accounts.")
 #define TRANS_CHANGED_MSG _("The current transaction has been changed.\n"\
                            "Would you like to record it?")
 #define TRANS_DEL_MSG     _("Are you sure you want to delete\n   %s\n"\
@ -481,8 +481,7 @@
 #define SET_TO_DEFAULT_STR  _("Set to default")
 #define SETUP_ACCT_STR      _("Set Up Account")
 #define SHOW_ALL_STR        _("Show All")
-#define SHOW_INC_EXP_STR    _("Show Inc/Exp")
-#define SHOW_CATEGORIES_STR _("Show Categories")
+#define SHOW_INC_EXP_STR    _("Show Income/Expense")
 #define SHOW_EARLIEST_STR   _("Show Earliest")
 #define SHOW_LATEST_STR     _("Show Latest")
 #define SINGLE_LINE_STR_N  N_("Single Line")