[Gnucash-changes] r11828 - gnucash/branches/cashutil/cashutil -
next step in the build within a build
Neil Williams
codehelp at cvs.gnucash.org
Fri Nov 4 18:22:48 EST 2005
Author: codehelp
Date: 2005-11-04 18:22:46 -0500 (Fri, 04 Nov 2005)
New Revision: 11828
Added:
gnucash/branches/cashutil/cashutil/autogen.sh
Removed:
gnucash/branches/cashutil/cashutil/cashutil-autogen.sh
gnucash/branches/cashutil/cashutil/src/backend-bus.c
gnucash/branches/cashutil/cashutil/src/backend-bus.h
Modified:
gnucash/branches/cashutil/cashutil/ChangeLog
gnucash/branches/cashutil/cashutil/README
gnucash/branches/cashutil/cashutil/po/
gnucash/branches/cashutil/cashutil/po/POTFILES.in
gnucash/branches/cashutil/cashutil/po/en_GB.po
gnucash/branches/cashutil/cashutil/src/Makefile.am
gnucash/branches/cashutil/cashutil/src/README
gnucash/branches/cashutil/cashutil/src/cashutil.c
Log:
next step in the build within a build
Modified: gnucash/branches/cashutil/cashutil/ChangeLog
===================================================================
--- gnucash/branches/cashutil/cashutil/ChangeLog 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/ChangeLog 2005-11-04 23:22:46 UTC (rev 11828)
@@ -1,3 +1,19 @@
+2005-11-04 Neil Williams <linux at codehelp.co.uk>
+
+ * cashutil/cashutil-autogen.sh : Removed.
+ * cashutil/src/backend-bus.c : Moved.
+ * cashutil/src/backend-bus.h : Moved.
+ * cashutil/src/Makefile.am : remove deleted files.
+ * cashutil/src/cashutil.c : gdb-style GNU notice
+ in --version.
+ * cashutil/src/README : Update for build changes.
+ * cashutil/README : Update for build changes.
+ * cashutil/autogen.sh : The original (external)
+ autogen.sh from cashutil.
+ * cashutil/po : svn:ignore change.
+ * cashutil/po/en_GB.po : updated.
+ * cashutil/po/POTFILES.in : remove deleted file.
+
2005-11-03 Neil Williams <linux at codehelp.co.uk>
* src/business/business-core/file/Makefile.am : Quick fix
Modified: gnucash/branches/cashutil/cashutil/README
===================================================================
--- gnucash/branches/cashutil/cashutil/README 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/README 2005-11-04 23:22:46 UTC (rev 11828)
@@ -26,7 +26,16 @@
5. CashUtil will also now link into the GnuCash v2 XML
backend to read existing user data files as well as
exported data.
-
+
+6. CashUtil shares the installed versions of these GModules
+ with gnucash:
+ libgnc-backend-file.la
+ libgnc-backend-bus.la
+
+ CashUtil also shares these libraries with gnucash:
+ libcashobjects.la
+ libcashbusobjects.la
+
CashUtil needs QOF v0.6.0 (currently available at v0.6.0
and via CVS) - it can use the gnucash internal libqof.
Added: gnucash/branches/cashutil/cashutil/autogen.sh
===================================================================
--- gnucash/branches/cashutil/cashutil/autogen.sh 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/autogen.sh 2005-11-04 23:22:46 UTC (rev 11828)
@@ -0,0 +1,251 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PKG_NAME=cashutil
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+DIE=0
+
+INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+LIBTOOL=${LIBTOOL:-libtool}
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
+ echo "Download the appropriate package for your distribution or get the source."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.50.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+}
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+ (glibtool --version) < /dev/null > /dev/null 2>&1 ||
+ (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ }
+}
+
+(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
+ (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltool' installed."
+ echo "You can get it from:"
+ echo " ftp://ftp.gnome.org/pub/GNOME/"
+ DIE=1
+ }
+}
+
+(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
+ (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
+ (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`glib' installed."
+ echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
+ DIE=1
+ }
+}
+
+# usage: test_version program version
+# returns 0 if program >= version; returns 1 if not.
+test_version()
+{
+ this_prog="$1"
+ want_vers="$2"
+
+ testv=`"$this_prog" --version 2>/dev/null | head -1 | awk '{print $NF}'`
+ if test -z "$testv" ; then return 1 ; fi
+
+ testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
+ testv_minor=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
+
+ vers_major=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
+ vers_minor=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
+
+ # if wanted_major > found_major, this isn't good enough
+ if test $vers_major -gt $testv_major ; then
+ return 1
+ # if wanted_major < found_major, then this is fine
+ elif test $vers_major -lt $testv_major ; then
+ return 0
+ # if we get here, then the majors are equal, so test the minor version
+ # we want found_minor >= want_minor.
+ # So, if want_minor > found_minor, this is bad.
+ elif test $vers_minor -gt $testv_minor ; then
+ return 1
+ # this is it.
+ else
+ return 0
+ fi
+}
+
+# usage: find_program preset program version "<other versions>"
+# sets "program" to the name of the program to use.
+# if preset is set, then use that regardless,
+# otherwise check if "program" is of a good enough version and use that,
+# otherwise check if "program-version" is of a good enough version and use that.
+# otherwise return an error.
+find_program()
+{
+ find="$1"
+ prog="$2"
+ vers="$3"
+ extravers="$4"
+
+ if test -n "$find" ; then
+ test_version "$find" "$vers"
+ status="$?"
+ if test "$status" = 0 ; then
+ program="$find"
+ return 0
+ fi
+ echo "**Error**: cannot use $find"
+ else
+
+ test_version "$prog" "$vers"
+ status=$?
+ if test "$status" = 0 ; then
+ program="$prog"
+ return 0
+ fi
+
+ for test_vers in $vers $extravers ; do
+ test_version "$prog-$test_vers" "$vers"
+ status=$?
+ if test "$status" = 0 ; then
+ program="$prog-$test_vers"
+ return 0
+ fi
+ done
+ fi
+
+ echo
+ echo "**Warning**: Could not find a $prog that identifies itself >= $vers."
+ echo
+ program="$prog"
+}
+
+# These statics should really be defined at the top
+find_program "$AUTOCONF" autoconf "2.53"
+AUTOCONF="$program"
+find_program "$AUTOHEADER" autoheader "2.53"
+AUTOHEADER="$program"
+find_program "$AUTOMAKE" automake "1.5 1.6 1.7 1.8"
+AUTOMAKE="$program"
+find_program "$ACLOCAL" aclocal "1.5 1.6 1.7 1.8"
+ACLOCAL="$program"
+
+($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ NO_AUTOMAKE=yes
+}
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: Missing \`aclocal'. The version of \`automake'"
+ echo "installed doesn't appear recent enough."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+}
+
+if test "$DIE" -eq 1; then
+ exit 1
+fi
+
+if test -z "$*"; then
+ echo "**Warning**: I am going to run \`configure' with no arguments."
+ echo "If you wish to pass any to it, please specify them on the"
+ echo \`$0\'" command line."
+ echo
+fi
+
+case $CC in
+xlc )
+ am_opt=--include-deps;;
+esac
+
+for coin in `find $srcdir -name configure.ac -print`
+do
+ dr=`dirname $coin`
+ if test -f $dr/NO-AUTO-GEN; then
+ echo skipping $dr -- flagged as no auto-gen
+ else
+ echo processing $dr
+ ( cd $dr
+ aclocalinclude="$ACLOCAL_FLAGS -I m4"
+
+ if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
+ if grep "sed.*POTFILES" configure.ac >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.ac
+ else
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running glib-gettextize... Ignore non-fatal messages."
+ echo "no" | glib-gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
+ fi
+ if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+ if test -z "$NO_LIBTOOLIZE" ; then
+ case "$OSTYPE" in
+ *darwin*)
+ echo "Running glibtoolize... ($MACHTYPE)"
+ glibtoolize --force --copy
+ ;;
+ *)
+ echo "Running libtoolize..."
+ libtoolize --force --copy
+ ;;
+ esac
+ fi
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+ echo "Running intltoolize ..."
+ intltoolize --force --copy --automake
+ fi
+
+ echo "Running aclocal $aclocalinclude ..."
+ $ACLOCAL $aclocalinclude || {
+ echo
+ echo "**Error**: aclocal failed. This may mean that you have not"
+ echo "installed all of the packages you need, or you may need to"
+ echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+ echo "for the prefix where you installed the packages whose"
+ echo "macros were not found"
+ exit 1
+ }
+
+ if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+ echo "Running autoheader..."
+ $AUTOHEADER || { echo "**Error**: autoheader failed."; exit 1; }
+ fi
+ echo "Running automake --gnu $am_opt ..."
+ $AUTOMAKE --add-missing --gnu $am_opt ||
+ { echo "**Error**: automake failed."; exit 1; }
+ echo "Running autoconf ..."
+ $AUTOCONF || { echo "**Error**: autoconf failed."; exit 1; }
+ ) || exit 1
+ fi
+done
+
+conf_flags="--enable-maintainer-mode " #--enable-compile-warnings --enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+ echo Running $srcdir/configure $conf_flags "$@" ...
+ $srcdir/configure $conf_flags "$@" \
+ && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+ echo Skipping configure process.
+fi
Property changes on: gnucash/branches/cashutil/cashutil/autogen.sh
___________________________________________________________________
Name: svn:executable
+ *
Deleted: gnucash/branches/cashutil/cashutil/cashutil-autogen.sh
===================================================================
--- gnucash/branches/cashutil/cashutil/cashutil-autogen.sh 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/cashutil-autogen.sh 2005-11-04 23:22:46 UTC (rev 11828)
@@ -1,251 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-PKG_NAME=cashutil
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
-LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
-LIBTOOL=${LIBTOOL:-libtool}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
- echo "Download the appropriate package for your distribution or get the source."
- echo "Get ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.50.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/cashutil/configure.ac >/dev/null) && {
- (glibtool --version) < /dev/null > /dev/null 2>&1 ||
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
- }
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/cashutil/configure.ac >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltool' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/cashutil/configure.ac >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
- DIE=1
- }
-}
-
-# usage: test_version program version
-# returns 0 if program >= version; returns 1 if not.
-test_version()
-{
- this_prog="$1"
- want_vers="$2"
-
- testv=`"$this_prog" --version 2>/dev/null | head -1 | awk '{print $NF}'`
- if test -z "$testv" ; then return 1 ; fi
-
- testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
- testv_minor=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
-
- vers_major=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
- vers_minor=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
-
- # if wanted_major > found_major, this isn't good enough
- if test $vers_major -gt $testv_major ; then
- return 1
- # if wanted_major < found_major, then this is fine
- elif test $vers_major -lt $testv_major ; then
- return 0
- # if we get here, then the majors are equal, so test the minor version
- # we want found_minor >= want_minor.
- # So, if want_minor > found_minor, this is bad.
- elif test $vers_minor -gt $testv_minor ; then
- return 1
- # this is it.
- else
- return 0
- fi
-}
-
-# usage: find_program preset program version "<other versions>"
-# sets "program" to the name of the program to use.
-# if preset is set, then use that regardless,
-# otherwise check if "program" is of a good enough version and use that,
-# otherwise check if "program-version" is of a good enough version and use that.
-# otherwise return an error.
-find_program()
-{
- find="$1"
- prog="$2"
- vers="$3"
- extravers="$4"
-
- if test -n "$find" ; then
- test_version "$find" "$vers"
- status="$?"
- if test "$status" = 0 ; then
- program="$find"
- return 0
- fi
- echo "**Error**: cannot use $find"
- else
-
- test_version "$prog" "$vers"
- status=$?
- if test "$status" = 0 ; then
- program="$prog"
- return 0
- fi
-
- for test_vers in $vers $extravers ; do
- test_version "$prog-$test_vers" "$vers"
- status=$?
- if test "$status" = 0 ; then
- program="$prog-$test_vers"
- return 0
- fi
- done
- fi
-
- echo
- echo "**Warning**: Could not find a $prog that identifies itself >= $vers."
- echo
- program="$prog"
-}
-
-# These statics should really be defined at the top
-find_program "$AUTOCONF" autoconf "2.53"
-AUTOCONF="$program"
-find_program "$AUTOHEADER" autoheader "2.53"
-AUTOHEADER="$program"
-find_program "$AUTOMAKE" automake "1.5 1.6 1.7 1.8"
-AUTOMAKE="$program"
-find_program "$ACLOCAL" aclocal "1.5 1.6 1.7 1.8"
-ACLOCAL="$program"
-
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
- NO_AUTOMAKE=yes
-}
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
- echo "installed doesn't appear recent enough."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-if test -z "$*"; then
- echo "**Warning**: I am going to run \`configure' with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
-fi
-
-case $CC in
-xlc )
- am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir/cashutil -name configure.ac -print`
-do
- dr=`dirname $coin`
- if test -f $dr/NO-AUTO-GEN; then
- echo skipping $dr -- flagged as no auto-gen
- else
- echo processing $dr
- ( cd $dr
- aclocalinclude="$ACLOCAL_FLAGS -I m4"
-
- if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
- if grep "sed.*POTFILES" cashutil/configure.ac >/dev/null; then
- : do nothing -- we still have an old unmodified configure.ac
- else
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- fi
- if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- case "$OSTYPE" in
- *darwin*)
- echo "Running glibtoolize... ($MACHTYPE)"
- glibtoolize --force --copy
- ;;
- *)
- echo "Running libtoolize..."
- libtoolize --force --copy
- ;;
- esac
- fi
- fi
- if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
- echo "Running intltoolize ..."
- intltoolize --force --copy --automake
- fi
-
- echo "Running aclocal $aclocalinclude ..."
- $ACLOCAL $aclocalinclude || {
- echo
- echo "**Error**: aclocal failed. This may mean that you have not"
- echo "installed all of the packages you need, or you may need to"
- echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
- echo "for the prefix where you installed the packages whose"
- echo "macros were not found"
- exit 1
- }
-
- if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
- echo "Running autoheader..."
- $AUTOHEADER || { echo "**Error**: autoheader failed."; exit 1; }
- fi
- echo "Running automake --gnu $am_opt ..."
- $AUTOMAKE --add-missing --gnu $am_opt ||
- { echo "**Error**: automake failed."; exit 1; }
- echo "Running autoconf ..."
- $AUTOCONF || { echo "**Error**: autoconf failed."; exit 1; }
- ) || exit 1
- fi
-done
-
-conf_flags="--enable-maintainer-mode " #--enable-compile-warnings --enable-iso-c
-
-if test x$NOCONFIGURE = x; then
- echo Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/cashutil/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
- echo Skipping configure process.
-fi
Property changes on: gnucash/branches/cashutil/cashutil/po
___________________________________________________________________
Name: svn:ignore
- Makefile.in
POTFILES
Makefile.in.in
*.gmo
Makefile
+ Makefile.in
POTFILES
Makefile.in.in
*.gmo
Makefile
cashutil.pot
Modified: gnucash/branches/cashutil/cashutil/po/POTFILES.in
===================================================================
--- gnucash/branches/cashutil/cashutil/po/POTFILES.in 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/po/POTFILES.in 2005-11-04 23:22:46 UTC (rev 11828)
@@ -1,7 +1,6 @@
# List of files which containing translatable strings.
# This file was generated by ../make-potfiles.in.
-src/backend-bus.c
src/cashutil.c
src/qof-main.c
src/qofundo.c
Modified: gnucash/branches/cashutil/cashutil/po/en_GB.po
===================================================================
--- gnucash/branches/cashutil/cashutil/po/en_GB.po 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/po/en_GB.po 2005-11-04 23:22:46 UTC (rev 11828)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: CashUtil 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 00:08+0100\n"
+"POT-Creation-Date: 2005-11-04 22:55+0000\n"
"PO-Revision-Date: 2005-08-14 20:41+0100\n"
"Last-Translator: Neil Williams <linux at codehelp.co.uk>\n"
"Language-Team: English (British) <en_gb at li.org>\n"
@@ -16,41 +16,16 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/backend/gnc-backend-file.c:108
-msgid "Number of days to retain old files"
-msgstr "Number of days to retain old files"
-
-#: src/backend/gnc-backend-file.c:109
-msgid ""
-"GnuCash keeps backups of old files, this setting dictates how long each is "
-"kept"
-msgstr ""
-"GnuCash keeps backups of old files, this setting dictates how long each is "
-"kept"
-
-#: src/backend/gnc-backend-file.c:117
-msgid "Compress output files?"
-msgstr ""
-
-#: src/backend/gnc-backend-file.c:118
-msgid ""
-"GnuCash can save data files with compression. Enable this option to compress "
-"your data file. "
-msgstr ""
-
-#: src/backend/io-gncbin-r.c:514
-msgid "Lost Accounts"
-msgstr "Lost Accounts"
-
-#: src/cashutil.c:111
+#: ../src/cashutil.c:147
msgid "Load a GnuCash or QSF book from <filename>"
msgstr ""
-#: src/cashutil.c:132
+#: ../src/cashutil.c:168
+#, fuzzy
msgid ""
"\n"
-" Command line query interface to GnuCash using QOF - the Query Object "
-"Framework.\n"
+" Command line query interface to GnuCash using QOF -\n"
+" the Query Object Framework.\n"
" Supports reading personal and business GnuCash data and running \n"
" SQL-type queries on the live data or XML file. \n"
" Data can be added, edited, removed, printed, merged and written \n"
@@ -74,7 +49,7 @@
" options are -tde, with either -s or -f, then -w.\n"
"\n"
-#: src/cashutil.c:163
+#: ../src/cashutil.c:192
#, c-format
msgid ""
"Fatal error: Cannot initialise QOF.\n"
@@ -83,42 +58,23 @@
"Fatal error: Cannot initialise QOF.\n"
"\n"
-#: src/cashutil.c:189
+#: ../src/cashutil.c:214
#, c-format
msgid "%s: ERROR. Specify only one command out of -i, -l."
msgstr "%s: ERROR. Specify only one command out of -i, -l."
-#: src/cashutil.c:190 src/cashutil.c:250
+#: ../src/cashutil.c:215 ../src/cashutil.c:287
#, c-format
msgid "--explain or --shell\n"
msgstr "--explain or --shell\n"
-#: src/cashutil.c:200
-#, c-format
-msgid " For CashUtil support, join the QOF-devel mailing list at\n"
-msgstr " For CashUtil support, join the QOF-devel mailing list at\n"
-
-#: src/cashutil.c:202
-#, c-format
-msgid ""
-"\n"
-" This is CashUtil v%s\n"
-msgstr ""
-"\n"
-" This is CashUtil v%s\n"
-
-#: src/cashutil.c:203
-#, c-format
-msgid " The GnuCash Command Line Interface.\n"
+#: ../src/cashutil.c:225
+#, fuzzy, c-format
+msgid " GnuCash Command Line Interface.\n"
msgstr " The GnuCash Command Line Interface.\n"
-#: src/cashutil.c:204
+#: ../src/cashutil.c:226
#, c-format
-msgid " Build target..: %s\n"
-msgstr " Build target..: %s\n"
-
-#: src/cashutil.c:205
-#, c-format
msgid ""
" Build date....: %s %s\n"
"\n"
@@ -126,8 +82,13 @@
" Build date....: %s %s\n"
"\n"
-#: src/cashutil.c:206
+#: ../src/cashutil.c:231
#, c-format
+msgid " For CashUtil support, join the QOF-devel mailing list at\n"
+msgstr " For CashUtil support, join the QOF-devel mailing list at\n"
+
+#: ../src/cashutil.c:233
+#, c-format
msgid ""
" Please use --help for more detailed options.\n"
"\n"
@@ -135,22 +96,22 @@
" Please use --help for more detailed options.\n"
"\n"
-#: src/cashutil.c:242
+#: ../src/cashutil.c:279
#, c-format
msgid "%s: ERROR. Unknown option %d, argument: %s\n"
msgstr "%s: ERROR. Unknown option %d, argument: %s\n"
-#: src/cashutil.c:249
+#: ../src/cashutil.c:286
#, c-format
msgid "%s: Please specify only one command out of -i, -l."
msgstr "%s: Please specify only one command out of -i, -l."
-#: src/cashutil.c:256
+#: ../src/cashutil.c:293
#, c-format
msgid "%s: Sorry, %s cannot yet read STDIN.\n"
msgstr "%s: Sorry, %s cannot yet read STDIN.\n"
-#: src/cashutil.c:290
+#: ../src/cashutil.c:340
#, c-format
msgid ""
"%s: Error. please specify the database to explain.\n"
@@ -159,52 +120,52 @@
"%s: Error. please specify the database to explain.\n"
"\n"
-#: src/qof-main.c:161
+#: ../src/qof-main.c:193
#, c-format
msgid "Choose the %s to edit: (1 - %d): "
msgstr ""
-#: src/qof-main.c:166
+#: ../src/qof-main.c:198
#, c-format
msgid "Choose the %s to DELETE: (1 - %d): "
msgstr ""
-#: src/qof-main.c:171
+#: ../src/qof-main.c:203
#, c-format
msgid "Choose the %s to print: (1 - %d): "
msgstr ""
-#: src/qof-main.c:184
+#: ../src/qof-main.c:216
#, fuzzy, c-format
msgid "Only %d objects are available of type '%s'.\n"
msgstr "%s: No objects of type '%s' found.\n"
-#: src/qof-main.c:186
+#: ../src/qof-main.c:218
#, c-format
msgid "Choose the %s to use: (1 - %d): "
msgstr ""
-#: src/qof-main.c:246
+#: ../src/qof-main.c:278
#, c-format
msgid "%s: No objects of type '%s' found.\n"
msgstr "%s: No objects of type '%s' found.\n"
-#: src/qof-main.c:262
+#: ../src/qof-main.c:294
#, c-format
msgid "No parameter named '%s' found for object '%s'\n"
msgstr "No parameter named '%s' found for object '%s'\n"
-#: src/qof-main.c:336
+#: ../src/qof-main.c:368
#, c-format
msgid "%s: Cannot add '%s' - object name not found\n"
msgstr "%s: Cannot add '%s' - object name not found\n"
-#: src/qof-main.c:345
+#: ../src/qof-main.c:377
#, c-format
msgid "Failed to add an instance of %s\n"
msgstr "Failed to add an instance of %s\n"
-#: src/qof-main.c:348
+#: ../src/qof-main.c:380
#, c-format
msgid ""
"Added an instance of %s\n"
@@ -213,13 +174,13 @@
"Added an instance of %s\n"
"\n"
-#: src/qof-main.c:349
+#: ../src/qof-main.c:381
#, c-format
msgid "Now edit the parameter details of this instance.\n"
msgstr "Now edit the parameter details of this instance.\n"
-#: src/qof-main.c:350 src/qof-main.c:381 src/qof-main.c:391 src/qof-main.c:423
-#: src/qof-main.c:807
+#: ../src/qof-main.c:382 ../src/qof-main.c:413 ../src/qof-main.c:423
+#: ../src/qof-main.c:455 ../src/qof-main.c:840
#, c-format
msgid ""
"Type 'help' for available commands or parameters.\n"
@@ -228,39 +189,39 @@
"Type 'help' for available commands or parameters.\n"
"\n"
-#: src/qof-main.c:373
+#: ../src/qof-main.c:405
#, c-format
msgid "%s: Cannot edit '%s' - object name not found\n"
msgstr "%s: Cannot edit '%s' - object name not found\n"
-#: src/qof-main.c:380
+#: ../src/qof-main.c:412
#, c-format
msgid "Select an instance of %s to edit:\n"
msgstr "Select an instance of %s to edit:\n"
-#: src/qof-main.c:390 src/qof-main.c:806
+#: ../src/qof-main.c:422 ../src/qof-main.c:839
#, c-format
msgid "Edit the parameter details of the selected instance.\n"
msgstr "Edit the parameter details of the selected instance.\n"
-#: src/qof-main.c:415
+#: ../src/qof-main.c:447
#, c-format
msgid "%s: Cannot delete '%s' - object name not found\n"
msgstr "%s: Cannot delete '%s' - object name not found\n"
-#: src/qof-main.c:422
+#: ../src/qof-main.c:454
#, c-format
msgid "Select the instance of %s to delete\n"
msgstr "Select the instance of %s to delete\n"
-#: src/qof-main.c:436
+#: ../src/qof-main.c:468
#, c-format
msgid ""
"The instance has been DELETED. Type 'quit' to exit and undo. The file will "
"not be changed until you type 'write'.\n"
msgstr ""
-#: src/qof-main.c:449
+#: ../src/qof-main.c:481
#, fuzzy, c-format
msgid ""
"\n"
@@ -277,16 +238,16 @@
"Descriptions are shown only for readability.\n"
"\n"
-#: src/qof-main.c:453
+#: ../src/qof-main.c:485
msgid "Object Name"
msgstr ""
-#: src/qof-main.c:453
+#: ../src/qof-main.c:485
#, fuzzy
msgid "Description\n"
msgstr "Name%sDescription"
-#: src/qof-main.c:455
+#: ../src/qof-main.c:487
#, c-format
msgid ""
"\n"
@@ -297,22 +258,22 @@
"Use 'explain <database>' to see the list of fields within\n"
"any supported database.\n"
-#: src/qof-main.c:469
+#: ../src/qof-main.c:501
#, c-format
msgid "%-24s %-12s %s\n"
msgstr ""
-#: src/qof-main.c:480
+#: ../src/qof-main.c:512
#, c-format
msgid "%s: Cannot print '%s' - object name not found\n"
msgstr "%s: Cannot print '%s' - object name not found\n"
-#: src/qof-main.c:488
+#: ../src/qof-main.c:520
#, c-format
msgid "Select the instance of '%s' to print.\n"
msgstr "Select the instance of '%s' to print.\n"
-#: src/qof-main.c:489
+#: ../src/qof-main.c:521
#, c-format
msgid ""
" Type 'help' for available commands or parameters.\n"
@@ -321,24 +282,24 @@
" Type 'help' for available commands or parameters.\n"
"\n"
-#: src/qof-main.c:495 src/qof-main.c:882
+#: ../src/qof-main.c:527 ../src/qof-main.c:915
msgid "Name"
msgstr "Name"
-#: src/qof-main.c:495 src/qof-main.c:882
+#: ../src/qof-main.c:527 ../src/qof-main.c:915
msgid "Type"
msgstr "Type"
-#: src/qof-main.c:495 src/qof-main.c:882
+#: ../src/qof-main.c:527 ../src/qof-main.c:915
msgid "Value"
msgstr "Value"
-#: src/qof-main.c:506
+#: ../src/qof-main.c:538
#, c-format
msgid "Type: %-12s\tName: %-12s\n"
msgstr "Type: %-12s\tName: %-12s\n"
-#: src/qof-main.c:514 src/qof-main.c:1696
+#: ../src/qof-main.c:546 ../src/qof-main.c:1727
#, c-format
msgid ""
"\n"
@@ -349,7 +310,7 @@
"Parameters of the %s database:\n"
"\n"
-#: src/qof-main.c:519
+#: ../src/qof-main.c:551
#, c-format
msgid ""
"\n"
@@ -358,7 +319,7 @@
"\n"
"%s: %s object not found.\n"
-#: src/qof-main.c:535
+#: ../src/qof-main.c:567
#, c-format
msgid ""
"%s: The current book has not been saved.\n"
@@ -367,22 +328,22 @@
"%s: The current book has not been saved.\n"
"Do you still want to overwrite it? [y/n]\n"
-#: src/qof-main.c:624
+#: ../src/qof-main.c:657
#, c-format
msgid "%i:Parameter name: %s "
msgstr "%i:Parameter name: %s "
-#: src/qof-main.c:627
+#: ../src/qof-main.c:660
#, c-format
msgid "Import data : %s "
msgstr "Import data : %s "
-#: src/qof-main.c:629
+#: ../src/qof-main.c:662
#, c-format
msgid "Original data : %s\n"
msgstr "Original data : %s\n"
-#: src/qof-main.c:635
+#: ../src/qof-main.c:668
#, c-format
msgid ""
"\n"
@@ -395,7 +356,7 @@
" 1 to use the import data or \n"
" 2 to keep the original data or"
-#: src/qof-main.c:639
+#: ../src/qof-main.c:672
#, c-format
msgid ""
"\n"
@@ -404,7 +365,7 @@
"\n"
" 3 to import the data as a NEW object or"
-#: src/qof-main.c:641
+#: ../src/qof-main.c:674
#, c-format
msgid ""
"\n"
@@ -413,12 +374,12 @@
"\n"
" 9 to abort the entire merge operation.\n"
-#: src/qof-main.c:646
+#: ../src/qof-main.c:679
#, c-format
msgid "or 9) : "
msgstr "or 9) : "
-#: src/qof-main.c:672
+#: ../src/qof-main.c:705
#, c-format
msgid ""
"Are you sure you want to abort the entire merge operation?\n"
@@ -429,11 +390,11 @@
"The rest of the import data will not be processed.\n"
"Your original data will not be modified. Abort? y/n : "
-#: src/qof-main.c:676
+#: ../src/qof-main.c:709
msgid "y"
msgstr "y"
-#: src/qof-main.c:677
+#: ../src/qof-main.c:710
#, c-format
msgid ""
"Aborting . . \n"
@@ -442,7 +403,7 @@
"Aborting . . \n"
"\n"
-#: src/qof-main.c:725
+#: ../src/qof-main.c:758
#, c-format
msgid ""
"The current book has not been saved.\n"
@@ -451,7 +412,7 @@
"The current book has not been saved.\n"
"Do you still want to quit without saving? %s"
-#: src/qof-main.c:740
+#: ../src/qof-main.c:773
#, c-format
msgid ""
"\n"
@@ -460,7 +421,7 @@
"\n"
"Thank you for using %s.\n"
-#: src/qof-main.c:746
+#: ../src/qof-main.c:779
#, c-format
msgid ""
"Commands available in the shell are:\n"
@@ -469,82 +430,82 @@
"Commands available in the shell are:\n"
"\n"
-#: src/qof-main.c:748
+#: ../src/qof-main.c:781
msgid "Add a new instance of the object.\n"
msgstr "Add a new instance of the object.\n"
-#: src/qof-main.c:750
+#: ../src/qof-main.c:783
msgid "Select one instance and edit (set) the parameter values.\n"
msgstr "Select one instance and edit (set) the parameter values.\n"
-#: src/qof-main.c:752
+#: ../src/qof-main.c:785
msgid "Select one instance for deletion.\n"
msgstr "Select one instance for deletion.\n"
-#: src/qof-main.c:754
+#: ../src/qof-main.c:787
msgid "Synonym for the --list command outside the shell.\n"
msgstr "Synonym for the --list command outside the shell.\n"
-#: src/qof-main.c:756
+#: ../src/qof-main.c:789
msgid "Select one instance and print the parameter values.\n"
msgstr "Select one instance and print the parameter values.\n"
-#: src/qof-main.c:758
+#: ../src/qof-main.c:791
msgid "Synonym for the --explain command outside the shell.\n"
msgstr "Synonym for the --explain command outside the shell.\n"
-#: src/qof-main.c:760
+#: ../src/qof-main.c:793
msgid "Replace the current book with data from the file.\n"
msgstr "Replace the current book with data from the file.\n"
-#: src/qof-main.c:762
+#: ../src/qof-main.c:795
msgid "Prompts to save the current book, if any.\n"
msgstr "Prompts to save the current book, if any.\n"
-#: src/qof-main.c:764
+#: ../src/qof-main.c:797
msgid "Write out the current book. If no filename is given,\n"
msgstr "Write out the current book. If no filename is given,\n"
-#: src/qof-main.c:765
+#: ../src/qof-main.c:798
msgid "write to the original file.\n"
msgstr "write to the original file.\n"
-#: src/qof-main.c:766
+#: ../src/qof-main.c:799
msgid "(uses STDOUT if STDIN is used.)\n"
msgstr "(uses STDOUT if STDIN is used.)\n"
-#: src/qof-main.c:768
+#: ../src/qof-main.c:801
msgid "Merge data from the file into the current book.\n"
msgstr "Merge data from the file into the current book.\n"
-#: src/qof-main.c:770
+#: ../src/qof-main.c:803
msgid "Run a \"quoted\" SQL statement.\n"
msgstr "Run a \"quoted\" SQL statement.\n"
-#: src/qof-main.c:771 src/qof-main.c:908
+#: ../src/qof-main.c:804 ../src/qof-main.c:941
msgid "This screen.\n"
msgstr "This screen.\n"
-#: src/qof-main.c:772
+#: ../src/qof-main.c:805
msgid "Quit the shell\n"
msgstr "Quit the shell\n"
-#: src/qof-main.c:814
+#: ../src/qof-main.c:847
#, c-format
msgid "Query returned %d entities\n"
msgstr "Query returned %d entities\n"
-#: src/qof-main.c:843
+#: ../src/qof-main.c:876
#, c-format
msgid "%s: parameter name '%s' of object '%s' not recognised.\n"
msgstr "%s: parameter name '%s' of object '%s' not recognised.\n"
-#: src/qof-main.c:845
+#: ../src/qof-main.c:878
#, c-format
msgid "Type 'explain' for more information.\n"
msgstr "Type 'explain' for more information.\n"
-#: src/qof-main.c:862
+#: ../src/qof-main.c:895
#, c-format
msgid ""
"\n"
@@ -555,7 +516,7 @@
"Editable parameters of the %s object:\n"
"\n"
-#: src/qof-main.c:884
+#: ../src/qof-main.c:917
#, c-format
msgid ""
"\n"
@@ -568,7 +529,7 @@
"parameters for the object '%s'.\n"
"\n"
-#: src/qof-main.c:893
+#: ../src/qof-main.c:926
#, c-format
msgid ""
"Commands available in this sub-shell are:\n"
@@ -577,46 +538,46 @@
"Commands available in this sub-shell are:\n"
"\n"
-#: src/qof-main.c:895
+#: ../src/qof-main.c:928
msgid "Edit the parameter 'Name' to have the 'Value' given.\n"
msgstr "Edit the parameter 'Name' to have the 'Value' given.\n"
-#: src/qof-main.c:898
+#: ../src/qof-main.c:931
msgid "Boolean values accept TRUE|true, 1, Y|y or yes|YES\n"
msgstr "Boolean values accept TRUE|true, 1, Y|y or yes|YES\n"
-#: src/qof-main.c:899
+#: ../src/qof-main.c:932
msgid "String values that include spaces should be quoted\n"
msgstr "String values that include spaces should be quoted\n"
-#: src/qof-main.c:900
+#: ../src/qof-main.c:933
msgid "Synonym for edit.\n"
msgstr "Synonym for edit.\n"
-#: src/qof-main.c:901
+#: ../src/qof-main.c:934
#, c-format
msgid "Print the current values for this '%s' instance.\n"
msgstr "Print the current values for this '%s' instance.\n"
-#: src/qof-main.c:904
+#: ../src/qof-main.c:937
#, c-format
msgid "Show the editable parameters for '%s'\n"
msgstr "Show the editable parameters for '%s'\n"
-#: src/qof-main.c:907
+#: ../src/qof-main.c:940
msgid "Set the edited parameter values.\n"
msgstr "Set the edited parameter values.\n"
-#: src/qof-main.c:910
+#: ../src/qof-main.c:943
msgid "Return to the top shell without setting changes.\n"
msgstr "Return to the top shell without setting changes.\n"
-#: src/qof-main.c:1045 src/qof-main.c:1063
+#: ../src/qof-main.c:1078 ../src/qof-main.c:1096
#, c-format
msgid "%s: bad option - %s, available commands are:\n"
msgstr "%s: bad option - %s, available commands are:\n"
-#: src/qof-main.c:1050 src/qof-main.c:1068
+#: ../src/qof-main.c:1083 ../src/qof-main.c:1101
#, c-format
msgid ""
"\n"
@@ -627,7 +588,7 @@
"Use help for more information.\n"
"\n"
-#: src/qof-main.c:1098 src/qof-main.c:1614
+#: ../src/qof-main.c:1131 ../src/qof-main.c:1645
#, c-format
msgid ""
"%s: Error: Cannot exclude database \"%s\" with option -e\n"
@@ -638,7 +599,7 @@
" because option -d is set to the include the same database: \"%s\"\n"
"Use the '-l' command to see the full list of supported databases.\n"
-#: src/qof-main.c:1117
+#: ../src/qof-main.c:1150
#, c-format
msgid ""
"\n"
@@ -647,7 +608,7 @@
"\n"
"Welcome to the QOF interactive shell ...\n"
-#: src/qof-main.c:1118
+#: ../src/qof-main.c:1151
#, c-format
msgid ""
" Type 'help' for additional information\n"
@@ -656,7 +617,7 @@
" Type 'help' for additional information\n"
"\n"
-#: src/qof-main.c:1126
+#: ../src/qof-main.c:1159
#, c-format
msgid ""
"\n"
@@ -667,50 +628,50 @@
"\n"
"Thank you for using %s.\n"
-#: src/qof-main.c:1173
+#: ../src/qof-main.c:1206
#, c-format
msgid "%s: No suitable backend was found for %s.\n"
msgstr "%s: No suitable backend was found for %s.\n"
-#: src/qof-main.c:1178
+#: ../src/qof-main.c:1211
#, c-format
msgid "%s: The URL '%s' is not supported by this version of %s.\n"
msgstr "%s: The URL '%s' is not supported by this version of %s.\n"
-#: src/qof-main.c:1184
+#: ../src/qof-main.c:1217
#, c-format
msgid "%s: Cannot parse the URL '%s'\n"
msgstr "%s: Cannot parse the URL '%s'\n"
-#: src/qof-main.c:1189
+#: ../src/qof-main.c:1222
#, c-format
msgid ""
"%s: Cannot connect to '%s'. The host, username or password were incorrect.\n"
msgstr ""
"%s: Cannot connect to '%s'. The host, username or password were incorrect.\n"
-#: src/qof-main.c:1195
+#: ../src/qof-main.c:1228
#, c-format
msgid "%s: Cannot connect to '%s'. Connection was lost, unable to send data.\n"
msgstr ""
"%s: Cannot connect to '%s'. Connection was lost, unable to send data.\n"
-#: src/qof-main.c:1201
+#: ../src/qof-main.c:1234
#, c-format
msgid "%s: This file/URL appears to be from a newer version of %s.\n"
msgstr "%s: This file/URL appears to be from a newer version of %s.\n"
-#: src/qof-main.c:1207
+#: ../src/qof-main.c:1240
#, c-format
msgid "%s: The database '%s' does not seem to exist.\n"
msgstr "%s: The database '%s' does not seem to exist.\n"
-#: src/qof-main.c:1212
+#: ../src/qof-main.c:1245
#, c-format
msgid "%s: Could not obtain the lock for '%s'.\n"
msgstr "%s: Could not obtain the lock for '%s'.\n"
-#: src/qof-main.c:1217
+#: ../src/qof-main.c:1250
#, c-format
msgid ""
"%s could not write to '%s'. That database may be on a read-only file system, "
@@ -719,14 +680,14 @@
"%s could not write to '%s'. That database may be on a read-only file system, "
"or you may not have write permission for the directory.\n"
-#: src/qof-main.c:1224
+#: ../src/qof-main.c:1257
#, c-format
msgid ""
"%s: The file/URL '%s' does not contain %s data or the data is corrupt.\n"
msgstr ""
"%s: The file/URL '%s' does not contain %s data or the data is corrupt.\n"
-#: src/qof-main.c:1230
+#: ../src/qof-main.c:1263
#, c-format
msgid ""
"%s: The server at URL '%s' experienced an error or encountered bad or "
@@ -735,17 +696,17 @@
"%s: The server at URL '%s' experienced an error or encountered bad or "
"corrupt data.\n"
-#: src/qof-main.c:1236
+#: ../src/qof-main.c:1269
#, c-format
msgid "%s: You do not have permission to access '%s'.\n"
msgstr "%s: You do not have permission to access '%s'.\n"
-#: src/qof-main.c:1241
+#: ../src/qof-main.c:1274
#, c-format
msgid "%s: An error occurred while processing '%s'.\n"
msgstr "%s: An error occurred while processing '%s'.\n"
-#: src/qof-main.c:1247
+#: ../src/qof-main.c:1280
#, c-format
msgid ""
"%s: Invalid QSF Object file! The QSF object file '%s' failed to validate "
@@ -756,7 +717,7 @@
"against the QSF object schema. The XML structure of the file is either not "
"well-formed or the file contains illegal data.\n"
-#: src/qof-main.c:1255
+#: ../src/qof-main.c:1288
#, c-format
msgid ""
"%s: Invalid QSF Map file! The QSF map file failed to validate against the "
@@ -767,7 +728,7 @@
"QSF map schema. The XML structure of the file is either not well-formed or "
"the file contains illegal data.\n"
-#: src/qof-main.c:1263
+#: ../src/qof-main.c:1296
#, c-format
msgid ""
"%s: The QSF Map file '%s' was written for a different version of QOF. It may "
@@ -776,7 +737,7 @@
"%s: The QSF Map file '%s' was written for a different version of QOF. It may "
"need to be modified to work with your current QOF installation.\n"
-#: src/qof-main.c:1270
+#: ../src/qof-main.c:1303
#, c-format
msgid ""
"%s: The selected QSF map '%s' contains unusable or missing data. This is "
@@ -787,7 +748,7 @@
"usually because not all the required parameters for the defined objects have "
"calculations described in the map.\n"
-#: src/qof-main.c:1277
+#: ../src/qof-main.c:1310
#, c-format
msgid ""
"%s: The selected QSF object file '%s' contains one or more invalid GUIDs. "
@@ -798,7 +759,7 @@
"The file cannot be processed - please check the source of the file and try "
"again.\n"
-#: src/qof-main.c:1284
+#: ../src/qof-main.c:1317
#, c-format
msgid ""
"%s: The selected QSF Object file '%s' requires a mapbut it was not "
@@ -807,7 +768,7 @@
"%s: The selected QSF Object file '%s' requires a mapbut it was not "
"provided.\n"
-#: src/qof-main.c:1290
+#: ../src/qof-main.c:1323
#, c-format
msgid ""
"%s: Wrong QSF map selected. The selected map, validates but was written for "
@@ -818,7 +779,7 @@
"different QOF objects. The list of objects defined in this map does not "
"include all the objects described in the current QSF object file.\n"
-#: src/qof-main.c:1298
+#: ../src/qof-main.c:1331
#, c-format
msgid ""
"%s: The selected file '%s' is a QSF map and cannotbe opened as a QSF "
@@ -827,7 +788,7 @@
"%s: The selected file '%s' is a QSF map and cannotbe opened as a QSF "
"object.\n"
-#: src/qof-main.c:1304
+#: ../src/qof-main.c:1337
#, c-format
msgid ""
"%s: When converting XML strings into numbers, an overflow has been detected. "
@@ -838,47 +799,47 @@
"The QSF object file '%s' contains invalid data in a field that is meant to "
"hold a number.\n"
-#: src/qof-main.c:1311
+#: ../src/qof-main.c:1344
#, c-format
msgid "%s: The QSF object file '%s' should be merged, not opened directly.\n"
msgstr "%s: The QSF object file '%s' should be merged, not opened directly.\n"
-#: src/qof-main.c:1317
+#: ../src/qof-main.c:1350
#, c-format
msgid "%s: There was an error reading the file '%s'.\n"
msgstr "%s: There was an error reading the file '%s'.\n"
-#: src/qof-main.c:1322
+#: ../src/qof-main.c:1355
#, c-format
msgid "%s: There was an error parsing the file '%s'.\n"
msgstr "%s: There was an error parsing the file '%s'.\n"
-#: src/qof-main.c:1327
+#: ../src/qof-main.c:1360
#, c-format
msgid "%s: The file '%s' is empty.\n"
msgstr "%s: The file '%s' is empty.\n"
-#: src/qof-main.c:1332
+#: ../src/qof-main.c:1365
#, c-format
msgid "%s: The file '%s' could not be found.\n"
msgstr "%s: The file '%s' could not be found.\n"
-#: src/qof-main.c:1337
+#: ../src/qof-main.c:1370
#, c-format
msgid "%s: This file is from an older version.\n"
msgstr "%s: This file is from an older version.\n"
-#: src/qof-main.c:1342
+#: ../src/qof-main.c:1375
#, c-format
msgid "%s: Unknown file type, '%s'.\n"
msgstr "%s: Unknown file type, '%s'.\n"
-#: src/qof-main.c:1347
+#: ../src/qof-main.c:1380
#, c-format
msgid "%s: Could not make a backup of '%s'.\n"
msgstr "%s: Could not make a backup of '%s'.\n"
-#: src/qof-main.c:1352
+#: ../src/qof-main.c:1385
#, c-format
msgid ""
"%s: Could not write to '%s'. Check that you have permission to write to this "
@@ -887,22 +848,22 @@
"%s: Could not write to '%s'. Check that you have permission to write to this "
"file and that there is sufficient space to create it.\n"
-#: src/qof-main.c:1359
+#: ../src/qof-main.c:1392
#, c-format
msgid "%s: This database is from an older version.\n"
msgstr "%s: This database is from an older version.\n"
-#: src/qof-main.c:1364
+#: ../src/qof-main.c:1397
#, c-format
msgid "%s: The SQL database is in use by other users.\n"
msgstr "%s: The SQL database is in use by other users.\n"
-#: src/qof-main.c:1369
+#: ../src/qof-main.c:1402
#, c-format
msgid "%s: An unknown I/O error occurred.\n"
msgstr "%s: An unknown I/O error occurred.\n"
-#: src/qof-main.c:1664
+#: ../src/qof-main.c:1695
#, c-format
msgid ""
"\n"
@@ -923,7 +884,7 @@
"Name Description\n"
"\n"
-#: src/qof-main.c:1672
+#: ../src/qof-main.c:1703
#, c-format
msgid ""
"\n"
@@ -934,7 +895,7 @@
"Use '-d <database> --explain' to see the list of fields within\n"
"any supported database.\n"
-#: src/qof-main.c:1674 src/qof-main.c:1698
+#: ../src/qof-main.c:1705 ../src/qof-main.c:1729
#, c-format
msgid ""
"\n"
@@ -945,304 +906,208 @@
"Thank you for using %s\n"
"\n"
-#: src/objects/Account.c:2276
-msgid "Bank"
-msgstr "Bank"
+#: ../src/qofundo.c:126 ../src/qofundo.c:138
+#, c-format
+msgid "%s: Cannot convert %s into a number: an overflow has been detected."
+msgstr "%s: Cannot convert %s into a number: an overflow has been detected."
-#: src/objects/Account.c:2277
-msgid "Cash"
-msgstr "Cash"
+#~ msgid "Number of days to retain old files"
+#~ msgstr "Number of days to retain old files"
-#: src/objects/Account.c:2278
-msgid "Asset"
-msgstr "Asset"
+#~ msgid ""
+#~ "GnuCash keeps backups of old files, this setting dictates how long each "
+#~ "is kept"
+#~ msgstr ""
+#~ "GnuCash keeps backups of old files, this setting dictates how long each "
+#~ "is kept"
-#: src/objects/Account.c:2279
-msgid "Credit Card"
-msgstr "Credit Card"
+#~ msgid "Lost Accounts"
+#~ msgstr "Lost Accounts"
-#: src/objects/Account.c:2280
-msgid "Liability"
-msgstr "Liability"
+#~ msgid ""
+#~ "\n"
+#~ " This is CashUtil v%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ " This is CashUtil v%s\n"
-#: src/objects/Account.c:2281
-msgid "Stock"
-msgstr "Stock"
+#~ msgid " Build target..: %s\n"
+#~ msgstr " Build target..: %s\n"
-#: src/objects/Account.c:2282
-msgid "Mutual Fund"
-msgstr "Mutual Fund"
+#~ msgid "Bank"
+#~ msgstr "Bank"
-#: src/objects/Account.c:2283
-msgid "Currency"
-msgstr "Currency"
+#~ msgid "Cash"
+#~ msgstr "Cash"
-#: src/objects/Account.c:2284
-msgid "Income"
-msgstr "Income"
+#~ msgid "Asset"
+#~ msgstr "Asset"
-#: src/objects/Account.c:2285 src/objects/gncInvoice.c:608
-msgid "Expense"
-msgstr "Expense"
+#~ msgid "Credit Card"
+#~ msgstr "Credit Card"
-#: src/objects/Account.c:2286
-msgid "Equity"
-msgstr "Equity"
+#~ msgid "Liability"
+#~ msgstr "Liability"
-#: src/objects/Account.c:2287
-msgid "A/Receivable"
-msgstr "A/Receivable"
+#~ msgid "Stock"
+#~ msgstr "Stock"
-#: src/objects/Account.c:2288
-msgid "A/Payable"
-msgstr "A/Payable"
+#~ msgid "Mutual Fund"
+#~ msgstr "Mutual Fund"
-#. This is displayed instead of the number of the day of month.
-#: src/objects/FreqSpec.c:691
-msgid "last day"
-msgstr "last day"
+#~ msgid "Currency"
+#~ msgstr "Currency"
-#: src/objects/FreqSpec.c:729
-#, c-format
-msgid "None"
-msgstr "None"
+#~ msgid "Income"
+#~ msgstr "Income"
-#. %s is the strftime-string of the one-time date.
-#: src/objects/FreqSpec.c:739
-#, c-format
-msgid "Once: %s"
-msgstr "Once: %s"
+#~ msgid "Expense"
+#~ msgstr "Expense"
-#. %u is the number of intervals
-#: src/objects/FreqSpec.c:748
-#, c-format
-msgid "Daily (x%u)"
-msgstr "Daily (x%u)"
+#~ msgid "Equity"
+#~ msgstr "Equity"
-#: src/objects/FreqSpec.c:753
-#, c-format
-msgid "Daily"
-msgstr "Daily"
+#~ msgid "A/Receivable"
+#~ msgstr "A/Receivable"
-#. %u is the number of intervals
-#: src/objects/FreqSpec.c:773
-#, c-format
-msgid "Weekdays: (x%u)"
-msgstr "Weekdays: (x%u)"
+#~ msgid "A/Payable"
+#~ msgstr "A/Payable"
-#: src/objects/FreqSpec.c:778
-#, c-format
-msgid "Weekdays"
-msgstr "Weekdays"
+#~ msgid "last day"
+#~ msgstr "last day"
-#. %d are the number of intervals; %s is
-#. the name of the weekday
-#: src/objects/FreqSpec.c:817
-#, c-format
-msgid "Weekly (x%d): %s"
-msgstr "Weekly (x%d): %s"
+#~ msgid "None"
+#~ msgstr "None"
-#. Translators: %s is the name of the weekday
-#: src/objects/FreqSpec.c:823
-#, c-format
-msgid "Weekly: %s"
-msgstr "Weekly: %s"
+#~ msgid "Once: %s"
+#~ msgstr "Once: %s"
-#. %s is the name of the weekday
-#: src/objects/FreqSpec.c:830
-#, c-format
-msgid "Bi-Weekly, %ss"
-msgstr "Bi-Weekly, %ss"
+#~ msgid "Daily (x%u)"
+#~ msgstr "Daily (x%u)"
-#. Translators: %u is the number of intervals;
-#. %s is the day of month of the starting month
-#. (or the string "last day"); %s is the day of
-#. month of the ending month
-#: src/objects/FreqSpec.c:853
-#, c-format
-msgid "Semi-monthly (x%u): %s, %s"
-msgstr "Semi-monthly (x%u): %s, %s"
+#~ msgid "Daily"
+#~ msgstr "Daily"
-#. Translators: %s is the day of month of the
-#. starting month (or the string "last day"); %s
-#. is the day of month of the ending month
-#: src/objects/FreqSpec.c:864
-#, c-format
-msgid "Semi-monthly: %s, %s"
-msgstr "Semi-monthly: %s, %s"
+#~ msgid "Weekdays: (x%u)"
+#~ msgstr "Weekdays: (x%u)"
-#. %u is the number of intervals; %u is
-#. the day of month
-#: src/objects/FreqSpec.c:880
-#, c-format
-msgid "Monthly (x%u): %u"
-msgstr "Monthly (x%u): %u"
+#~ msgid "Weekdays"
+#~ msgstr "Weekdays"
-#. %u is the day of month
-#: src/objects/FreqSpec.c:888
-#, c-format
-msgid "Monthly: %u"
-msgstr "Monthly: %u"
+#~ msgid "Weekly (x%d): %s"
+#~ msgstr "Weekly (x%d): %s"
-#. %u is the number of intervals; %u is
-#. the day of month
-#: src/objects/FreqSpec.c:898
-#, c-format
-msgid "Quarterly (x%u): %u"
-msgstr "Quarterly (x%u): %u"
+#~ msgid "Weekly: %s"
+#~ msgstr "Weekly: %s"
-#. %u is the day of month
-#: src/objects/FreqSpec.c:906
-#, c-format
-msgid "Quarterly: %u"
-msgstr "Quarterly: %u"
+#~ msgid "Bi-Weekly, %ss"
+#~ msgstr "Bi-Weekly, %ss"
-#. %u is the number of intervals; %u is
-#. the day of month
-#: src/objects/FreqSpec.c:917
-#, c-format
-msgid "Tri-Yearly (x%u): %u"
-msgstr "Tri-Yearly (x%u): %u"
+#~ msgid "Semi-monthly (x%u): %s, %s"
+#~ msgstr "Semi-monthly (x%u): %s, %s"
-#. %u is the day of month
-#: src/objects/FreqSpec.c:925
-#, c-format
-msgid "Tri-Yearly: %u"
-msgstr "Tri-Yearly: %u"
+#~ msgid "Semi-monthly: %s, %s"
+#~ msgstr "Semi-monthly: %s, %s"
-#. %u is the number of intervals; %u
-#. is the day of month
-#: src/objects/FreqSpec.c:940
-#, c-format
-msgid "Semi-Yearly (x%u): %u"
-msgstr "Semi-Yearly (x%u): %u"
+#~ msgid "Monthly (x%u): %u"
+#~ msgstr "Monthly (x%u): %u"
-#. %u is the day of month
-#: src/objects/FreqSpec.c:948
-#, c-format
-msgid "Semi-Yearly: %u"
-msgstr "Semi-Yearly: %u"
+#~ msgid "Monthly: %u"
+#~ msgstr "Monthly: %u"
-#. FIXME: This string *must* be translated for
-#. en_GB, en_AU and everywhere else with the
-#. sensible ordering of ddmmyy. Translators
-#. note: to switch the last two arguments,
-#. write "Yearly (x%1$u): %3$u of month %2$s"
-#.
-#. %u is the number of intervals; %s is the
-#. abbreviated name of the month; %u is the
-#. day of month.
-#: src/objects/FreqSpec.c:971
-#, c-format
-msgid "Yearly "
-msgstr "Yearly month "
+#~ msgid "Quarterly (x%u): %u"
+#~ msgstr "Quarterly (x%u): %u"
-#. %s is the abbreviated name of the
-#. month; %u is the day of month
-#: src/objects/FreqSpec.c:981
-#, c-format
-msgid "Yearly: %s/%u"
-msgstr "Yearly: %s/%u"
+#~ msgid "Quarterly: %u"
+#~ msgstr "Quarterly: %u"
-#: src/objects/FreqSpec.c:988
-#, c-format
-msgid "Unknown"
-msgstr "Unknown"
+#~ msgid "Tri-Yearly (x%u): %u"
+#~ msgstr "Tri-Yearly (x%u): %u"
-#: src/objects/Transaction.c:2219 src/objects/Transaction.c:2240
-msgid "-- Split Transaction --"
-msgstr "-- Split Transaction --"
+#~ msgid "Tri-Yearly: %u"
+#~ msgstr "Tri-Yearly: %u"
-#: src/objects/Transaction.c:2261
-msgid "Split"
-msgstr "Split"
+#~ msgid "Semi-Yearly (x%u): %u"
+#~ msgstr "Semi-Yearly (x%u): %u"
-#: src/objects/Transaction.c:3118
-msgid "Voided transaction"
-msgstr "Voided transaction"
+#~ msgid "Semi-Yearly: %u"
+#~ msgstr "Semi-Yearly: %u"
-#: src/objects/Transaction.c:3143
-msgid "Transaction Voided"
-msgstr "Transaction Voided"
+#~ msgid "Yearly "
+#~ msgstr "Yearly month "
-#: src/objects/gncInvoice.c:604
-msgid "Invoice"
-msgstr "Invoice"
+#~ msgid "Yearly: %s/%u"
+#~ msgstr "Yearly: %s/%u"
-#: src/objects/gncInvoice.c:606
-msgid "Bill"
-msgstr "Bill"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
-#. Set memo. action?
-#: src/objects/gncInvoice.c:1039
-msgid "Extra to Charge Card"
-msgstr "Extra to Charge Card"
+#~ msgid "-- Split Transaction --"
+#~ msgstr "-- Split Transaction --"
-#: src/objects/gncInvoice.c:1078
-msgid "Generated from an invoice. Try unposting the invoice."
-msgstr "Generated from an invoice. Try unposting the invoice."
+#~ msgid "Split"
+#~ msgstr "Split"
-#. Translators: This is the memo of an auto-created split
-#: src/objects/gncInvoice.c:1096
-msgid "Automatic Payment Forward"
-msgstr "Automatic Payment Forward"
+#~ msgid "Voided transaction"
+#~ msgstr "Voided transaction"
-#: src/objects/gncInvoice.c:1097
-msgid "Auto Split"
-msgstr "Auto Split"
+#~ msgid "Transaction Voided"
+#~ msgstr "Transaction Voided"
-#: src/objects/gncInvoice.c:1288 src/objects/gncInvoice.c:1350
-msgid "Payment"
-msgstr "Payment"
+#~ msgid "Invoice"
+#~ msgstr "Invoice"
-#: src/objects/gncInvoice.c:1377
-msgid "Pre-Payment"
-msgstr "Pre-Payment"
+#~ msgid "Bill"
+#~ msgstr "Bill"
-#: src/objects/gncInvoice.c:1474
-msgid " (posted)"
-msgstr " (posted)"
+#~ msgid "Extra to Charge Card"
+#~ msgstr "Extra to Charge Card"
-#: src/objects/gncOrder.c:416
-msgid " (closed)"
-msgstr " (closed)"
+#~ msgid "Generated from an invoice. Try unposting the invoice."
+#~ msgstr "Generated from an invoice. Try unposting the invoice."
-#: src/objects/Scrub.c:105
-msgid "Orphan"
-msgstr "Orphan"
+#~ msgid "Automatic Payment Forward"
+#~ msgstr "Automatic Payment Forward"
-#: src/objects/Scrub.c:411
-msgid "Imbalance"
-msgstr "Imbalance"
+#~ msgid "Auto Split"
+#~ msgstr "Auto Split"
-#: src/objects/cap-gains.c:230
-msgid "Orphaned Gains"
-msgstr "Orphaned Gains"
+#~ msgid "Payment"
+#~ msgstr "Payment"
-#: src/objects/cap-gains.c:244 src/objects/cap-gains.c:916
-#: src/objects/cap-gains.c:921 src/objects/cap-gains.c:922
-msgid "Realized Gain/Loss"
-msgstr "Realized Gain/Loss"
+#~ msgid "Pre-Payment"
+#~ msgstr "Pre-Payment"
-#: src/objects/cap-gains.c:246
-msgid ""
-"Realized Gains or Losses from\n"
-"Commodity or Trading Accounts\n"
-"that haven't been recorded elsewhere.\n"
-msgstr ""
-"Realized Gains or Losses from\n"
-"Commodity or Trading Accounts\n"
-"that have not been recorded elsewhere.\n"
+#~ msgid " (posted)"
+#~ msgstr " (posted)"
-#: src/objects/cap-gains.c:574
-#, fuzzy
-msgid "Lot"
-msgstr "Lot %"
+#~ msgid " (closed)"
+#~ msgstr " (closed)"
-#: src/qofundo.c:126 src/qofundo.c:138
-#, c-format
-msgid "%s: Cannot convert %s into a number: an overflow has been detected."
-msgstr "%s: Cannot convert %s into a number: an overflow has been detected."
+#~ msgid "Orphan"
+#~ msgstr "Orphan"
+#~ msgid "Imbalance"
+#~ msgstr "Imbalance"
+
+#~ msgid "Orphaned Gains"
+#~ msgstr "Orphaned Gains"
+
+#~ msgid "Realized Gain/Loss"
+#~ msgstr "Realized Gain/Loss"
+
+#~ msgid ""
+#~ "Realized Gains or Losses from\n"
+#~ "Commodity or Trading Accounts\n"
+#~ "that haven't been recorded elsewhere.\n"
+#~ msgstr ""
+#~ "Realized Gains or Losses from\n"
+#~ "Commodity or Trading Accounts\n"
+#~ "that have not been recorded elsewhere.\n"
+
+#, fuzzy
+#~ msgid "Lot"
+#~ msgstr "Lot %"
+
#~ msgid "Return to the top shell\n"
#~ msgstr "Return to the top shell\n"
Modified: gnucash/branches/cashutil/cashutil/src/Makefile.am
===================================================================
--- gnucash/branches/cashutil/cashutil/src/Makefile.am 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/src/Makefile.am 2005-11-04 23:22:46 UTC (rev 11828)
@@ -4,7 +4,6 @@
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-I../../src/backend/file \
-I../../src/business/business-core \
- -I../../src/business/business-core/file \
-I../../src/engine \
${GOBJECT_CFLAGS} \
${GLIB_CFLAGS} \
@@ -14,7 +13,6 @@
cashutil
cashutil_SOURCES = \
- backend-bus.c \
qof-main.c \
qofundo.c \
cashutil.c
@@ -28,7 +26,6 @@
cashutil_LDADD = \
../../src/engine/libcashobjects.la \
../../src/business/business-core/libcashbusobjects.la \
- ../../src/business/business-core/libgnc-backend-bus.la \
-lltdl \
${QOF_LIBS} \
${GLIB_LIBS} \
Modified: gnucash/branches/cashutil/cashutil/src/README
===================================================================
--- gnucash/branches/cashutil/cashutil/src/README 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/src/README 2005-11-04 23:22:46 UTC (rev 11828)
@@ -19,3 +19,19 @@
but have to be formatted slightly differently for a command
line interface.
+CashUtil uses the *installed* versions of these GModules
+that are shared with gnucash:
+ libgnc-backend-file.la
+ libgnc-backend-bus.la
+When debugging cashutil, remember that if you change files
+in src/backend/file and/or src/business/business-core/file,
+run `make install` in src/backend/file and/or
+src/business/business-core/file before testing your changes
+in cashutil!
+
+CashUtil also shares these libraries with gnucash:
+ libcashobjects.la
+ libcashbusobjects.la
+These are linked 'in-situ' so a `make` is sufficient.
+
+
Deleted: gnucash/branches/cashutil/cashutil/src/backend-bus.c
===================================================================
--- gnucash/branches/cashutil/cashutil/src/backend-bus.c 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/src/backend-bus.c 2005-11-04 23:22:46 UTC (rev 11828)
@@ -1,83 +0,0 @@
-/***************************************************************************
- * backend-bus.c
- *
- * Sun Sep 25 15:59:50 2005
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
- ****************************************************************************/
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <libxml/xmlmemory.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xmlschemas.h>
-
-#include "gncAddressP.h"
-#include "gncBillTermP.h"
-#include "gncCustomerP.h"
-#include "gncEmployeeP.h"
-#include "gncEntryP.h"
-#include "gncInvoiceP.h"
-#include "gncJobP.h"
-#include "gncVendorP.h"
-#include "gncTaxTableP.h"
-#include "gncOrderP.h"
-
-#include "gnc-address-xml-v2.h"
-#include "gnc-bill-term-xml-v2.h"
-#include "gnc-customer-xml-v2.h"
-#include "gnc-employee-xml-v2.h"
-#include "gnc-entry-xml-v2.h"
-#include "gnc-invoice-xml-v2.h"
-#include "gnc-job-xml-v2.h"
-#include "gnc-order-xml-v2.h"
-#include "gnc-owner-xml-v2.h"
-#include "gnc-tax-table-xml-v2.h"
-#include "gnc-vendor-xml-v2.h"
-
-void
-backend_business_add (void)
-{
- gnc_address_xml_initialize ();
- gnc_billterm_xml_initialize ();
- gnc_customer_xml_initialize ();
- gnc_employee_xml_initialize ();
- gnc_entry_xml_initialize ();
- gnc_invoice_xml_initialize ();
- gnc_job_xml_initialize ();
- gnc_order_xml_initialize ();
- gnc_owner_xml_initialize ();
- gnc_taxtable_xml_initialize ();
- gnc_vendor_xml_initialize ();
-}
-
-
-gboolean bus_cashobjects_register(void)
-{
- g_return_val_if_fail(gncInvoiceRegister(), FALSE);
- g_return_val_if_fail ( gncJobRegister (), FALSE);
- g_return_val_if_fail(gncBillTermRegister(), FALSE);
- g_return_val_if_fail(gncCustomerRegister(), FALSE);
- g_return_val_if_fail(gncAddressRegister(), FALSE);
- g_return_val_if_fail(gncEmployeeRegister(), FALSE);
- g_return_val_if_fail ( gncEntryRegister (), FALSE);
- g_return_val_if_fail (gncVendorRegister (), FALSE);
- g_return_val_if_fail(gncTaxTableRegister(), FALSE);
- g_return_val_if_fail ( gncOrderRegister (), FALSE);
- return TRUE;
-}
Deleted: gnucash/branches/cashutil/cashutil/src/backend-bus.h
===================================================================
--- gnucash/branches/cashutil/cashutil/src/backend-bus.h 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/src/backend-bus.h 2005-11-04 23:22:46 UTC (rev 11828)
@@ -1,28 +0,0 @@
-/***************************************************************************
- * backend-bus.h
- *
- * Sun Sep 25 16:02:07 2005
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
- ****************************************************************************/
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-void backend_business_add (void);
-
-gboolean bus_cashobjects_register (void);
-
Modified: gnucash/branches/cashutil/cashutil/src/cashutil.c
===================================================================
--- gnucash/branches/cashutil/cashutil/src/cashutil.c 2005-11-04 05:49:15 UTC (rev 11827)
+++ gnucash/branches/cashutil/cashutil/src/cashutil.c 2005-11-04 23:22:46 UTC (rev 11828)
@@ -221,13 +221,15 @@
}
case qof_op_vers :
{
- fprintf (stdout, "\n (c) Copyright 2005 Neil Williams <linux at codehelp.co.uk>\n");
+ fprintf (stdout, " %s v%s\n", PACKAGE, VERSION);
+ fprintf (stdout, _(" GnuCash Command Line Interface.\n"));
+ fprintf (stdout, _(" Build date....: %s %s\n\n"), __DATE__, __TIME__);
+ fprintf (stdout, " Copyright 2005 Neil Williams <linux at codehelp.co.uk>\n");
+ fprintf (stdout, " %s is free software; see the source for copying conditions.\n", PACKAGE);
+ fprintf (stdout, " There is NO warranty; not even MERCHANTABILITY or FITNESS\n");
+ fprintf (stdout, " FOR A PARTICULAR PURPOSE.\n\n");
fprintf (stdout, _(" For CashUtil support, join the QOF-devel mailing list at\n"));
fprintf (stdout, " http://lists.sourceforge.net/mailman/listinfo/qof-devel\n");
- fprintf (stdout, _("\n This is CashUtil v%s\n"), VERSION);
- fprintf (stdout, _(" The GnuCash Command Line Interface.\n"));
-// fprintf (stdout, _(" Build target..: %s\n"), HOST_OS);
- fprintf (stdout, _(" Build date....: %s %s\n\n"), __DATE__, __TIME__);
fprintf (stdout, _(" Please use --help for more detailed options.\n\n"));
return 0;
}
More information about the gnucash-changes
mailing list