r16513 - gnucash/branches/gda-dev - Merge with trunk up to r16742 (2.1.1)

Phil Longstaff plongstaff at cvs.gnucash.org
Sun Sep 9 12:25:27 EDT 2007


Author: plongstaff
Date: 2007-09-09 12:25:08 -0400 (Sun, 09 Sep 2007)
New Revision: 16513
Trac: http://svn.gnucash.org/trac/changeset/16513

Removed:
   gnucash/branches/gda-dev/src/engine/test/test-freq-spec.c
Modified:
   gnucash/branches/gda-dev/AUTHORS
   gnucash/branches/gda-dev/ChangeLog
   gnucash/branches/gda-dev/HACKING
   gnucash/branches/gda-dev/Makefile.am
   gnucash/branches/gda-dev/NEWS
   gnucash/branches/gda-dev/accounts/fr_CA/Makefile
   gnucash/branches/gda-dev/configure.in
   gnucash/branches/gda-dev/lib/libqof/qof/qoflog.c
   gnucash/branches/gda-dev/lib/libqof/qof/qoflog.h
   gnucash/branches/gda-dev/macros/svn2cl.xsl
   gnucash/branches/gda-dev/po/de.po
   gnucash/branches/gda-dev/po/hu.po
   gnucash/branches/gda-dev/po/ja.po
   gnucash/branches/gda-dev/po/nb.po
   gnucash/branches/gda-dev/po/nl.po
   gnucash/branches/gda-dev/po/uk.po
   gnucash/branches/gda-dev/src/app-utils/file-utils.c
   gnucash/branches/gda-dev/src/app-utils/gnc-sx-instance-model.c
   gnucash/branches/gda-dev/src/backend/file/gnc-book-xml-v2.c
   gnucash/branches/gda-dev/src/backend/file/gnc-freqspec-xml-v2.c
   gnucash/branches/gda-dev/src/backend/file/gnc-schedxaction-xml-v2.c
   gnucash/branches/gda-dev/src/backend/file/gnc-xml.h
   gnucash/branches/gda-dev/src/backend/file/io-gncxml-v2.c
   gnucash/branches/gda-dev/src/backend/file/sixtp-dom-parsers.h
   gnucash/branches/gda-dev/src/backend/file/sixtp.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h
   gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c
   gnucash/branches/gda-dev/src/bin/gnucash-bin.c
   gnucash/branches/gda-dev/src/doc/sx.rst
   gnucash/branches/gda-dev/src/engine/FreqSpec.h
   gnucash/branches/gda-dev/src/engine/Makefile.am
   gnucash/branches/gda-dev/src/engine/Recurrence.c
   gnucash/branches/gda-dev/src/engine/Recurrence.h
   gnucash/branches/gda-dev/src/engine/SchedXaction.c
   gnucash/branches/gda-dev/src/engine/SchedXaction.h
   gnucash/branches/gda-dev/src/engine/Split.c
   gnucash/branches/gda-dev/src/engine/cashobjects.c
   gnucash/branches/gda-dev/src/engine/gnc-engine.c
   gnucash/branches/gda-dev/src/engine/gnc-engine.h
   gnucash/branches/gda-dev/src/engine/iso-4217-currencies.scm
   gnucash/branches/gda-dev/src/engine/test-core/test-engine-stuff.c
   gnucash/branches/gda-dev/src/engine/test/Makefile.am
   gnucash/branches/gda-dev/src/engine/test/test-recurrence.c
   gnucash/branches/gda-dev/src/gnome-utils/dialog-account.c
   gnucash/branches/gda-dev/src/gnome-utils/dialog-options.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.h
   gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-file.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.h
   gnucash/branches/gda-dev/src/gnome-utils/gnc-html.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-splash.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-tree-view.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-window.c
   gnucash/branches/gda-dev/src/gnome/dialog-sx-editor.c
   gnucash/branches/gda-dev/src/gnome/druid-acct-period.c
   gnucash/branches/gda-dev/src/gnome/druid-loan.c
   gnucash/branches/gda-dev/src/gnome/gnc-plugin-basic-commands.c
   gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/branches/gda-dev/src/gnome/window-reconcile.c
   gnucash/branches/gda-dev/src/import-export/hbci/druid-hbci-initial.c
   gnucash/branches/gda-dev/src/import-export/import-account-matcher.c
   gnucash/branches/gda-dev/src/import-export/import-backend.c
   gnucash/branches/gda-dev/src/import-export/ofx/gnc-ofx-import.c
   gnucash/branches/gda-dev/src/import-export/qif-import/druid-qif-import.c
   gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.c
   gnucash/branches/gda-dev/src/scm/doc.scm
Log:
Merge with trunk up to r16742 (2.1.1)


Modified: gnucash/branches/gda-dev/AUTHORS
===================================================================
--- gnucash/branches/gda-dev/AUTHORS	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/AUTHORS	2007-09-09 16:25:08 UTC (rev 16513)
@@ -77,7 +77,7 @@
    tutorial written by Carol Champagne. Looks after
    releasing new GnuCash versions and updating the website.
 
-Benoit Grégoire <bock at step.polymtl.ca> coded a long awaited OFX module
+Benoit Grégoire <bock at step.polymtl.ca> coded a long awaited OFX module
    for GnuCash and wrote the external libOFX library that it uses.
 
 Neil Williams <linux at codehelp.co.uk> finished conversion from GncBook
@@ -88,7 +88,7 @@
    for GnuCash. He replaced g-wrap by SWIG as GnuCash's guile wrapper
    generator and is also an all around hacker.
 
-Andreas Köhler <andi5.py at gmx.net> is hunting down lots of bugs,
+Andreas Köhler <andi5.py at gmx.net> is hunting down lots of bugs,
    especially for GUI code and other gtk related issues.
 
 Other Contributors:
@@ -103,7 +103,7 @@
 Fred Baube <fred at moremagic.com> for attempted Java port/MoneyDance
 Roman Bertle <bertle at smoerz.org> Austrian German account templates
 Jan-Pascal van Best <j.p.vanbest at tbm.tudelft.nl> MT940 importer
-Dennis Björklund <dennisb at cs.chalmers.se> Swedish translation
+Dennis Björklund <dennisb at cs.chalmers.se> Swedish translation
 Andreas Bogk <andreas at andreas.org> Postgres backend patch
 Per Bojsen <bojsen at worldnet.att.net> several core dump fixes
 Terry Boldt <tboldt at attglobal.net> financial calculator and expression parser
@@ -153,10 +153,10 @@
 Eric Hanchrow <offby1 at blarg.net> updated currency documentation
 Alexandru Harsanyi <haral at codec.ro> for core dumps, lockups, gtk work
 John Hasler <john at dhh.gt.org> engine patch
-Jon KÃ¥re Hellan <hellan at acm.org> misc core dump fixes
+Jon KÃ¥re Hellan <hellan at acm.org> misc core dump fixes
 Hendrik-Jan Heins <hjh at passys.nl> Dutch translation
 Claus Hindsgaul <claus_h at image.dk> messages Danish translation
-Péter Hosszú <hosszu at web.de> Hungarian translation
+Péter Hosszú <hosszu at web.de> Hungarian translation
 Edward J. Huff <ejhuff at huff20may77.us> Date handling in reports, quarterly option
 Tomokazu Iwashita <iwashita at center.nitech.ac.jp> Japanese translation of xea
 David Jafferian <david.jafferian at east.sun.com> Delete account query code.
@@ -191,7 +191,7 @@
 Heath Martin <martinh at pegasus.cc.ucf.edu> gnome patches, major register work, x86_64 support
 Matt Martin <mgmartin at abacusnet.net> guile error handling code
 Yves-Eric Martin <yem_lists.gnucash.org at filter.yve.net> work on financial year end work
-Juan Manuel García Molina <juanmagm at mail.com> messages Spanish translation
+Juan Manuel García Molina <juanmagm at mail.com> messages Spanish translation
 David Montenegro <sunrise2000 at comcast.net> all sorts of Scheme reports
 Orestes Mas <orestes at tsc.upc.es> Catalan translation
 Bernard Meens <meensb at xs4all.nl> Dutch translation
@@ -205,7 +205,7 @@
 Christian Neumair <chris at gnome-de.org> Various gnome2 fixes/HIG work.
 Johnny Ernst Nielsen <j.e.nielsen at iname.com> messages Danish translation
 Stefan Nobis <stefan-ml at snobis.de> German translation patch
-Martin Norbäck <d95mback at dtek.chalmers.se> Swedish translation
+Martin Norbäck <d95mback at dtek.chalmers.se> Swedish translation
 Peter Norton <spacey at inch.com> for a valiant attempt at a GTK port
 Bill Nottingham <notting at redhat.com> guile configure patch
 Peter O'Gorman <peter at pogma.com> file i/o patches, Mac OS X patches
@@ -217,7 +217,7 @@
 Laurent P{'e}lecq <laurent.pelecq at wanadoo.fr> i18n patches with gettext
 Sulyok Peter <sp at elte.hu> Hungarian account templates
 Alain Peyrat <Alain.Peyrat at nmu.alcatel.fr> for configure.in patches
-Zdenko Podobný <zdpo at mailbox.sk> Slovak translations
+Zdenko Podobný <zdpo at mailbox.sk> Slovak translations
 Peter Pointner <peter at wuzel.m.isar.de> QIF import fixes, Qt patches
 Gavin Porter <maufk at csv.warwick.ac.uk> for euro style dates
 Tomas Pospisek <tpo at spin.ch> Debian patches

Modified: gnucash/branches/gda-dev/ChangeLog
===================================================================
--- gnucash/branches/gda-dev/ChangeLog	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/ChangeLog	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1,4 +1,444 @@
 
+2007-08-19 16:47  andi5
+
+	* [r16462] NEWS, configure.in, src/bin/gnucash-bin.c: Update to
+	  release 2.2.1.
+
+2007-08-19 15:57  andi5
+
+	* [r16461] macros/svn2cl.xsl: Do not include
+	  branches/register-rewrite in ChangeLog.
+
+2007-08-19 12:59  andi5
+
+	* [r16460] src/gnome-utils/gnc-tree-view.c: Respect "none" as tree
+	  view sort column name, #468115. Fall back to default ordering.
+
+2007-08-19 01:17  andi5
+
+	* [r16453] src/gnome/window-reconcile.c: Connect a signal to a
+	  glade widget before destroying that. In some cases the interest
+	  button in the reconciliation dialog is for payments, in some for
+	  charges or otherwise it is completely destroyed. Avoid a
+	  critical warning caused by binding a signal to it.
+
+2007-08-18 15:48  jsled
+
+	* [r16448] src/gnome-utils/gnc-dense-cal-store.c,
+	  src/gnome-utils/gnc-dense-cal.c, src/gnome/dialog-sx-editor.c:
+	  Optimize some dense-cal (re-)drawing and updating. Add some
+	  timer-debuggings.
+
+2007-08-18 15:28  jsled
+
+	* [r16447] HACKING: misc changes
+
+2007-08-16 17:10  cstim
+
+	* [r16438] po/hu.po: Updated Hungarian translation
+
+2007-08-13 14:13  jsled
+
+	* [r16422] src/engine/iso-4217-currencies.scm: add Yemeni Riyal
+	  (YER).
+
+2007-08-12 19:14  cstim
+
+	* [r16421] po/hu.po, po/nb.po, po/nl.po, po/uk.po: Fix
+	  translations that accidentally added the context prefix to their
+	  translation.
+
+2007-08-12 18:39  cstim
+
+	* [r16420] po/hu.po: Updated Hungarian translation
+
+2007-08-11 22:49  chris
+
+	* [r16419] src/backend/file/io-gncxml-v2.c: Minor typo fix in
+	  debugging output.
+
+2007-08-11 15:10  cstim
+
+	* [r16414] po/de.po: Update German translation.
+
+2007-08-10 11:46  andi5
+
+	* [r16410] configure.in,
+	  src/import-export/hbci/druid-hbci-initial.c: Revert r15799 and
+	  teach FreeBSD WEXITSTATUS, #465338.
+
+2007-08-09 11:35  andi5
+
+	* [r16409] src/register/register-gnome/gnucash-sheet.c: Make
+	  right-clicks in registers work like left-clicks plus popup,
+	  #339260. To avoid confusion and possible data loss, the register
+	  should focus the transaction that was right-clicked so that
+	  actions chosen from the popup apply to the one the user probably
+	  wanted. The code was already there but unused because of missing
+	  register sheet popups.
+	* [r16408] src/scm/doc.scm: Remove old code unused since r14253.
+
+2007-08-08 20:07  jsled
+
+	* [r16405] src/app-utils/gnc-sx-instance-model.c: remove
+	  superfluous comment.
+
+2007-08-08 14:25  jsled
+
+	* [r16404] src/bin/gnucash-bin.c: remove now-unused var.
+
+2007-08-08 04:20  jsled
+
+	* [r16403] src/bin/gnucash-bin.c: Given set_log_level will
+	  maintain its own safe copy of the string, we don't need to 'dup
+	  it.
+
+2007-08-08 04:19  jsled
+
+	* [r16402] lib/libqof/qof/qoflog.c: Move g_strdup inside of
+	  set_log_level to be a slightly better citizen and fix a serious
+	  bug. :/
+
+2007-08-07 10:35  andi5
+
+	* [r16401] src/gnome-utils/dialog-options.c: Fix a win32 crash
+	  when resetting pixmap options.
+
+2007-08-07 10:28  andi5
+
+	* [r16400] src/gnome-utils/gnc-html.c: Let gnc_html_parse_url grok
+	  Windows filenames, #462567. Change the regular expression that
+	  should match the protocol in a given URL so that it requires at
+	  least two characters and C:\ or C:/ will not be interpreted as
+	  [prot=C, path=\] (or path=/, resp.). Also replace two hard-coded
+	  slash operations by g_path_is_absolute and g_build_filename.
+
+2007-08-07 01:00  jsled
+
+	* [r16399] src/engine/Split.c: Bug#452496: This survived my
+	  regular receipt entry session, a whole 30 minutes of light
+	  testing. So, more testing is probably good, but ain't that
+	  always the case.
+
+2007-08-07 00:56  andi5
+
+	* [r16398] src/app-utils/file-utils.c: In gncFindFile, use
+	  g_path_is_absolute instead of file[0]=='/'.
+
+2007-08-06 15:40  andi5
+
+	* [r16393] src/gnome/gnc-plugin-page-account-tree.c: Avoid
+	  critical warnings when searching interactively in account tree.
+	  gnc_account_n_children will print those when it is called with
+	  NULL.
+
+2007-08-06 10:30  andi5
+
+	* [r16392] src/gnome-utils/dialog-account.c: Avoid a critical
+	  warning when editing an account. As gnc_account_to_ui is called
+	  before a parent account is selected, get_ui_fullname should not
+	  depend on it so that gnc_account_is_root does not always print a
+	  critical warning (GNC_IS_ACCOUNT(account) failed).
+
+2007-08-05 21:44  jsled
+
+	* [r16388] src/engine/gnc-engine.c: If there's no SQL_DIR, then
+	  there's no SQL module to load. So don't. :p
+
+2007-08-05 21:24  jsled
+
+	* [r16387] lib/libqof/qof/qoflog.h,
+	  src/backend/file/gnc-book-xml-v2.c,
+	  src/backend/file/gnc-freqspec-xml-v2.c,
+	  src/backend/file/gnc-schedxaction-xml-v2.c,
+	  src/backend/file/gnc-xml.h,
+	  src/backend/file/sixtp-dom-parsers.h, src/engine/FreqSpec.c,
+	  src/engine/FreqSpec.h, src/engine/FreqSpecP.h,
+	  src/engine/Makefile.am, src/engine/Recurrence.c,
+	  src/engine/Recurrence.h, src/engine/SchedXaction.c,
+	  src/engine/SchedXaction.h, src/engine/cashobjects.c,
+	  src/engine/gnc-engine.c, src/engine/gnc-engine.h,
+	  src/engine/test-core/test-engine-stuff.c,
+	  src/engine/test/Makefile.am, src/engine/test/test-freq-spec.c,
+	  src/engine/test/test-recurrence.c,
+	  src/gnome-utils/gnc-dense-cal-store.c,
+	  src/gnome-utils/gnc-dense-cal-store.h,
+	  src/gnome-utils/gnc-frequency.c,
+	  src/gnome-utils/gnc-frequency.h, src/gnome/dialog-sx-editor.c,
+	  src/gnome/druid-acct-period.c, src/gnome/druid-loan.c: Remove
+	  FreqSpec.
+
+2007-08-04 10:31  cstim
+
+	* [r16383] po/ja.po: Updated Japanese translation by Hiroto
+	  Kagotani
+
+2007-08-04 10:10  cstim
+
+	* [r16382] Makefile.am, po/glossary/hu.po: Add Hungarian glossary
+	  by Tako Kornel.
+
+2007-08-03 01:30  jsled
+
+	* [r16380] src/gnome/druid-loan.c: Bug#170729: format a literal
+	  value to get the locale-specific decimal separator.
+
+2007-08-03 01:26  jsled
+
+	* [r16379] src/import-export/qif-import/druid-qif-import.c:
+	  Bug#445917: parity between label and button. Patch from Andreas
+	  Köhler. ;)
+
+2007-08-02 23:48  jsled
+
+	* [r16378] src/bin/gnucash-bin.c, src/gnome-utils/gnc-file.c,
+	  src/gnome-utils/gnc-splash.c, src/gnome-utils/gnc-window.c:
+	  Bug#457944: Keep splash screen during file loading. - do not
+	  destroy the splash screen during file loading - display which
+	  reports are rendered in the progress field of the splash screen
+	  Patch from Herbert Thoma <herbert.thoma iis fraunhofer de>
+
+2007-08-02 23:41  jsled
+
+	* [r16377] src/backend/file/sixtp.c: whitespace: s/tab/space/
+
+2007-08-01 02:05  plongstaff
+
+	* [r16376] branches/gda-dev/AUTHORS, branches/gda-dev/ChangeLog,
+	  branches/gda-dev/LICENSE, branches/gda-dev/Makefile.am,
+	  branches/gda-dev/NEWS, branches/gda-dev/README.dependencies,
+	  branches/gda-dev/accounts/fr_CA/Makefile,
+	  branches/gda-dev/autogen.sh, branches/gda-dev/configure.in,
+	  branches/gda-dev/doc/Makefile.am,
+	  branches/gda-dev/doc/README-de.win32-bin.txt,
+	  branches/gda-dev/doc/README-fr.win32-bin.txt,
+	  branches/gda-dev/doc/README.win32-bin.txt,
+	  branches/gda-dev/lib/libc/Makefile.am,
+	  branches/gda-dev/lib/libc/strptime.c,
+	  branches/gda-dev/lib/libc/strptime.h,
+	  branches/gda-dev/lib/libqof/backend/file/qof-backend-qsf.h,
+	  branches/gda-dev/lib/libqof/backend/file/qsf-backend.c,
+	  branches/gda-dev/lib/libqof/qof/Makefile.am,
+	  branches/gda-dev/lib/libqof/qof/deprecated.h,
+	  branches/gda-dev/lib/libqof/qof/gnc-date-p.h,
+	  branches/gda-dev/lib/libqof/qof/gnc-date.c,
+	  branches/gda-dev/lib/libqof/qof/gnc-date.h,
+	  branches/gda-dev/lib/libqof/qof/guid.c,
+	  branches/gda-dev/lib/libqof/qof/guid.h,
+	  branches/gda-dev/lib/libqof/qof/kvp-util-p.h,
+	  branches/gda-dev/lib/libqof/qof/kvp-util.c,
+	  branches/gda-dev/lib/libqof/qof/qof-win32.c,
+	  branches/gda-dev/lib/libqof/qof/qofbackend-p.h,
+	  branches/gda-dev/lib/libqof/qof/qofbackend.c,
+	  branches/gda-dev/lib/libqof/qof/qofbackend.h,
+	  branches/gda-dev/lib/libqof/qof/qofbook.c,
+	  branches/gda-dev/lib/libqof/qof/qofbook.h,
+	  branches/gda-dev/lib/libqof/qof/qofbookmerge.c,
+	  branches/gda-dev/lib/libqof/qof/qofevent-p.h,
+	  branches/gda-dev/lib/libqof/qof/qofevent.c,
+	  branches/gda-dev/lib/libqof/qof/qofid-p.h,
+	  branches/gda-dev/lib/libqof/qof/qofid.c,
+	  branches/gda-dev/lib/libqof/qof/qofid.h,
+	  branches/gda-dev/lib/libqof/qof/qofinstance-p.h,
+	  branches/gda-dev/lib/libqof/qof/qofinstance.c,
+	  branches/gda-dev/lib/libqof/qof/qofinstance.h,
+	  branches/gda-dev/lib/libqof/qof/qoflog.c,
+	  branches/gda-dev/lib/libqof/qof/qofquery.c,
+	  branches/gda-dev/lib/libqof/qof/qofquerycore.c,
+	  branches/gda-dev/lib/libqof/qof/qofreference.c,
+	  branches/gda-dev/lib/libqof/qof/qofsession.c,
+	  branches/gda-dev/lib/libqof/qof/qofutil.c,
+	  branches/gda-dev/lib/libqof/qof/qofutil.h,
+	  branches/gda-dev/macros/svn2cl.xsl,
+	  branches/gda-dev/packaging/Makefile.am,
+	  branches/gda-dev/packaging/gnucash-2.1.x.ebuild,
+	  branches/gda-dev/packaging/gnucash.spec.in,
+	  branches/gda-dev/packaging/win32/Makefile.am,
+	  branches/gda-dev/packaging/win32/create_cross_mingw.sh,
+	  branches/gda-dev/packaging/win32/defaults.sh,
+	  branches/gda-dev/packaging/win32/dist.sh,
+	  branches/gda-dev/packaging/win32/exetype.pl,
+	  branches/gda-dev/packaging/win32/functions.sh,
+	  branches/gda-dev/packaging/win32/gnucash.iss.in,
+	  branches/gda-dev/packaging/win32/install.sh,
+	  branches/gda-dev/packaging/win32/reset.sh,
+	  branches/gda-dev/po/ca.po, branches/gda-dev/po/cs.po,
+	  branches/gda-dev/po/da.po, branches/gda-dev/po/de.po,
+	  branches/gda-dev/po/el.po, branches/gda-dev/po/en_GB.po,
+	  branches/gda-dev/po/es.po, branches/gda-dev/po/es_NI.po,
+	  branches/gda-dev/po/eu.po, branches/gda-dev/po/fr.po,
+	  branches/gda-dev/po/hu.po, branches/gda-dev/po/it.po,
+	  branches/gda-dev/po/ja.po, branches/gda-dev/po/nb.po,
+	  branches/gda-dev/po/ne.po, branches/gda-dev/po/nl.po,
+	  branches/gda-dev/po/pl.po, branches/gda-dev/po/pt.po,
+	  branches/gda-dev/po/pt_BR.po, branches/gda-dev/po/ro.po,
+	  branches/gda-dev/po/ru.po, branches/gda-dev/po/rw.po,
+	  branches/gda-dev/po/sk.po, branches/gda-dev/po/sv.po,
+	  branches/gda-dev/po/ta.po, branches/gda-dev/po/tr.po,
+	  branches/gda-dev/po/uk.po, branches/gda-dev/po/zh_CN.po,
+	  branches/gda-dev/po/zh_TW.po,
+	  branches/gda-dev/src/app-utils/app-utils.i,
+	  branches/gda-dev/src/app-utils/gnc-accounting-period.c,
+	  branches/gda-dev/src/app-utils/gnc-component-manager.c,
+	  branches/gda-dev/src/app-utils/gnc-exp-parser.c,
+	  branches/gda-dev/src/app-utils/gnc-sx-instance-model.c,
+	  branches/gda-dev/src/app-utils/gnc-ui-util.c,
+	  branches/gda-dev/src/app-utils/guile-util.c,
+	  branches/gda-dev/src/app-utils/guile-util.h,
+	  branches/gda-dev/src/backend/file/gnc-backend-file.c,
+	  branches/gda-dev/src/backend/file/gnc-backend-file.h,
+	  branches/gda-dev/src/backend/file/gnc-book-xml-v2.c,
+	  branches/gda-dev/src/backend/file/gnc-freqspec-xml-v2.c,
+	  branches/gda-dev/src/backend/file/gnc-schedxaction-xml-v2.c,
+	  branches/gda-dev/src/backend/file/io-example-account.c,
+	  branches/gda-dev/src/backend/file/io-utils.c,
+	  branches/gda-dev/src/backend/gda/gnc-account-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-backend-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-backend-gda.h,
+	  branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h,
+	  branches/gda-dev/src/backend/gda/gnc-book-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-budget-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-budget-gda.h,
+	  branches/gda-dev/src/backend/gda/gnc-commodity-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-lots-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-price-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c,
+	  branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.h,
+	  branches/gda-dev/src/backend/gda/gnc-transaction-gda.c,
+	  branches/gda-dev/src/backend/postgres/PostgresBackend.c,
+	  branches/gda-dev/src/backend/postgres/PostgresBackend.h,
+	  branches/gda-dev/src/backend/postgres/account.c,
+	  branches/gda-dev/src/backend/postgres/book.c,
+	  branches/gda-dev/src/backend/postgres/price.c,
+	  branches/gda-dev/src/backend/postgres/putil.h,
+	  branches/gda-dev/src/backend/postgres/table.m4,
+	  branches/gda-dev/src/backend/postgres/test/test-db.c,
+	  branches/gda-dev/src/backend/postgres/txn.c,
+	  branches/gda-dev/src/backend/postgres/txnmass.c,
+	  branches/gda-dev/src/bin/gnucash-bin.c,
+	  branches/gda-dev/src/business/business-core/gncAddress.c,
+	  branches/gda-dev/src/business/business-core/gncBillTerm.c,
+	  branches/gda-dev/src/business/business-core/gncCustomer.c,
+	  branches/gda-dev/src/business/business-core/gncEmployee.c,
+	  branches/gda-dev/src/business/business-core/gncEmployee.h,
+	  branches/gda-dev/src/business/business-core/gncEntry.c,
+	  branches/gda-dev/src/business/business-core/gncInvoice.c,
+	  branches/gda-dev/src/business/business-core/gncJob.c,
+	  branches/gda-dev/src/business/business-core/gncOrder.c,
+	  branches/gda-dev/src/business/business-core/gncTaxTable.c,
+	  branches/gda-dev/src/business/business-core/gncVendor.c,
+	  branches/gda-dev/src/business/business-core/test/test-address.c,
+	  branches/gda-dev/src/business/business-reports/owner-report.scm,
+	  branches/gda-dev/src/core-utils/core-utils.i,
+	  branches/gda-dev/src/core-utils/core-utils.scm,
+	  branches/gda-dev/src/core-utils/gnc-gconf-utils.c,
+	  branches/gda-dev/src/core-utils/gnc-gkeyfile-utils.c,
+	  branches/gda-dev/src/doc/sx.rst,
+	  branches/gda-dev/src/engine/Account.c,
+	  branches/gda-dev/src/engine/Account.h,
+	  branches/gda-dev/src/engine/AccountP.h,
+	  branches/gda-dev/src/engine/FreqSpec.c,
+	  branches/gda-dev/src/engine/Period.c,
+	  branches/gda-dev/src/engine/Recurrence.c,
+	  branches/gda-dev/src/engine/SchedXaction.c,
+	  branches/gda-dev/src/engine/SchedXaction.h,
+	  branches/gda-dev/src/engine/Scrub.c,
+	  branches/gda-dev/src/engine/Scrub2.c,
+	  branches/gda-dev/src/engine/Split.c,
+	  branches/gda-dev/src/engine/Split.h,
+	  branches/gda-dev/src/engine/SplitP.h,
+	  branches/gda-dev/src/engine/TransLog.c,
+	  branches/gda-dev/src/engine/Transaction.c,
+	  branches/gda-dev/src/engine/Transaction.h,
+	  branches/gda-dev/src/engine/TransactionP.h,
+	  branches/gda-dev/src/engine/binreloc.c,
+	  branches/gda-dev/src/engine/cap-gains.c,
+	  branches/gda-dev/src/engine/gnc-budget.c,
+	  branches/gda-dev/src/engine/gnc-budget.h,
+	  branches/gda-dev/src/engine/gnc-lot.c,
+	  branches/gda-dev/src/engine/gnc-lot.h,
+	  branches/gda-dev/src/engine/gnc-pricedb-p.h,
+	  branches/gda-dev/src/engine/gnc-pricedb.c,
+	  branches/gda-dev/src/engine/gnc-pricedb.h,
+	  branches/gda-dev/src/engine/iso-4217-currencies.scm,
+	  branches/gda-dev/src/engine/test-core/test-engine-stuff.c,
+	  branches/gda-dev/src/engine/test/test-book-merge.c,
+	  branches/gda-dev/src/engine/test/test-guid.c,
+	  branches/gda-dev/src/gnc-module/gnc-module.c,
+	  branches/gda-dev/src/gnome-search/dialog-search.c,
+	  branches/gda-dev/src/gnome-search/search-account.c,
+	  branches/gda-dev/src/gnome-search/search.glade,
+	  branches/gda-dev/src/gnome-utils/Makefile.am,
+	  branches/gda-dev/src/gnome-utils/dialog-account.c,
+	  branches/gda-dev/src/gnome-utils/dialog-options.c,
+	  branches/gda-dev/src/gnome-utils/dialog-preferences.c,
+	  branches/gda-dev/src/gnome-utils/dialog-transfer.c,
+	  branches/gda-dev/src/gnome-utils/dialog-utils.c,
+	  branches/gda-dev/src/gnome-utils/glade/preferences.glade,
+	  branches/gda-dev/src/gnome-utils/gnc-autosave.c,
+	  branches/gda-dev/src/gnome-utils/gnc-autosave.h,
+	  branches/gda-dev/src/gnome-utils/gnc-dense-cal-model.c,
+	  branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.c,
+	  branches/gda-dev/src/gnome-utils/gnc-dense-cal.c,
+	  branches/gda-dev/src/gnome-utils/gnc-file.c,
+	  branches/gda-dev/src/gnome-utils/gnc-html-graph-gog.c,
+	  branches/gda-dev/src/gnome-utils/gnc-main-window.c,
+	  branches/gda-dev/src/gnome-utils/gnc-plugin-file-history.c,
+	  branches/gda-dev/src/gnome-utils/gnc-plugin-file-history.h,
+	  branches/gda-dev/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c,
+	  branches/gda-dev/src/gnome-utils/gnc-sx-list-tree-model-adapter.c,
+	  branches/gda-dev/src/gnome-utils/gnc-tree-view-sx-list.c,
+	  branches/gda-dev/src/gnome-utils/window-main-summarybar.c,
+	  branches/gda-dev/src/gnome/dialog-chart-export.c,
+	  branches/gda-dev/src/gnome/dialog-print-check.c,
+	  branches/gda-dev/src/gnome/dialog-sx-editor.c,
+	  branches/gda-dev/src/gnome/dialog-sx-since-last-run.c,
+	  branches/gda-dev/src/gnome/dialog-tax-info.c,
+	  branches/gda-dev/src/gnome/druid-hierarchy.c,
+	  branches/gda-dev/src/gnome/glade/print.glade,
+	  branches/gda-dev/src/gnome/glade/tax.glade,
+	  branches/gda-dev/src/gnome/gnc-plugin-basic-commands.c,
+	  branches/gda-dev/src/gnome/gnc-plugin-page-register.c,
+	  branches/gda-dev/src/gnome/gnc-plugin-page-sx-list.c,
+	  branches/gda-dev/src/gnome/gnc-split-reg.c,
+	  branches/gda-dev/src/gnome/schemas/apps_gnucash_general.schemas.in,
+	  branches/gda-dev/src/gnome/top-level.c,
+	  branches/gda-dev/src/gnome/ui/gnc-plugin-basic-commands-ui.xml,
+	  branches/gda-dev/src/gnome/window-reconcile.c,
+	  branches/gda-dev/src/import-export/hbci/druid-hbci-initial.c,
+	  branches/gda-dev/src/import-export/hbci/glade/hbci.glade,
+	  branches/gda-dev/src/import-export/hbci/gnc-plugin-hbci-ui.xml,
+	  branches/gda-dev/src/import-export/hbci/gnc-plugin-hbci.c,
+	  branches/gda-dev/src/import-export/import-account-matcher.c,
+	  branches/gda-dev/src/import-export/import-backend.c,
+	  branches/gda-dev/src/import-export/import-match-map.c,
+	  branches/gda-dev/src/import-export/ofx/gnc-ofx-import.c,
+	  branches/gda-dev/src/import-export/qif-import/druid-qif-import.c,
+	  branches/gda-dev/src/import-export/qif-import/qif-file.scm,
+	  branches/gda-dev/src/import-export/qif-import/qif-to-gnc.scm,
+	  branches/gda-dev/src/pixmaps/Makefile.am,
+	  branches/gda-dev/src/pixmaps/gnucash-icon-48x48.bmp,
+	  branches/gda-dev/src/quotes/gnc-fq-helper.in,
+	  branches/gda-dev/src/register/register-core/formulacell.c,
+	  branches/gda-dev/src/register/register-gnome/gnucash-date-picker.c,
+	  branches/gda-dev/src/register/register-gnome/gnucash-sheet.c,
+	  branches/gda-dev/src/report/locale-specific/us/taxtxf.scm,
+	  branches/gda-dev/src/report/report-gnome/Makefile.am,
+	  branches/gda-dev/src/report/report-gnome/gnc-plugin-page-report.c,
+	  branches/gda-dev/src/report/report-system/html-barchart.scm,
+	  branches/gda-dev/src/report/report-system/html-piechart.scm,
+	  branches/gda-dev/src/report/report-system/html-scatter.scm,
+	  branches/gda-dev/src/report/report-system/report.scm,
+	  branches/gda-dev/src/report/standard-reports/price-scatter.scm,
+	  branches/gda-dev/src/report/standard-reports/standard-reports.scm,
+	  branches/gda-dev/src/report/utility-reports/hello-world.scm,
+	  branches/gda-dev/src/scm/Makefile.am,
+	  branches/gda-dev/src/scm/price-quotes.scm,
+	  branches/gda-dev/util/glade-fixup,
+	  branches/gda-dev/util/gnc-svnversion: Merge with trunk up to
+	  r16375. It compiles on my OpenSuSE 10.2 machine but has not been
+	  tested.
+
 2007-07-30 19:21  cstim
 
 	* [r16373] po/ca.po: Updated Catalan translation from the
@@ -73,14 +513,6 @@
 	* [r16349] po/fr.po: Updated French translation by Stephane
 	  Raimbault
 
-2007-07-22 03:13  jeff
-
-	* [r16348]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Set the copy of the model data used for autocompletion to be
-	  owned by the treeview instead of having different copies for
-	  each cellrenderer.
-
 2007-07-22 01:51  andi5
 
 	* [r16347] packaging/win32/dist.sh: LibGSF does not install schema
@@ -157,21 +589,6 @@
 	  Bug#458080: update RPM specfile BuildRequires to remove g-wrap.
 	  Patch from Kevin Hale Boyes.
 
-2007-07-18 19:40  jeff
-
-	* [r16322]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Removed the editing_started_cb function (and related code) that
-	  set up the autocompletion and moved the code to
-	  get_editable_start_editing_cb that was already present and set
-	  as the callback for the "editing-started" signal. Created the
-	  model_copy function to copy the data from the Description column
-	  of the treeview model into a liststore to use as the model for
-	  autocompletion (to solve the crashes caused by using the
-	  treeview model for autocompletion). Added code to gtvt_edited_cb
-	  to add the data from new transactions to the liststore used for
-	  autocompletion.
-
 2007-07-14 11:20  cstim
 
 	* [r16310] po/fr.po: Revert latest French translation as per
@@ -191,15 +608,6 @@
 
 	* [r16303] NEWS, configure.in: update to release 2.2.0
 
-2007-07-13 04:08  jeff
-
-	* [r16302]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Check if seconds returned by xaccTransGetDatePostedTS() are
-	  greater than zero in CellDataFunc (cdf) for COL_DATE. If seconds
-	  are zero assume new transaction and set seconds to current time
-	  to display current date for new transactions.
-
 2007-07-12 19:14  cstim
 
 	* [r16301] po/pt_BR.po: Updated Portuguese (Brazil) translation by
@@ -208,20 +616,6 @@
 	  Frank H. Ellenberger.
 	* [r16299] po/sk.po: Update Slovak translation from TP.
 
-2007-07-12 01:53  jeff
-
-	* [r16298]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Switched "Price" and "Amt" headers back to their original
-	  columns.
-
-2007-07-12 01:21  jeff
-
-	* [r16297]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Changed autocompletion to inline completion. Solves most of the
-	  crashing issues completion seemed to create.
-
 2007-07-11 20:51  andi5
 
 	* [r16296] src/import-export/ofx/gnc-ofx-import.c: Fix an ofx
@@ -243,23 +637,6 @@
 	  po/ta.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po: Merge
 	  translation updates because of very last string change.
 
-2007-07-10 00:28  jeff
-
-	* [r16291]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Jul 09/07 - Passed the TreeView to editing_started_cb and then
-	  called get_trans_model_from_view() inside the callback instead
-	  of getting the model first and passing it.
-
-2007-07-09 20:13  jeff
-
-	* [r16290]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c:
-	  Jul 9/07 - Initial implementation of auto-completion for the
-	  Description column. Adds editing_started_cb function. Causes
-	  some problems with the Account column (selecting account doesn't
-	  work or crashes).
-
 2007-07-09 19:34  cstim
 
 	* [r16289] packaging/win32/gnucash.iss.in: Fix (hopefully) Greek
@@ -391,13 +768,6 @@
 	  confirmation dialog. Also make sure no autosave confirmation
 	  shows up when asking for saving anyway.
 
-2007-07-07 05:11  jeff
-
-	* [r16255]
-	  branches/register-rewrite/src/gnome-utils/planner-cell-renderer-date.c:
-	  Set date->time to mrp_time_current_time() in mcrd_init so that
-	  the calendar shows the current date when displayed.
-
 2007-07-06 21:13  jsled
 
 	* [r16254] LICENSE, src/app-utils/gnc-sx-instance-model.c,
@@ -5641,33 +6011,6 @@
 	  PKG_CONFIG_MIN_VERSION. Lower-case that word in macros/pkg.m4 to
 	  avoid the need to run autogen.sh twice.
 
-2007-03-08 21:41  chris
-
-	* [r15692]
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.h: Use
-	  Planner's cell-renderer-date in the transaction treeview for
-	  date-entry.
-
-2007-03-08 21:40  chris
-
-	* [r15691] branches/register-rewrite/configure.in,
-	  branches/register-rewrite/src/gnome-utils/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/planner-cell-renderer-date.c,
-	  branches/register-rewrite/src/gnome-utils/planner-cell-renderer-date.h,
-	  branches/register-rewrite/src/gnome-utils/planner-cell-renderer-popup.c,
-	  branches/register-rewrite/src/gnome-utils/planner-cell-renderer-popup.h,
-	  branches/register-rewrite/src/gnome-utils/planner-marshal.list,
-	  branches/register-rewrite/src/gnome-utils/planner-popup-entry.c,
-	  branches/register-rewrite/src/gnome-utils/planner-popup-entry.h:
-	  Copy some GtkCalendar-in-a-GtkCellRenderer code from Planner.
-	  Wholesale copy of some code from Planner that implements a
-	  GtkCalendar in a custom GtkCellEditable popup from a
-	  GtkCellRenderer. These files are unchanged except for one place
-	  that's commented. Also, introduce a dependency on libplanner.
-	  This could be brought in-tree, if needed.
-
 2007-03-08 02:49  jsled
 
 	* [r15689] src/doc/sx.rst, src/gnome/dialog-sx-from-trans.c:
@@ -5725,829 +6068,6 @@
 	* [r15681] packaging/win32/custom.sh: Install.sh: Update cairo,
 	  pango, intltool and aqbanking.
 
-2007-03-06 18:14  chris
-
-	* [r15680] branches/register-rewrite,
-	  branches/register-rewrite/ChangeLog,
-	  branches/register-rewrite/ChangeLog.2006,
-	  branches/register-rewrite/Makefile.am,
-	  branches/register-rewrite/README.dependencies,
-	  branches/register-rewrite/accounts/C/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_checkbook.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_full.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/C/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/Makefile.am,
-	  branches/register-rewrite/accounts/da/acctchrt_car.gnucash-xea,
-	  branches/register-rewrite/accounts/da/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/da/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/da/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_auto.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_autoloan.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_houseown.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_investment.gnucash-xea,
-	  branches/register-rewrite/accounts/de_AT/acctchrt_kids.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_chkmu.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_kids.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_otherasset.gnucash-xea,
-	  branches/register-rewrite/accounts/de_CH/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_auto.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_autoloan.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_full.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_houseown.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_investment.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_kids.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_otherasset.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_skr03.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_skr04.gnucash-xea,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_studium.gnucash-xea,
-	  branches/register-rewrite/accounts/el_GR/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/el_GR/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/el_GR/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_currency.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/es_ES/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_automobile.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_basecommune.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_chequier.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_courtage.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_garderie.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_locataire.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_retraite.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CA/acctchrt_revenus.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_currency.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_currency.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_checkbook.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/hu_HU/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_checkbook.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/it/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/ja_JP.EUC/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_business.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_checkbook.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_full.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/nb/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_currency.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/pt_PT/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_childcare.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_currency.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_eduloan.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_homeown.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_otherloan.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_renter.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_retiremt.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_spouseinc.gnucash-xea,
-	  branches/register-rewrite/accounts/sk/acctchrt_spouseretire.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_TEKDUZ.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_brokerage.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_carloan.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_cdmoneymkt.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_checkbook.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_common.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_fixedassets.gnucash-xea,
-	  branches/register-rewrite/accounts/tr_TR/acctchrt_homeloan.gnucash-xea,
-	  branches/register-rewrite/configure.in,
-	  branches/register-rewrite/doc/README.dependencies,
-	  branches/register-rewrite/doc/gnucash.1.in,
-	  branches/register-rewrite/gnucash-config.in,
-	  branches/register-rewrite/gnucash.m4,
-	  branches/register-rewrite/goffice-config.h.in,
-	  branches/register-rewrite/gsf-config.h.in,
-	  branches/register-rewrite/lib/Makefile.am,
-	  branches/register-rewrite/lib/glib26,
-	  branches/register-rewrite/lib/glib28,
-	  branches/register-rewrite/lib/glib28/Makefile.am,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/Makefile.am,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/glib24_26-compat.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/glib24_26-compat.h,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/graph/gog-chart.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/graph/gog-object.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/graph/gog-plot.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/utils/datetime.c,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c,
-	  branches/register-rewrite/lib/libc/Makefile.am,
-	  branches/register-rewrite/lib/libc/pow.h,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/Makefile.am,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/glib24_26-compat.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/glib24_26-compat.h,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-input-memory.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/gsf/gsf-utils.c,
-	  branches/register-rewrite/lib/libgsf-1.12.3/tests/test-cp-zip.c,
-	  branches/register-rewrite/lib/libqof/backend/file/Makefile.am,
-	  branches/register-rewrite/lib/libqof/backend/file/qof-backend-qsf.h,
-	  branches/register-rewrite/lib/libqof/backend/file/qsf-backend.c,
-	  branches/register-rewrite/lib/libqof/qof/Makefile.am,
-	  branches/register-rewrite/lib/libqof/qof/deprecated.c,
-	  branches/register-rewrite/lib/libqof/qof/deprecated.h,
-	  branches/register-rewrite/lib/libqof/qof/gnc-date.c,
-	  branches/register-rewrite/lib/libqof/qof/gnc-date.h,
-	  branches/register-rewrite/lib/libqof/qof/gnc-numeric.c,
-	  branches/register-rewrite/lib/libqof/qof/guid.c,
-	  branches/register-rewrite/lib/libqof/qof/kvp_frame.h,
-	  branches/register-rewrite/lib/libqof/qof/qof.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbackend.c,
-	  branches/register-rewrite/lib/libqof/qof/qofbackend.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbookmerge.h,
-	  branches/register-rewrite/lib/libqof/qof/qofchoice.h,
-	  branches/register-rewrite/lib/libqof/qof/qofclass.h,
-	  branches/register-rewrite/lib/libqof/qof/qofid.h,
-	  branches/register-rewrite/lib/libqof/qof/qofinstance-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofinstance.h,
-	  branches/register-rewrite/lib/libqof/qof/qoflog.c,
-	  branches/register-rewrite/lib/libqof/qof/qoflog.h,
-	  branches/register-rewrite/lib/libqof/qof/qofobject.h,
-	  branches/register-rewrite/lib/libqof/qof/qofquery.c,
-	  branches/register-rewrite/lib/libqof/qof/qofquery.h,
-	  branches/register-rewrite/lib/libqof/qof/qofsession.h,
-	  branches/register-rewrite/lib/libqof/qof/qofsql.c,
-	  branches/register-rewrite/lib/libqof/qof/qofutil.c,
-	  branches/register-rewrite/lib/libqof/qof/qofutil.h,
-	  branches/register-rewrite/macros/binreloc.m4,
-	  branches/register-rewrite/packaging/gnucash.spec.in,
-	  branches/register-rewrite/packaging/win32/README,
-	  branches/register-rewrite/packaging/win32/custom.sh,
-	  branches/register-rewrite/packaging/win32/dist.sh,
-	  branches/register-rewrite/packaging/win32/exetype.pl,
-	  branches/register-rewrite/packaging/win32/functions,
-	  branches/register-rewrite/packaging/win32/gnucash.iss.in,
-	  branches/register-rewrite/packaging/win32/install.sh,
-	  branches/register-rewrite/packaging/win32/libofx-0.8.3-patch.diff,
-	  branches/register-rewrite/packaging/win32/opensp-1.5.2-patch.diff,
-	  branches/register-rewrite/packaging/win32/reset.sh,
-	  branches/register-rewrite/po/de.po,
-	  branches/register-rewrite/src/Makefile.am,
-	  branches/register-rewrite/src/app-utils/Makefile.am,
-	  branches/register-rewrite/src/app-utils/app-utils.i,
-	  branches/register-rewrite/src/app-utils/file-utils.c,
-	  branches/register-rewrite/src/app-utils/file-utils.h,
-	  branches/register-rewrite/src/app-utils/gfec.c,
-	  branches/register-rewrite/src/app-utils/gnc-account-merge.c,
-	  branches/register-rewrite/src/app-utils/gnc-account-merge.h,
-	  branches/register-rewrite/src/app-utils/gnc-component-manager.c,
-	  branches/register-rewrite/src/app-utils/gnc-sx-instance-model.c,
-	  branches/register-rewrite/src/app-utils/gnc-sx-instance-model.h,
-	  branches/register-rewrite/src/app-utils/gnc-ui-util.c,
-	  branches/register-rewrite/src/app-utils/gnc-ui-util.h,
-	  branches/register-rewrite/src/app-utils/gncmod-app-utils.c,
-	  branches/register-rewrite/src/app-utils/guile-util.c,
-	  branches/register-rewrite/src/app-utils/guile-util.h,
-	  branches/register-rewrite/src/app-utils/options.scm,
-	  branches/register-rewrite/src/app-utils/prefs.scm,
-	  branches/register-rewrite/src/app-utils/test,
-	  branches/register-rewrite/src/app-utils/test/Makefile.am,
-	  branches/register-rewrite/src/app-utils/test/test-exp-parser.c,
-	  branches/register-rewrite/src/app-utils/test/test-load-module,
-	  branches/register-rewrite/src/app-utils/test/test-sx.c,
-	  branches/register-rewrite/src/backend/file/Makefile.am,
-	  branches/register-rewrite/src/backend/file/gnc-account-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-backend-file.c,
-	  branches/register-rewrite/src/backend/file/gnc-book-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-commodity-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-freqspec-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-lot-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-recurrence-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-schedxaction-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-xml.h,
-	  branches/register-rewrite/src/backend/file/gncmod-backend-file.c,
-	  branches/register-rewrite/src/backend/file/io-example-account.c,
-	  branches/register-rewrite/src/backend/file/io-example-account.h,
-	  branches/register-rewrite/src/backend/file/io-gncbin-r.c,
-	  branches/register-rewrite/src/backend/file/io-gncbin.h,
-	  branches/register-rewrite/src/backend/file/io-gncxml-v1.c,
-	  branches/register-rewrite/src/backend/file/io-gncxml-v2.c,
-	  branches/register-rewrite/src/backend/file/io-utils.c,
-	  branches/register-rewrite/src/backend/file/io-utils.h,
-	  branches/register-rewrite/src/backend/file/sixtp-dom-parsers.c,
-	  branches/register-rewrite/src/backend/file/sixtp-dom-parsers.h,
-	  branches/register-rewrite/src/backend/file/sixtp-utils.c,
-	  branches/register-rewrite/src/backend/file/sixtp.c,
-	  branches/register-rewrite/src/backend/file/test/Makefile.am,
-	  branches/register-rewrite/src/backend/file/test/test-dom-parser1.c,
-	  branches/register-rewrite/src/backend/file/test/test-file-stuff.c,
-	  branches/register-rewrite/src/backend/file/test/test-kvp-frames.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-backend.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-example-account.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-xml2.c,
-	  branches/register-rewrite/src/backend/file/test/test-save-in-lang.c,
-	  branches/register-rewrite/src/backend/file/test/test-string-converters.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-account.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-commodity.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-pricedb.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-transaction.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml2-is-file.c,
-	  branches/register-rewrite/src/backend/postgres/Makefile.am,
-	  branches/register-rewrite/src/backend/postgres/PostgresBackend.c,
-	  branches/register-rewrite/src/backend/postgres/PostgresBackend.h,
-	  branches/register-rewrite/src/backend/postgres/account.c,
-	  branches/register-rewrite/src/backend/postgres/account.h,
-	  branches/register-rewrite/src/backend/postgres/checkpoint.c,
-	  branches/register-rewrite/src/backend/postgres/checkpoint.h,
-	  branches/register-rewrite/src/backend/postgres/events.c,
-	  branches/register-rewrite/src/backend/postgres/table.m4,
-	  branches/register-rewrite/src/backend/postgres/test/Makefile.am,
-	  branches/register-rewrite/src/backend/postgres/test/test-db.c,
-	  branches/register-rewrite/src/backend/postgres/test/test-period.c,
-	  branches/register-rewrite/src/backend/postgres/txn.c,
-	  branches/register-rewrite/src/backend/postgres/txn.h,
-	  branches/register-rewrite/src/backend/postgres/txnmass.c,
-	  branches/register-rewrite/src/bin/Makefile.am,
-	  branches/register-rewrite/src/bin/gnucash-bin.c,
-	  branches/register-rewrite/src/bin/gnucash-strip-svn-datafile.sh,
-	  branches/register-rewrite/src/bin/gnucash-valgrind.in,
-	  branches/register-rewrite/src/bin/gnucash.in,
-	  branches/register-rewrite/src/bin/overrides/Makefile.am,
-	  branches/register-rewrite/src/bin/overrides/gnucash-build-env.in,
-	  branches/register-rewrite/src/bin/overrides/gnucash-env.in,
-	  branches/register-rewrite/src/bin/test/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/business-core.scm,
-	  branches/register-rewrite/src/business/business-core/businessmod-core.c,
-	  branches/register-rewrite/src/business/business-core/file/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/file/gncmod-business-backend-file.c,
-	  branches/register-rewrite/src/business/business-core/gncInvoice.c,
-	  branches/register-rewrite/src/business/business-core/gncmod-business-core.c,
-	  branches/register-rewrite/src/business/business-core/test/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/test/test-customer.c,
-	  branches/register-rewrite/src/business/business-core/test/test-employee.c,
-	  branches/register-rewrite/src/business/business-core/test/test-job.c,
-	  branches/register-rewrite/src/business/business-core/test/test-vendor.c,
-	  branches/register-rewrite/src/business/business-gnome/Makefile.am,
-	  branches/register-rewrite/src/business/business-gnome/business-gnome-utils.c,
-	  branches/register-rewrite/src/business/business-gnome/businessmod-gnome.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-invoice.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-payment.c,
-	  branches/register-rewrite/src/business/business-gnome/glade/billterms.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/businessprefs.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/choose-owner.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/customer.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/date-close.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/employee.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/invoice.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/job.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/order.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/payment.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/vendor.glade,
-	  branches/register-rewrite/src/business/business-gnome/gnc-plugin-business.c,
-	  branches/register-rewrite/src/business/business-gnome/gnc-plugin-page-invoice.c,
-	  branches/register-rewrite/src/business/business-gnome/gncmod-business-gnome.c,
-	  branches/register-rewrite/src/business/business-gnome/search-owner.c,
-	  branches/register-rewrite/src/business/business-gnome/search-owner.h,
-	  branches/register-rewrite/src/business/business-ledger/Makefile.am,
-	  branches/register-rewrite/src/business/business-ledger/gncEntryLedger.c,
-	  branches/register-rewrite/src/business/business-ledger/gncEntryLedgerLoad.c,
-	  branches/register-rewrite/src/business/business-reports/Makefile.am,
-	  branches/register-rewrite/src/business/business-reports/aging.scm,
-	  branches/register-rewrite/src/business/business-reports/easy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/fancy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/owner-report.scm,
-	  branches/register-rewrite/src/business/business-utils/Makefile.am,
-	  branches/register-rewrite/src/business/business-utils/gncmod-business-utils.c,
-	  branches/register-rewrite/src/business/dialog-tax-table/Makefile.am,
-	  branches/register-rewrite/src/business/dialog-tax-table/gncmod-dialog-tax-table.c,
-	  branches/register-rewrite/src/business/dialog-tax-table/tax-tables.glade,
-	  branches/register-rewrite/src/calculation/Makefile.am,
-	  branches/register-rewrite/src/calculation/fin.c,
-	  branches/register-rewrite/src/calculation/gncmod-calculation.c,
-	  branches/register-rewrite/src/core-utils/Makefile.am,
-	  branches/register-rewrite/src/core-utils/core-utils.i,
-	  branches/register-rewrite/src/core-utils/core-utils.scm,
-	  branches/register-rewrite/src/core-utils/gnc-gkeyfile-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-gkeyfile-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-glib-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-glib-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-gtk-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-gtk-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-main.c,
-	  branches/register-rewrite/src/core-utils/gnc-main.h,
-	  branches/register-rewrite/src/doc/Makefile.am,
-	  branches/register-rewrite/src/doc/loans.txt,
-	  branches/register-rewrite/src/doc/sx.rst,
-	  branches/register-rewrite/src/doc/xml/gnucash-v2.rnc,
-	  branches/register-rewrite/src/engine/Account.c,
-	  branches/register-rewrite/src/engine/Account.h,
-	  branches/register-rewrite/src/engine/AccountP.h,
-	  branches/register-rewrite/src/engine/FreqSpec.c,
-	  branches/register-rewrite/src/engine/Group.c,
-	  branches/register-rewrite/src/engine/Group.h,
-	  branches/register-rewrite/src/engine/GroupP.h,
-	  branches/register-rewrite/src/engine/Makefile.am,
-	  branches/register-rewrite/src/engine/Period.c,
-	  branches/register-rewrite/src/engine/Recurrence.c,
-	  branches/register-rewrite/src/engine/Recurrence.h,
-	  branches/register-rewrite/src/engine/SX-book-p.h,
-	  branches/register-rewrite/src/engine/SX-book.c,
-	  branches/register-rewrite/src/engine/SX-book.h,
-	  branches/register-rewrite/src/engine/SchedXaction.c,
-	  branches/register-rewrite/src/engine/SchedXaction.h,
-	  branches/register-rewrite/src/engine/SchedXactionP.h,
-	  branches/register-rewrite/src/engine/Scrub.c,
-	  branches/register-rewrite/src/engine/Scrub.h,
-	  branches/register-rewrite/src/engine/Scrub2.c,
-	  branches/register-rewrite/src/engine/Scrub3.c,
-	  branches/register-rewrite/src/engine/Scrub3.h,
-	  branches/register-rewrite/src/engine/ScrubP.h,
-	  branches/register-rewrite/src/engine/Split.c,
-	  branches/register-rewrite/src/engine/TransLog.c,
-	  branches/register-rewrite/src/engine/Transaction.c,
-	  branches/register-rewrite/src/engine/Transaction.h,
-	  branches/register-rewrite/src/engine/cap-gains.c,
-	  branches/register-rewrite/src/engine/cashobjects.c,
-	  branches/register-rewrite/src/engine/engine-helpers.c,
-	  branches/register-rewrite/src/engine/engine-utilities.scm,
-	  branches/register-rewrite/src/engine/engine.i,
-	  branches/register-rewrite/src/engine/engine.scm,
-	  branches/register-rewrite/src/engine/gnc-associate-account.c,
-	  branches/register-rewrite/src/engine/gnc-budget.c,
-	  branches/register-rewrite/src/engine/gnc-commodity.c,
-	  branches/register-rewrite/src/engine/gnc-engine.c,
-	  branches/register-rewrite/src/engine/gnc-engine.h,
-	  branches/register-rewrite/src/engine/gnc-filepath-utils.c,
-	  branches/register-rewrite/src/engine/gnc-hooks.c,
-	  branches/register-rewrite/src/engine/gncmod-engine.c,
-	  branches/register-rewrite/src/engine/iso-4217-currencies.scm,
-	  branches/register-rewrite/src/engine/test-core/Makefile.am,
-	  branches/register-rewrite/src/engine/test-core/gncmod-test-engine.c,
-	  branches/register-rewrite/src/engine/test-core/test-engine-stuff.c,
-	  branches/register-rewrite/src/engine/test-core/test-engine-stuff.h,
-	  branches/register-rewrite/src/engine/test/Makefile.am,
-	  branches/register-rewrite/src/engine/test/test-commodities.c,
-	  branches/register-rewrite/src/engine/test/test-create-account.scm,
-	  branches/register-rewrite/src/engine/test/test-freq-spec.c,
-	  branches/register-rewrite/src/engine/test/test-group-vs-book.c,
-	  branches/register-rewrite/src/engine/test/test-lots.c,
-	  branches/register-rewrite/src/engine/test/test-numeric.c,
-	  branches/register-rewrite/src/engine/test/test-period.c,
-	  branches/register-rewrite/src/engine/test/test-query.c,
-	  branches/register-rewrite/src/engine/test/test-querynew.c,
-	  branches/register-rewrite/src/engine/test/test-recurrence.c,
-	  branches/register-rewrite/src/engine/test/test-resolve-file-path.c,
-	  branches/register-rewrite/src/engine/test/test-transaction-voiding.c,
-	  branches/register-rewrite/src/experimental/cgi-bin/gnc-server.c,
-	  branches/register-rewrite/src/experimental/cgi-bin/hello2.c,
-	  branches/register-rewrite/src/experimental/cgi-bin/hello3.c,
-	  branches/register-rewrite/src/gnc-module/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/gnc-module.c,
-	  branches/register-rewrite/src/gnc-module/gnc-module.scm,
-	  branches/register-rewrite/src/gnc-module/test/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/misc-mods/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/misc-mods/agedver.c,
-	  branches/register-rewrite/src/gnc-module/test/misc-mods/futuremodsys.c,
-	  branches/register-rewrite/src/gnc-module/test/misc-mods/incompatdep.c,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/gnc-mod-bar.c,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/gnc-mod-baz.c,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/gnc-mod-foo.c,
-	  branches/register-rewrite/src/gnc-module/test/test-dynload.c,
-	  branches/register-rewrite/src/gnc-module/test/test-scm-dynload,
-	  branches/register-rewrite/src/gnc-test-env,
-	  branches/register-rewrite/src/gnome-search/Makefile.am,
-	  branches/register-rewrite/src/gnome-search/gnc-general-search.c,
-	  branches/register-rewrite/src/gnome-search/gnc-general-search.h,
-	  branches/register-rewrite/src/gnome-search/gncmod-gnome-search.c,
-	  branches/register-rewrite/src/gnome-search/search-account.c,
-	  branches/register-rewrite/src/gnome-search/search-account.h,
-	  branches/register-rewrite/src/gnome-search/search-boolean.c,
-	  branches/register-rewrite/src/gnome-search/search-boolean.h,
-	  branches/register-rewrite/src/gnome-search/search-date.c,
-	  branches/register-rewrite/src/gnome-search/search-date.h,
-	  branches/register-rewrite/src/gnome-search/search-double.c,
-	  branches/register-rewrite/src/gnome-search/search-double.h,
-	  branches/register-rewrite/src/gnome-search/search-int64.c,
-	  branches/register-rewrite/src/gnome-search/search-int64.h,
-	  branches/register-rewrite/src/gnome-search/search-numeric.c,
-	  branches/register-rewrite/src/gnome-search/search-numeric.h,
-	  branches/register-rewrite/src/gnome-search/search-reconciled.c,
-	  branches/register-rewrite/src/gnome-search/search-reconciled.h,
-	  branches/register-rewrite/src/gnome-search/search-string.c,
-	  branches/register-rewrite/src/gnome-search/search-string.h,
-	  branches/register-rewrite/src/gnome-search/search.glade,
-	  branches/register-rewrite/src/gnome-utils/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/account-quickfill.c,
-	  branches/register-rewrite/src/gnome-utils/account-quickfill.h,
-	  branches/register-rewrite/src/gnome-utils/dialog-account.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-account.h,
-	  branches/register-rewrite/src/gnome-utils/dialog-options.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-preferences.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-transfer.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-utils.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-utils.h,
-	  branches/register-rewrite/src/gnome-utils/druid-gconf-setup.c,
-	  branches/register-rewrite/src/gnome-utils/glade/commodity.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/dialog-query-list.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/dialog-reset-warnings.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/druid-gconf-setup.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/druid-gnc-xml-import.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/druid-provider-multifile.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/exchange-dialog.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/gnc-date-format.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/gnc-gui-query.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/preferences.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/totd.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/transfer.glade,
-	  branches/register-rewrite/src/gnome-utils/gnc-account-sel.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-date-edit.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal-model.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal-model.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal-store.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal-store.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-embedded-window.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-file.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-frequency.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-frequency.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-html-graph-gog.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-html.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-html.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-main-window.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin-file-history.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin-page.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-query-list.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-query-list.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-sx-list-tree-model-adapter.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-sx-list-tree-model-adapter.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-commodity.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-selection.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-transaction.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-transaction.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-account.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-account.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-commodity.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-price.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-sx-list.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-sx-list.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.h,
-	  branches/register-rewrite/src/gnome-utils/gncmod-gnome-utils.c,
-	  branches/register-rewrite/src/gnome-utils/gnctreemodelsort.c,
-	  branches/register-rewrite/src/gnome-utils/test,
-	  branches/register-rewrite/src/gnome-utils/test/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/test/test-sx.c,
-	  branches/register-rewrite/src/gnome-utils/window-main-summarybar.c,
-	  branches/register-rewrite/src/gnome/Makefile.am,
-	  branches/register-rewrite/src/gnome/dialog-chart-export.c,
-	  branches/register-rewrite/src/gnome/dialog-commodities.c,
-	  branches/register-rewrite/src/gnome/dialog-find-transactions.c,
-	  branches/register-rewrite/src/gnome/dialog-new-user.c,
-	  branches/register-rewrite/src/gnome/dialog-scheduledxaction.c,
-	  branches/register-rewrite/src/gnome/dialog-scheduledxaction.h,
-	  branches/register-rewrite/src/gnome/dialog-sx-editor.c,
-	  branches/register-rewrite/src/gnome/dialog-sx-editor.h,
-	  branches/register-rewrite/src/gnome/dialog-sx-from-trans.c,
-	  branches/register-rewrite/src/gnome/dialog-sx-since-last-run.c,
-	  branches/register-rewrite/src/gnome/dialog-sx-since-last-run.h,
-	  branches/register-rewrite/src/gnome/dialog-sxsincelast.c,
-	  branches/register-rewrite/src/gnome/dialog-sxsincelast.h,
-	  branches/register-rewrite/src/gnome/druid-acct-period.c,
-	  branches/register-rewrite/src/gnome/druid-hierarchy.c,
-	  branches/register-rewrite/src/gnome/druid-loan.c,
-	  branches/register-rewrite/src/gnome/druid-merge.c,
-	  branches/register-rewrite/src/gnome/druid-merge.h,
-	  branches/register-rewrite/src/gnome/druid-stock-split.c,
-	  branches/register-rewrite/src/gnome/glade/account.glade,
-	  branches/register-rewrite/src/gnome/glade/acctperiod.glade,
-	  branches/register-rewrite/src/gnome/glade/budget.glade,
-	  branches/register-rewrite/src/gnome/glade/chart-export.glade,
-	  branches/register-rewrite/src/gnome/glade/commodities.glade,
-	  branches/register-rewrite/src/gnome/glade/fincalc.glade,
-	  branches/register-rewrite/src/gnome/glade/lots.glade,
-	  branches/register-rewrite/src/gnome/glade/merge.glade,
-	  branches/register-rewrite/src/gnome/glade/newuser.glade,
-	  branches/register-rewrite/src/gnome/glade/price.glade,
-	  branches/register-rewrite/src/gnome/glade/print.glade,
-	  branches/register-rewrite/src/gnome/glade/progress.glade,
-	  branches/register-rewrite/src/gnome/glade/reconcile.glade,
-	  branches/register-rewrite/src/gnome/glade/register.glade,
-	  branches/register-rewrite/src/gnome/glade/sched-xact.glade,
-	  branches/register-rewrite/src/gnome/glade/stocks.glade,
-	  branches/register-rewrite/src/gnome/glade/tax.glade,
-	  branches/register-rewrite/src/gnome/glade/userpass.glade,
-	  branches/register-rewrite/src/gnome/gnc-plugin-basic-commands.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-account-tree.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-budget.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-register.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-sx-list.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-sx-list.h,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-transactions.c,
-	  branches/register-rewrite/src/gnome/gnc-split-reg.c,
-	  branches/register-rewrite/src/gnome/gnc-split-reg.h,
-	  branches/register-rewrite/src/gnome/gnc-sx-list-tree-model-adapter.c,
-	  branches/register-rewrite/src/gnome/gnc-sx-list-tree-model-adapter.h,
-	  branches/register-rewrite/src/gnome/lot-viewer.c,
-	  branches/register-rewrite/src/gnome/reconcile-list.c,
-	  branches/register-rewrite/src/gnome/schemas/apps_gnucash_general.schemas.in,
-	  branches/register-rewrite/src/gnome/top-level.c,
-	  branches/register-rewrite/src/gnome/ui/Makefile.am,
-	  branches/register-rewrite/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml,
-	  branches/register-rewrite/src/gnome/window-reconcile.c,
-	  branches/register-rewrite/src/gtk-compat.h,
-	  branches/register-rewrite/src/import-export/Makefile.am,
-	  branches/register-rewrite/src/import-export/binary-import/Makefile.am,
-	  branches/register-rewrite/src/import-export/binary-import/binary-import.glade,
-	  branches/register-rewrite/src/import-export/binary-import/druid-commodity.c,
-	  branches/register-rewrite/src/import-export/binary-import/gncmod-binary-import.c,
-	  branches/register-rewrite/src/import-export/csv/gnc-csv2glist.c,
-	  branches/register-rewrite/src/import-export/generic-import.glade,
-	  branches/register-rewrite/src/import-export/gncmod-generic-import.c,
-	  branches/register-rewrite/src/import-export/hbci/Makefile.am,
-	  branches/register-rewrite/src/import-export/hbci/dialog-hbcitrans.c,
-	  branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c,
-	  branches/register-rewrite/src/import-export/hbci/druid-hbci-utils.c,
-	  branches/register-rewrite/src/import-export/hbci/glade/hbci.glade,
-	  branches/register-rewrite/src/import-export/hbci/glade/hbcipass.glade,
-	  branches/register-rewrite/src/import-export/hbci/glade/hbciprefs.glade,
-	  branches/register-rewrite/src/import-export/hbci/gnc-file-aqb-import.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-file-aqb-import.h,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-getbalance.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-gettrans.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-transfer.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.h,
-	  branches/register-rewrite/src/import-export/hbci/gnc-plugin-hbci.c,
-	  branches/register-rewrite/src/import-export/hbci/gncmod-hbci.c,
-	  branches/register-rewrite/src/import-export/hbci/hbci-interaction.c,
-	  branches/register-rewrite/src/import-export/hbci/hbci-interaction.h,
-	  branches/register-rewrite/src/import-export/hbci/hbci-interactionP.h,
-	  branches/register-rewrite/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in,
-	  branches/register-rewrite/src/import-export/import-account-matcher.c,
-	  branches/register-rewrite/src/import-export/import-backend.c,
-	  branches/register-rewrite/src/import-export/import-match-map.c,
-	  branches/register-rewrite/src/import-export/import-match-picker.c,
-	  branches/register-rewrite/src/import-export/import-provider-format.glade,
-	  branches/register-rewrite/src/import-export/log-replay/Makefile.am,
-	  branches/register-rewrite/src/import-export/log-replay/gnc-log-replay.c,
-	  branches/register-rewrite/src/import-export/log-replay/gncmod-log-replay.c,
-	  branches/register-rewrite/src/import-export/ofx/Makefile.am,
-	  branches/register-rewrite/src/import-export/ofx/gnc-ofx-import.c,
-	  branches/register-rewrite/src/import-export/ofx/gncmod-ofx-import.c,
-	  branches/register-rewrite/src/import-export/qif-import/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-import/dialog-account-picker.c,
-	  branches/register-rewrite/src/import-export/qif-import/druid-qif-import.c,
-	  branches/register-rewrite/src/import-export/qif-import/gncmod-qif-import.c,
-	  branches/register-rewrite/src/import-export/qif-import/qif-dialog-utils.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-guess-map.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-import.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-merge-groups.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-parse.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-to-gnc.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif.glade,
-	  branches/register-rewrite/src/import-export/qif-import/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/gncmod-qifiocore.c,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-acct-table.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-io-core.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/test/test-import-phase-1.scm,
-	  branches/register-rewrite/src/import-export/qif/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif/qif-file.c,
-	  branches/register-rewrite/src/import-export/qif/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif/test/test-qif.c,
-	  branches/register-rewrite/src/import-export/test/Makefile.am,
-	  branches/register-rewrite/src/network-utils/Makefile.am,
-	  branches/register-rewrite/src/network-utils/gncmod-network-utils.c,
-	  branches/register-rewrite/src/network-utils/test/Makefile.am,
-	  branches/register-rewrite/src/quotes/gnc-fq-dump,
-	  branches/register-rewrite/src/quotes/gnc-fq-helper.in,
-	  branches/register-rewrite/src/register/ledger-core/Makefile.am,
-	  branches/register-rewrite/src/register/ledger-core/gnc-ledger-display.c,
-	  branches/register-rewrite/src/register/ledger-core/gncmod-ledger-core.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-control.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-load.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-model.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-p.h,
-	  branches/register-rewrite/src/register/ledger-core/split-register.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register.h,
-	  branches/register-rewrite/src/register/register-core/Makefile.am,
-	  branches/register-rewrite/src/register/register-core/formulacell.c,
-	  branches/register-rewrite/src/register/register-core/gncmod-register-core.c,
-	  branches/register-rewrite/src/register/register-core/table-allgui.c,
-	  branches/register-rewrite/src/register/register-core/test/Makefile.am,
-	  branches/register-rewrite/src/register/register-gnome/Makefile.am,
-	  branches/register-rewrite/src/register/register-gnome/datecell-gnome.c,
-	  branches/register-rewrite/src/register/register-gnome/gncmod-register-gnome.c,
-	  branches/register-rewrite/src/register/register-gnome/gnucash-date-picker.c,
-	  branches/register-rewrite/src/register/register-gnome/gnucash-date-picker.h,
-	  branches/register-rewrite/src/register/register-gnome/gnucash-item-list.c,
-	  branches/register-rewrite/src/register/register-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/locale-specific/us/Makefile.am,
-	  branches/register-rewrite/src/report/locale-specific/us/gncmod-locale-reports-us.c,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf-de_DE.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/gnc-plugin-page-report.c,
-	  branches/register-rewrite/src/report/report-gnome/gncmod-report-gnome.c,
-	  branches/register-rewrite/src/report/report-gnome/report.glade,
-	  branches/register-rewrite/src/report/report-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/test/test-load-module,
-	  branches/register-rewrite/src/report/report-gnome/window-report.c,
-	  branches/register-rewrite/src/report/report-gnome/window-report.h,
-	  branches/register-rewrite/src/report/report-system/Makefile.am,
-	  branches/register-rewrite/src/report/report-system/commodity-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/gncmod-report-system.c,
-	  branches/register-rewrite/src/report/report-system/html-acct-table.scm,
-	  branches/register-rewrite/src/report/report-system/html-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/report-system.scm,
-	  branches/register-rewrite/src/report/report-system/report-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/report.scm,
-	  branches/register-rewrite/src/report/report-system/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-system/test/test-load-module,
-	  branches/register-rewrite/src/report/standard-reports/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/account-piecharts.scm,
-	  branches/register-rewrite/src/report/standard-reports/account-summary.scm,
-	  branches/register-rewrite/src/report/standard-reports/advanced-portfolio.scm,
-	  branches/register-rewrite/src/report/standard-reports/average-balance.scm,
-	  branches/register-rewrite/src/report/standard-reports/balance-sheet.scm,
-	  branches/register-rewrite/src/report/standard-reports/budget.scm,
-	  branches/register-rewrite/src/report/standard-reports/cash-flow.scm,
-	  branches/register-rewrite/src/report/standard-reports/category-barchart.scm,
-	  branches/register-rewrite/src/report/standard-reports/daily-reports.scm,
-	  branches/register-rewrite/src/report/standard-reports/equity-statement.scm,
-	  branches/register-rewrite/src/report/standard-reports/general-journal.scm,
-	  branches/register-rewrite/src/report/standard-reports/gncmod-standard-reports.c,
-	  branches/register-rewrite/src/report/standard-reports/income-statement.scm,
-	  branches/register-rewrite/src/report/standard-reports/net-barchart.scm,
-	  branches/register-rewrite/src/report/standard-reports/portfolio.scm,
-	  branches/register-rewrite/src/report/standard-reports/price-scatter.scm,
-	  branches/register-rewrite/src/report/standard-reports/register.scm,
-	  branches/register-rewrite/src/report/standard-reports/standard-reports.scm,
-	  branches/register-rewrite/src/report/standard-reports/test/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/transaction.scm,
-	  branches/register-rewrite/src/report/standard-reports/trial-balance.scm,
-	  branches/register-rewrite/src/report/stylesheets/Makefile.am,
-	  branches/register-rewrite/src/report/stylesheets/gncmod-stylesheets.c,
-	  branches/register-rewrite/src/report/stylesheets/test/Makefile.am,
-	  branches/register-rewrite/src/report/stylesheets/test/test-load-module,
-	  branches/register-rewrite/src/report/utility-reports/Makefile.am,
-	  branches/register-rewrite/src/report/utility-reports/gncmod-utility-reports.c,
-	  branches/register-rewrite/src/report/utility-reports/test/Makefile.am,
-	  branches/register-rewrite/src/scm/fin.scm,
-	  branches/register-rewrite/src/scm/main.scm,
-	  branches/register-rewrite/src/scm/price-quotes.scm,
-	  branches/register-rewrite/src/scm/printing/number-to-words.scm,
-	  branches/register-rewrite/src/tax/us/Makefile.am,
-	  branches/register-rewrite/src/tax/us/gncmod-tax-us.c,
-	  branches/register-rewrite/src/tax/us/test/Makefile.am,
-	  branches/register-rewrite/src/test-core/Makefile.am,
-	  branches/register-rewrite/src/test-core/gncmod-test.c,
-	  branches/register-rewrite/src/valgrind-gnucash.supp,
-	  branches/register-rewrite/util/glade-fixup: Merge -r 15313:15679
-	  from trunk.
-
 2007-03-06 14:12  jsled
 
 	* [r15679] src/doc/sx.rst: Add Volker Englisch's note re weirdness
@@ -10212,198 +9732,6 @@
 	  loaded directly with the g_symbol_* API now while dropping the
 	  dependency on libltdl.
 
-2007-01-05 23:51  chris
-
-	* [r15316] branches/register-rewrite,
-	  branches/register-rewrite/AUTHORS,
-	  branches/register-rewrite/ChangeLog,
-	  branches/register-rewrite/HACKING,
-	  branches/register-rewrite/README,
-	  branches/register-rewrite/README.dependencies,
-	  branches/register-rewrite/autogen.sh,
-	  branches/register-rewrite/configure.in,
-	  branches/register-rewrite/doc/Makefile.am,
-	  branches/register-rewrite/doc/README.francais,
-	  branches/register-rewrite/doc/README.german,
-	  branches/register-rewrite/doc/build-suse.txt,
-	  branches/register-rewrite/doc/guile-hackers.txt,
-	  branches/register-rewrite/lib/libqof/qof/Makefile.am,
-	  branches/register-rewrite/lib/libqof/qof/qofmath128.c,
-	  branches/register-rewrite/lib/libqof/qof/qofquerycore.c,
-	  branches/register-rewrite/lib/libqof/qof/qofsession-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofsession.c,
-	  branches/register-rewrite/lib/libqof/qof/qofsession.h,
-	  branches/register-rewrite/macros/ac_pkg_swig.m4,
-	  branches/register-rewrite/packaging/win32/custom.sh,
-	  branches/register-rewrite/packaging/win32/dist.sh,
-	  branches/register-rewrite/packaging/win32/functions,
-	  branches/register-rewrite/packaging/win32/gnucash.iss.in,
-	  branches/register-rewrite/packaging/win32/goffice-0.3.2-patch.diff,
-	  branches/register-rewrite/packaging/win32/install.sh,
-	  branches/register-rewrite/src/app-utils/Makefile.am,
-	  branches/register-rewrite/src/app-utils/gnc-component-manager.c,
-	  branches/register-rewrite/src/app-utils/gnc-ui-util.c,
-	  branches/register-rewrite/src/app-utils/gnc-ui-util.h,
-	  branches/register-rewrite/src/app-utils/options.scm,
-	  branches/register-rewrite/src/app-utils/test/Makefile.am,
-	  branches/register-rewrite/src/backend/file/gnc-account-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-backend-file.c,
-	  branches/register-rewrite/src/backend/file/gnc-commodity-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-transaction-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/io-gncxml-v2.c,
-	  branches/register-rewrite/src/backend/file/test/Makefile.am,
-	  branches/register-rewrite/src/backend/file/test/test-xml-account.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-commodity.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-pricedb.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-transaction.c,
-	  branches/register-rewrite/src/backend/postgres/test/Makefile.am,
-	  branches/register-rewrite/src/base-typemaps.i,
-	  branches/register-rewrite/src/bin/Makefile.am,
-	  branches/register-rewrite/src/bin/gnucash-bin.c,
-	  branches/register-rewrite/src/business/business-core/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/business-core.scm,
-	  branches/register-rewrite/src/business/business-core/file/gnc-invoice-xml-v2.c,
-	  branches/register-rewrite/src/business/business-core/file/gnc-order-xml-v2.c,
-	  branches/register-rewrite/src/business/business-core/gncAddress.c,
-	  branches/register-rewrite/src/business/business-core/gncBillTerm.c,
-	  branches/register-rewrite/src/business/business-core/gncCustomer.c,
-	  branches/register-rewrite/src/business/business-core/gncEmployee.c,
-	  branches/register-rewrite/src/business/business-core/gncEntry.c,
-	  branches/register-rewrite/src/business/business-core/gncInvoice.c,
-	  branches/register-rewrite/src/business/business-core/gncJob.c,
-	  branches/register-rewrite/src/business/business-core/gncOrder.c,
-	  branches/register-rewrite/src/business/business-core/gncTaxTable.c,
-	  branches/register-rewrite/src/business/business-core/gncVendor.c,
-	  branches/register-rewrite/src/business/business-core/test/Makefile.am,
-	  branches/register-rewrite/src/business/business-gnome/Makefile.am,
-	  branches/register-rewrite/src/business/business-reports/aging.scm,
-	  branches/register-rewrite/src/business/business-reports/business-reports.scm,
-	  branches/register-rewrite/src/business/business-reports/easy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/fancy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/owner-report.scm,
-	  branches/register-rewrite/src/business/business-utils/Makefile.am,
-	  branches/register-rewrite/src/business/business-utils/business-options.scm,
-	  branches/register-rewrite/src/business/dialog-tax-table/Makefile.am,
-	  branches/register-rewrite/src/calculation/test/Makefile.am,
-	  branches/register-rewrite/src/core-utils/Makefile.am,
-	  branches/register-rewrite/src/core-utils/gnc-gobject-utils.c,
-	  branches/register-rewrite/src/engine/Account.c,
-	  branches/register-rewrite/src/engine/Makefile.am,
-	  branches/register-rewrite/src/engine/SchedXaction.c,
-	  branches/register-rewrite/src/engine/Split.c,
-	  branches/register-rewrite/src/engine/TransLog.c,
-	  branches/register-rewrite/src/engine/binreloc.c,
-	  branches/register-rewrite/src/engine/binreloc.h,
-	  branches/register-rewrite/src/engine/engine-interface.scm,
-	  branches/register-rewrite/src/engine/gnc-budget.c,
-	  branches/register-rewrite/src/engine/gnc-commodity.c,
-	  branches/register-rewrite/src/engine/gnc-lot.c,
-	  branches/register-rewrite/src/engine/gnc-path.c,
-	  branches/register-rewrite/src/engine/gnc-path.h,
-	  branches/register-rewrite/src/engine/gnc-pricedb.c,
-	  branches/register-rewrite/src/engine/gncla-dir.h.in,
-	  branches/register-rewrite/src/engine/kvp-scm.c,
-	  branches/register-rewrite/src/engine/test-core/Makefile.am,
-	  branches/register-rewrite/src/engine/test/Makefile.am,
-	  branches/register-rewrite/src/engine/test/test-book-merge.c,
-	  branches/register-rewrite/src/engine/test/test-group-vs-book.c,
-	  branches/register-rewrite/src/engine/test/test-guid.c,
-	  branches/register-rewrite/src/engine/test/test-load-engine.c,
-	  branches/register-rewrite/src/engine/test/test-lots.c,
-	  branches/register-rewrite/src/engine/test/test-numeric.c,
-	  branches/register-rewrite/src/engine/test/test-object.c,
-	  branches/register-rewrite/src/engine/test/test-period.c,
-	  branches/register-rewrite/src/engine/test/test-query.c,
-	  branches/register-rewrite/src/engine/test/test-querynew.c,
-	  branches/register-rewrite/src/engine/test/test-split-vs-account.c,
-	  branches/register-rewrite/src/engine/test/test-transaction-reversal.c,
-	  branches/register-rewrite/src/engine/test/test-transaction-voiding.c,
-	  branches/register-rewrite/src/gnc-module/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/gnc-module.c,
-	  branches/register-rewrite/src/gnc-module/gnc-module.h,
-	  branches/register-rewrite/src/gnc-module/test/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/misc-mods/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/Makefile.am,
-	  branches/register-rewrite/src/gnc-test-env,
-	  branches/register-rewrite/src/gnome-utils/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/argv-list-converters.c,
-	  branches/register-rewrite/src/gnome-utils/argv-list-converters.h,
-	  branches/register-rewrite/src/gnome-utils/dialog-transfer.c,
-	  branches/register-rewrite/src/gnome-utils/druid-gconf-setup.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dense-cal.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-file.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-frequency.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-gnome-utils.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-html.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-main-window.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin-file-history.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.c,
-	  branches/register-rewrite/src/gnome-utils/test/Makefile.am,
-	  branches/register-rewrite/src/gnome/Makefile.am,
-	  branches/register-rewrite/src/gnome/dialog-sxsincelast.c,
-	  branches/register-rewrite/src/gnome/druid-hierarchy.c,
-	  branches/register-rewrite/src/gnome/druid-loan.c,
-	  branches/register-rewrite/src/gnome/druid-merge.c,
-	  branches/register-rewrite/src/gnome/glade/account.glade,
-	  branches/register-rewrite/src/gnome/gnc-plugin-basic-commands.c,
-	  branches/register-rewrite/src/gnome/top-level.c,
-	  branches/register-rewrite/src/gnome/ui/gnc-plugin-basic-commands-ui.xml,
-	  branches/register-rewrite/src/import-export/hbci/gnc-file-aqb-import.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-getbalance.c,
-	  branches/register-rewrite/src/import-export/hbci/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/log-replay/gnc-log-replay.c,
-	  branches/register-rewrite/src/import-export/ofx/gnc-ofx-import.c,
-	  branches/register-rewrite/src/import-export/ofx/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-import/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-import/druid-qif-import.c,
-	  branches/register-rewrite/src/import-export/qif-import/qif-dialog-utils.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-file.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-guess-map.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-merge-groups.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-parse.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-to-gnc.scm,
-	  branches/register-rewrite/src/import-export/qif-import/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-acct-table.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-bank-xtn-import.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-invst-xtn-import.scm,
-	  branches/register-rewrite/src/import-export/qif/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/test/Makefile.am,
-	  branches/register-rewrite/src/network-utils/test/Makefile.am,
-	  branches/register-rewrite/src/pixmaps/Makefile.am,
-	  branches/register-rewrite/src/pixmaps/gnucash-icon.ico,
-	  branches/register-rewrite/src/quotes/gnc-fq-check.in,
-	  branches/register-rewrite/src/quotes/gnc-fq-update.in,
-	  branches/register-rewrite/src/register/ledger-core/test/Makefile.am,
-	  branches/register-rewrite/src/register/register-core/test/Makefile.am,
-	  branches/register-rewrite/src/register/register-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf-de_DE.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/gnc-plugin-page-report.c,
-	  branches/register-rewrite/src/report/report-gnome/report-gnome.scm,
-	  branches/register-rewrite/src/report/report-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-system/Makefile.am,
-	  branches/register-rewrite/src/report/report-system/gnc-report.h,
-	  branches/register-rewrite/src/report/report-system/html-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/report.scm,
-	  branches/register-rewrite/src/report/report-system/test/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/account-piecharts.scm,
-	  branches/register-rewrite/src/report/standard-reports/budget.scm,
-	  branches/register-rewrite/src/report/standard-reports/cash-flow.scm,
-	  branches/register-rewrite/src/report/standard-reports/category-barchart.scm,
-	  branches/register-rewrite/src/report/standard-reports/register.scm,
-	  branches/register-rewrite/src/report/standard-reports/standard-reports.scm,
-	  branches/register-rewrite/src/report/standard-reports/transaction.scm,
-	  branches/register-rewrite/src/scm/price-quotes.scm,
-	  branches/register-rewrite/src/scm/printing/print-check.scm,
-	  branches/register-rewrite/src/tax/us/test/Makefile.am,
-	  branches/register-rewrite/util/gnc-svnversion: Merge -r
-	  15058:15313 from trunk.
-
 2007-01-05 23:45  andi5
 
 	* [r15315] branches/reshuffle-modules/src/gnc-module/gnc-module.c,
@@ -10419,572 +9747,6 @@
 	  'libgncmod-business-ledger'." libgnc-business-ledger is no
 	  GncModule despite its installation directory. Revert that change.
 
-2007-01-05 17:25  chris
-
-	* [r15313] branches/register-rewrite,
-	  branches/register-rewrite/ChangeLog,
-	  branches/register-rewrite/Makefile.am,
-	  branches/register-rewrite/accounts/de_DE/acctchrt_skr03.gnucash-xea,
-	  branches/register-rewrite/art,
-	  branches/register-rewrite/configure.in,
-	  branches/register-rewrite/doc/tip_of_the_day.list.in,
-	  branches/register-rewrite/lib/goffice-0.0.4/goffice/Makefile.am,
-	  branches/register-rewrite/lib/guile-www/Makefile.am,
-	  branches/register-rewrite/lib/libqof/backend/file/Makefile.am,
-	  branches/register-rewrite/lib/libqof/backend/file/qsf-backend.c,
-	  branches/register-rewrite/lib/libqof/backend/file/qsf-xml-map.c,
-	  branches/register-rewrite/lib/libqof/qof/Makefile.am,
-	  branches/register-rewrite/lib/libqof/qof/qof.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbackend-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbackend.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbook.c,
-	  branches/register-rewrite/lib/libqof/qof/qofbook.h,
-	  branches/register-rewrite/lib/libqof/qof/qofbookmerge.c,
-	  branches/register-rewrite/lib/libqof/qof/qofchoice.c,
-	  branches/register-rewrite/lib/libqof/qof/qofchoice.h,
-	  branches/register-rewrite/lib/libqof/qof/qofclass.h,
-	  branches/register-rewrite/lib/libqof/qof/qofid-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofid.c,
-	  branches/register-rewrite/lib/libqof/qof/qofid.h,
-	  branches/register-rewrite/lib/libqof/qof/qofinstance.c,
-	  branches/register-rewrite/lib/libqof/qof/qofinstance.h,
-	  branches/register-rewrite/lib/libqof/qof/qofobject-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofobject.c,
-	  branches/register-rewrite/lib/libqof/qof/qofobject.h,
-	  branches/register-rewrite/lib/libqof/qof/qofquery.c,
-	  branches/register-rewrite/lib/libqof/qof/qofquery.h,
-	  branches/register-rewrite/lib/libqof/qof/qofquerycore-p.h,
-	  branches/register-rewrite/lib/libqof/qof/qofquerycore.c,
-	  branches/register-rewrite/lib/libqof/qof/qofquerycore.h,
-	  branches/register-rewrite/lib/libqof/qof/qofsession.c,
-	  branches/register-rewrite/lib/libqof/qof/qofutil.h,
-	  branches/register-rewrite/macros/ac_pkg_swig.m4,
-	  branches/register-rewrite/macros/binreloc.m4,
-	  branches/register-rewrite/macros/g-wrap.m4,
-	  branches/register-rewrite/macros/legacy_macros.m4,
-	  branches/register-rewrite/packaging/gnucash.spec.in,
-	  branches/register-rewrite/packaging/win32,
-	  branches/register-rewrite/po/POTFILES.skip,
-	  branches/register-rewrite/src,
-	  branches/register-rewrite/src/Makefile.am,
-	  branches/register-rewrite/src/app-utils,
-	  branches/register-rewrite/src/app-utils/Makefile.am,
-	  branches/register-rewrite/src/app-utils/app-utils.i,
-	  branches/register-rewrite/src/app-utils/app-utils.scm,
-	  branches/register-rewrite/src/app-utils/c-interface.scm,
-	  branches/register-rewrite/src/app-utils/date-utilities.scm,
-	  branches/register-rewrite/src/app-utils/gfec.c,
-	  branches/register-rewrite/src/app-utils/gfec.h,
-	  branches/register-rewrite/src/app-utils/gnc-account-merge.c,
-	  branches/register-rewrite/src/app-utils/gnc-component-manager.c,
-	  branches/register-rewrite/src/app-utils/gnc-component-manager.h,
-	  branches/register-rewrite/src/app-utils/gnc-helpers.c,
-	  branches/register-rewrite/src/app-utils/gnc-helpers.h,
-	  branches/register-rewrite/src/app-utils/gnc-ui-util.c,
-	  branches/register-rewrite/src/app-utils/gncmod-app-utils.c,
-	  branches/register-rewrite/src/app-utils/guile-util.c,
-	  branches/register-rewrite/src/app-utils/gw-app-utils-spec.scm,
-	  branches/register-rewrite/src/app-utils/hooks.scm,
-	  branches/register-rewrite/src/app-utils/kvp-option-registry.scm,
-	  branches/register-rewrite/src/app-utils/option-util.c,
-	  branches/register-rewrite/src/app-utils/option-util.h,
-	  branches/register-rewrite/src/app-utils/options.scm,
-	  branches/register-rewrite/src/app-utils/prefs.scm,
-	  branches/register-rewrite/src/app-utils/test/Makefile.am,
-	  branches/register-rewrite/src/app-utils/test/test-component-manager,
-	  branches/register-rewrite/src/app-utils/test/test-load-module,
-	  branches/register-rewrite/src/app-utils/test/test-print-parse-amount.c,
-	  branches/register-rewrite/src/app-utils/test/test-print-queries.c,
-	  branches/register-rewrite/src/app-utils/test/test-scm-query-string.c,
-	  branches/register-rewrite/src/backend/file/gnc-account-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-backend-file.c,
-	  branches/register-rewrite/src/backend/file/gnc-book-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/gnc-commodity-xml-v2.c,
-	  branches/register-rewrite/src/backend/file/io-gncbin-r.c,
-	  branches/register-rewrite/src/backend/file/io-gncxml-v2.c,
-	  branches/register-rewrite/src/backend/file/test/Makefile.am,
-	  branches/register-rewrite/src/backend/file/test/test-file-stuff.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-backend.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-example-account.c,
-	  branches/register-rewrite/src/backend/file/test/test-load-xml2.c,
-	  branches/register-rewrite/src/backend/file/test/test-save-in-lang.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-account.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml-commodity.c,
-	  branches/register-rewrite/src/backend/file/test/test-xml2-is-file.c,
-	  branches/register-rewrite/src/backend/postgres/putil.c,
-	  branches/register-rewrite/src/backend/postgres/putil.h,
-	  branches/register-rewrite/src/backend/postgres/test/Makefile.am,
-	  branches/register-rewrite/src/backend/postgres/test/run-tests.sh,
-	  branches/register-rewrite/src/backend/postgres/test/test-db.c,
-	  branches/register-rewrite/src/backend/postgres/test/test-load-backend.c,
-	  branches/register-rewrite/src/backend/postgres/test/test-period.c,
-	  branches/register-rewrite/src/base-typemaps.i,
-	  branches/register-rewrite/src/bin/Makefile.am,
-	  branches/register-rewrite/src/bin/gnucash-bin.c,
-	  branches/register-rewrite/src/bin/gnucash-valgrind.in,
-	  branches/register-rewrite/src/bin/gnucash.in,
-	  branches/register-rewrite/src/bin/i18n.h.in,
-	  branches/register-rewrite/src/bin/overrides/Makefile.am,
-	  branches/register-rewrite/src/bin/overrides/gnucash-build-env.in,
-	  branches/register-rewrite/src/bin/overrides/gnucash-env.in,
-	  branches/register-rewrite/src/bin/test/Makefile.am,
-	  branches/register-rewrite/src/business/business-core,
-	  branches/register-rewrite/src/business/business-core/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/business-core.i,
-	  branches/register-rewrite/src/business/business-core/business-core.scm,
-	  branches/register-rewrite/src/business/business-core/businessmod-core.c,
-	  branches/register-rewrite/src/business/business-core/file/gncmod-business-backend-file.c,
-	  branches/register-rewrite/src/business/business-core/gncBillTerm.h,
-	  branches/register-rewrite/src/business/business-core/gncBusGuile.c,
-	  branches/register-rewrite/src/business/business-core/gncCustomer.h,
-	  branches/register-rewrite/src/business/business-core/gncEntry.c,
-	  branches/register-rewrite/src/business/business-core/gncEntry.h,
-	  branches/register-rewrite/src/business/business-core/gncInvoice.c,
-	  branches/register-rewrite/src/business/business-core/gncInvoice.h,
-	  branches/register-rewrite/src/business/business-core/gncJob.h,
-	  branches/register-rewrite/src/business/business-core/gncOrder.h,
-	  branches/register-rewrite/src/business/business-core/gncOwner.h,
-	  branches/register-rewrite/src/business/business-core/gw-business-core-spec.scm,
-	  branches/register-rewrite/src/business/business-core/test/Makefile.am,
-	  branches/register-rewrite/src/business/business-core/test/test-address.c,
-	  branches/register-rewrite/src/business/business-core/test/test-business.c,
-	  branches/register-rewrite/src/business/business-core/test/test-customer.c,
-	  branches/register-rewrite/src/business/business-core/test/test-employee.c,
-	  branches/register-rewrite/src/business/business-core/test/test-job.c,
-	  branches/register-rewrite/src/business/business-core/test/test-vendor.c,
-	  branches/register-rewrite/src/business/business-gnome,
-	  branches/register-rewrite/src/business/business-gnome/Makefile.am,
-	  branches/register-rewrite/src/business/business-gnome/business-gnome-utils.c,
-	  branches/register-rewrite/src/business/business-gnome/business-gnome.scm,
-	  branches/register-rewrite/src/business/business-gnome/business-options-gnome.c,
-	  branches/register-rewrite/src/business/business-gnome/businessmod-gnome.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-billterms.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-employee.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-invoice.c,
-	  branches/register-rewrite/src/business/business-gnome/dialog-payment.c,
-	  branches/register-rewrite/src/business/business-gnome/glade/billterms.glade,
-	  branches/register-rewrite/src/business/business-gnome/glade/payment.glade,
-	  branches/register-rewrite/src/business/business-gnome/gnc-plugin-business.c,
-	  branches/register-rewrite/src/business/business-gnome/gw-business-gnome-spec.scm,
-	  branches/register-rewrite/src/business/business-gnome/schemas/Makefile.am,
-	  branches/register-rewrite/src/business/business-gnome/search-owner.c,
-	  branches/register-rewrite/src/business/business-ledger/gncEntryLedger.c,
-	  branches/register-rewrite/src/business/business-ledger/gncEntryLedgerLoad.c,
-	  branches/register-rewrite/src/business/business-reports/Makefile.am,
-	  branches/register-rewrite/src/business/business-reports/aging.scm,
-	  branches/register-rewrite/src/business/business-reports/business-reports.scm,
-	  branches/register-rewrite/src/business/business-reports/easy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/fancy-invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/invoice.scm,
-	  branches/register-rewrite/src/business/business-reports/owner-report.scm,
-	  branches/register-rewrite/src/business/business-reports/payables.scm,
-	  branches/register-rewrite/src/business/business-reports/receivables.scm,
-	  branches/register-rewrite/src/business/business-utils/Makefile.am,
-	  branches/register-rewrite/src/business/business-utils/business-options.c,
-	  branches/register-rewrite/src/business/business-utils/business-options.scm,
-	  branches/register-rewrite/src/business/business-utils/business-prefs.scm,
-	  branches/register-rewrite/src/business/dialog-tax-table,
-	  branches/register-rewrite/src/business/dialog-tax-table/Makefile.am,
-	  branches/register-rewrite/src/business/dialog-tax-table/dialog-tax-table.c,
-	  branches/register-rewrite/src/business/dialog-tax-table/dialog-tax-table.i,
-	  branches/register-rewrite/src/business/dialog-tax-table/dialog-tax-table.scm,
-	  branches/register-rewrite/src/business/dialog-tax-table/gncmod-dialog-tax-table.c,
-	  branches/register-rewrite/src/business/dialog-tax-table/gw-dialog-tax-table-spec.scm,
-	  branches/register-rewrite/src/business/dialog-tax-table/tax-tables.glade,
-	  branches/register-rewrite/src/calculation/expression_parser.c,
-	  branches/register-rewrite/src/core-utils,
-	  branches/register-rewrite/src/core-utils/Makefile.am,
-	  branches/register-rewrite/src/core-utils/core-utils.i,
-	  branches/register-rewrite/src/core-utils/core-utils.scm,
-	  branches/register-rewrite/src/core-utils/gnc-gconf-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-gconf-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-glib-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-glib-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-gtk-utils.c,
-	  branches/register-rewrite/src/core-utils/gnc-gtk-utils.h,
-	  branches/register-rewrite/src/core-utils/gnc-main.c,
-	  branches/register-rewrite/src/core-utils/gnc-main.h,
-	  branches/register-rewrite/src/core-utils/gw-core-utils-spec.scm,
-	  branches/register-rewrite/src/engine,
-	  branches/register-rewrite/src/engine/Account.c,
-	  branches/register-rewrite/src/engine/Account.h,
-	  branches/register-rewrite/src/engine/AccountP.h,
-	  branches/register-rewrite/src/engine/Group.c,
-	  branches/register-rewrite/src/engine/Group.h,
-	  branches/register-rewrite/src/engine/Makefile.am,
-	  branches/register-rewrite/src/engine/Period.c,
-	  branches/register-rewrite/src/engine/Period.h,
-	  branches/register-rewrite/src/engine/Query.c,
-	  branches/register-rewrite/src/engine/Query.h,
-	  branches/register-rewrite/src/engine/SX-book.c,
-	  branches/register-rewrite/src/engine/SX-book.h,
-	  branches/register-rewrite/src/engine/SchedXaction.c,
-	  branches/register-rewrite/src/engine/Scrub.c,
-	  branches/register-rewrite/src/engine/Transaction.c,
-	  branches/register-rewrite/src/engine/Transaction.h,
-	  branches/register-rewrite/src/engine/binreloc.c,
-	  branches/register-rewrite/src/engine/binreloc.h,
-	  branches/register-rewrite/src/engine/cap-gains.c,
-	  branches/register-rewrite/src/engine/cashobjects.c,
-	  branches/register-rewrite/src/engine/engine-helpers.c,
-	  branches/register-rewrite/src/engine/engine-helpers.h,
-	  branches/register-rewrite/src/engine/engine-interface.scm,
-	  branches/register-rewrite/src/engine/engine-utilities.scm,
-	  branches/register-rewrite/src/engine/engine.i,
-	  branches/register-rewrite/src/engine/engine.scm,
-	  branches/register-rewrite/src/engine/glib-helpers.c,
-	  branches/register-rewrite/src/engine/glib-helpers.h,
-	  branches/register-rewrite/src/engine/gnc-associate-account.c,
-	  branches/register-rewrite/src/engine/gnc-budget.c,
-	  branches/register-rewrite/src/engine/gnc-budget.h,
-	  branches/register-rewrite/src/engine/gnc-commodity.c,
-	  branches/register-rewrite/src/engine/gnc-commodity.h,
-	  branches/register-rewrite/src/engine/gnc-engine.c,
-	  branches/register-rewrite/src/engine/gnc-filepath-utils.c,
-	  branches/register-rewrite/src/engine/gnc-hooks.c,
-	  branches/register-rewrite/src/engine/gnc-lot.c,
-	  branches/register-rewrite/src/engine/gnc-numeric.scm,
-	  branches/register-rewrite/src/engine/gnc-path.c,
-	  branches/register-rewrite/src/engine/gnc-path.h,
-	  branches/register-rewrite/src/engine/gnc-pricedb.c,
-	  branches/register-rewrite/src/engine/gnc-pricedb.h,
-	  branches/register-rewrite/src/engine/gncla-dir.h.in,
-	  branches/register-rewrite/src/engine/gncmod-engine.c,
-	  branches/register-rewrite/src/engine/gw-engine-spec.scm,
-	  branches/register-rewrite/src/engine/gw-kvp-spec.scm,
-	  branches/register-rewrite/src/engine/kvp-scm.c,
-	  branches/register-rewrite/src/engine/test-core/Makefile.am,
-	  branches/register-rewrite/src/engine/test-core/test-engine-stuff.c,
-	  branches/register-rewrite/src/engine/test/Makefile.am,
-	  branches/register-rewrite/src/engine/test/test-commodities.c,
-	  branches/register-rewrite/src/engine/test/test-create-account.scm,
-	  branches/register-rewrite/src/engine/test/test-date.c,
-	  branches/register-rewrite/src/engine/test/test-group-vs-book.c,
-	  branches/register-rewrite/src/engine/test/test-guid.c,
-	  branches/register-rewrite/src/engine/test/test-load-engine.c,
-	  branches/register-rewrite/src/engine/test/test-lots.c,
-	  branches/register-rewrite/src/engine/test/test-numeric.c,
-	  branches/register-rewrite/src/engine/test/test-object.c,
-	  branches/register-rewrite/src/engine/test/test-period.c,
-	  branches/register-rewrite/src/engine/test/test-query.c,
-	  branches/register-rewrite/src/engine/test/test-querynew.c,
-	  branches/register-rewrite/src/engine/test/test-resolve-file-path.c,
-	  branches/register-rewrite/src/engine/test/test-scm-query-import.scm,
-	  branches/register-rewrite/src/engine/test/test-scm-query.c,
-	  branches/register-rewrite/src/engine/test/test-split-vs-account.c,
-	  branches/register-rewrite/src/engine/test/test-transaction-reversal.c,
-	  branches/register-rewrite/src/engine/test/test-transaction-voiding.c,
-	  branches/register-rewrite/src/gnc-module,
-	  branches/register-rewrite/src/gnc-module/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/gnc-module.c,
-	  branches/register-rewrite/src/gnc-module/gnc-module.i,
-	  branches/register-rewrite/src/gnc-module/gnc-module.scm,
-	  branches/register-rewrite/src/gnc-module/gw-gnc-module-spec.scm,
-	  branches/register-rewrite/src/gnc-module/test/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/bar-gwrap.scm,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/bar.i,
-	  branches/register-rewrite/src/gnc-module/test/mod-bar/gnc-mod-bar.c,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/baz-gwrap.scm,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/baz.i,
-	  branches/register-rewrite/src/gnc-module/test/mod-baz/gnc-mod-baz.c,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/Makefile.am,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/foo-gwrap.scm,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/foo.i,
-	  branches/register-rewrite/src/gnc-module/test/mod-foo/gnc-mod-foo.c,
-	  branches/register-rewrite/src/gnc-module/test/test-dynload.c,
-	  branches/register-rewrite/src/gnc-module/test/test-gwrapped-c,
-	  branches/register-rewrite/src/gnc-module/test/test-load-deps,
-	  branches/register-rewrite/src/gnc-module/test/test-scm-multi,
-	  branches/register-rewrite/src/gnc-test-env,
-	  branches/register-rewrite/src/gnome,
-	  branches/register-rewrite/src/gnome-search,
-	  branches/register-rewrite/src/gnome-search/Makefile.am,
-	  branches/register-rewrite/src/gnome-search/dialog-search.c,
-	  branches/register-rewrite/src/gnome-search/search-account.c,
-	  branches/register-rewrite/src/gnome-search/search-boolean.c,
-	  branches/register-rewrite/src/gnome-search/search-core-utils.c,
-	  branches/register-rewrite/src/gnome-search/search-core-utils.h,
-	  branches/register-rewrite/src/gnome-search/search-date.c,
-	  branches/register-rewrite/src/gnome-search/search-double.c,
-	  branches/register-rewrite/src/gnome-search/search-int64.c,
-	  branches/register-rewrite/src/gnome-search/search-numeric.c,
-	  branches/register-rewrite/src/gnome-search/search-reconciled.c,
-	  branches/register-rewrite/src/gnome-search/search-string.c,
-	  branches/register-rewrite/src/gnome-search/search.glade,
-	  branches/register-rewrite/src/gnome-utils,
-	  branches/register-rewrite/src/gnome-utils/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/dialog-account.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-commodity.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-commodity.h,
-	  branches/register-rewrite/src/gnome-utils/dialog-options.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-options.h,
-	  branches/register-rewrite/src/gnome-utils/dialog-preferences.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-reset-warnings.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-transfer.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-utils.c,
-	  branches/register-rewrite/src/gnome-utils/dialog-utils.h,
-	  branches/register-rewrite/src/gnome-utils/druid-gconf-setup.c,
-	  branches/register-rewrite/src/gnome-utils/druid-gnc-xml-import.c,
-	  branches/register-rewrite/src/gnome-utils/glade/commodity.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/druid-gnc-xml-import.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/druid-provider-multifile.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/preferences.glade,
-	  branches/register-rewrite/src/gnome-utils/glade/transfer.glade,
-	  branches/register-rewrite/src/gnome-utils/gnc-account-sel.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-account-sel.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-currency-edit.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-date-delta.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-date-delta.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-date-format.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dialog.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-dir.h.in,
-	  branches/register-rewrite/src/gnome-utils/gnc-druid-provider-file-gnome.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-druid-provider-multifile-gnome.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-druid-provider-multifile-gnome.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-embedded-window.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-file.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-file.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-frequency.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-frequency.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-gnome-utils.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-html.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-main-window.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-main-window.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin-menu-additions.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-plugin.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-query-list.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account-types.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account-types.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-account.h,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-commodity.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-price.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-model-transaction.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-account.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view-transaction.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-tree-view.c,
-	  branches/register-rewrite/src/gnome-utils/gnc-window.c,
-	  branches/register-rewrite/src/gnome-utils/gncmod-gnome-utils.c,
-	  branches/register-rewrite/src/gnome-utils/gnome-utils.i,
-	  branches/register-rewrite/src/gnome-utils/gnome-utils.scm,
-	  branches/register-rewrite/src/gnome-utils/gw-gnome-utils-spec.scm,
-	  branches/register-rewrite/src/gnome-utils/schemas/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/search-param.c,
-	  branches/register-rewrite/src/gnome-utils/search-param.h,
-	  branches/register-rewrite/src/gnome-utils/test/Makefile.am,
-	  branches/register-rewrite/src/gnome-utils/test/test-gnc-recurrence.c,
-	  branches/register-rewrite/src/gnome-utils/window-main-summarybar.c,
-	  branches/register-rewrite/src/gnome/Makefile.am,
-	  branches/register-rewrite/src/gnome/dialog-chart-export.c,
-	  branches/register-rewrite/src/gnome/dialog-fincalc.c,
-	  branches/register-rewrite/src/gnome/dialog-price-edit-db.c,
-	  branches/register-rewrite/src/gnome/dialog-print-check.c,
-	  branches/register-rewrite/src/gnome/dialog-scheduledxaction.h,
-	  branches/register-rewrite/src/gnome/dialog-sx-from-trans.c,
-	  branches/register-rewrite/src/gnome/dialog-tax-info.c,
-	  branches/register-rewrite/src/gnome/druid-acct-period.c,
-	  branches/register-rewrite/src/gnome/druid-hierarchy.c,
-	  branches/register-rewrite/src/gnome/druid-loan.c,
-	  branches/register-rewrite/src/gnome/druid-stock-split.c,
-	  branches/register-rewrite/src/gnome/glade/account.glade,
-	  branches/register-rewrite/src/gnome/glade/commodities.glade,
-	  branches/register-rewrite/src/gnome/glade/fincalc.glade,
-	  branches/register-rewrite/src/gnome/glade/lots.glade,
-	  branches/register-rewrite/src/gnome/glade/price.glade,
-	  branches/register-rewrite/src/gnome/glade/sched-xact.glade,
-	  branches/register-rewrite/src/gnome/glade/stocks.glade,
-	  branches/register-rewrite/src/gnome/gnc-plugin-basic-commands.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-budget.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-account-tree.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-budget.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-register.c,
-	  branches/register-rewrite/src/gnome/gnc-plugin-page-register.h,
-	  branches/register-rewrite/src/gnome/gnome.i,
-	  branches/register-rewrite/src/gnome/gnucash.desktop.in,
-	  branches/register-rewrite/src/gnome/gnucash.desktop.in.in,
-	  branches/register-rewrite/src/gnome/gw-gnc-spec.scm,
-	  branches/register-rewrite/src/gnome/lot-viewer.c,
-	  branches/register-rewrite/src/gnome/schemas,
-	  branches/register-rewrite/src/gnome/schemas/Makefile.am,
-	  branches/register-rewrite/src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in,
-	  branches/register-rewrite/src/gnome/schemas/apps_gnucash_general.schemas.in,
-	  branches/register-rewrite/src/gnome/schemas/apps_gnucash_warnings.schemas.in,
-	  branches/register-rewrite/src/gnome/top-level.c,
-	  branches/register-rewrite/src/gnome/window-reconcile.c,
-	  branches/register-rewrite/src/import-export,
-	  branches/register-rewrite/src/import-export/Makefile.am,
-	  branches/register-rewrite/src/import-export/binary-import,
-	  branches/register-rewrite/src/import-export/binary-import/druid-commodity.c,
-	  branches/register-rewrite/src/import-export/generic-import.glade,
-	  branches/register-rewrite/src/import-export/gnc-import-format-gnome.c,
-	  branches/register-rewrite/src/import-export/gnc-import-format-gnome.h,
-	  branches/register-rewrite/src/import-export/hbci/Makefile.am,
-	  branches/register-rewrite/src/import-export/hbci/dialog-hbcitrans.c,
-	  branches/register-rewrite/src/import-export/hbci/dialog-hbcitrans.h,
-	  branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c,
-	  branches/register-rewrite/src/import-export/hbci/glade/hbci.glade,
-	  branches/register-rewrite/src/import-export/hbci/gnc-file-aqb-import.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-file-aqb-import.h,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-kvp.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-transfer.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c,
-	  branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.h,
-	  branches/register-rewrite/src/import-export/hbci/gnc-plugin-hbci-ui.xml,
-	  branches/register-rewrite/src/import-export/hbci/gnc-plugin-hbci.c,
-	  branches/register-rewrite/src/import-export/hbci/hbci-interaction.c,
-	  branches/register-rewrite/src/import-export/hbci/hbci-interaction.h,
-	  branches/register-rewrite/src/import-export/hbci/schemas/Makefile.am,
-	  branches/register-rewrite/src/import-export/import-account-matcher.c,
-	  branches/register-rewrite/src/import-export/import-account-matcher.h,
-	  branches/register-rewrite/src/import-export/import-backend.c,
-	  branches/register-rewrite/src/import-export/import-backend.h,
-	  branches/register-rewrite/src/import-export/import-main-matcher.c,
-	  branches/register-rewrite/src/import-export/import-match-map.c,
-	  branches/register-rewrite/src/import-export/import-match-picker.c,
-	  branches/register-rewrite/src/import-export/import-provider-format.glade,
-	  branches/register-rewrite/src/import-export/log-replay/Makefile.am,
-	  branches/register-rewrite/src/import-export/mt940/Makefile.am,
-	  branches/register-rewrite/src/import-export/mt940/gnc-mt940-import.c,
-	  branches/register-rewrite/src/import-export/mt940/gnc-mt940-import.h,
-	  branches/register-rewrite/src/import-export/mt940/gnc-plugin-mt940-ui.xml,
-	  branches/register-rewrite/src/import-export/mt940/gnc-plugin-mt940.c,
-	  branches/register-rewrite/src/import-export/mt940/gnc-plugin-mt940.h,
-	  branches/register-rewrite/src/import-export/mt940/gncmod-mt940-import.c,
-	  branches/register-rewrite/src/import-export/ofx/gnc-ofx-import.c,
-	  branches/register-rewrite/src/import-export/qif-import,
-	  branches/register-rewrite/src/import-export/qif-import/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-import/dialog-account-picker.c,
-	  branches/register-rewrite/src/import-export/qif-import/druid-qif-import.c,
-	  branches/register-rewrite/src/import-export/qif-import/qif-dialog-utils.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-file.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-guess-map.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-import.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-merge-groups.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-objects.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-parse.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif-to-gnc.scm,
-	  branches/register-rewrite/src/import-export/qif-import/qif.glade,
-	  branches/register-rewrite/src/import-export/qif-import/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-acct-table.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-bank-xtn-import.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-format-check.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-invst-xtn-import.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/qif-parse.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif-io-core/test/test-import-phase-1.scm,
-	  branches/register-rewrite/src/import-export/qif-io-core/test/test-parser.scm,
-	  branches/register-rewrite/src/import-export/qif/Makefile.am,
-	  branches/register-rewrite/src/import-export/qif/qif-parse.c,
-	  branches/register-rewrite/src/import-export/qif/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/schemas/Makefile.am,
-	  branches/register-rewrite/src/import-export/test/Makefile.am,
-	  branches/register-rewrite/src/import-export/test/test-import-parse.c,
-	  branches/register-rewrite/src/network-utils/test/Makefile.am,
-	  branches/register-rewrite/src/optional/Makefile.am,
-	  branches/register-rewrite/src/optional/swig,
-	  branches/register-rewrite/src/register/ledger-core/gnc-ledger-display.c,
-	  branches/register-rewrite/src/register/ledger-core/gnc-ledger-display.h,
-	  branches/register-rewrite/src/register/ledger-core/split-register-control.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-load.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register-model.c,
-	  branches/register-rewrite/src/register/ledger-core/split-register.c,
-	  branches/register-rewrite/src/register/register-core,
-	  branches/register-rewrite/src/register/register-core/Makefile.am,
-	  branches/register-rewrite/src/register/register-core/gncmod-register-core.c,
-	  branches/register-rewrite/src/register/register-core/gw-register-core-spec.scm,
-	  branches/register-rewrite/src/register/register-core/table-allgui.h,
-	  branches/register-rewrite/src/register/register-core/test/Makefile.am,
-	  branches/register-rewrite/src/register/register-gnome/gnucash-color.c,
-	  branches/register-rewrite/src/register/register-gnome/gnucash-item-list.c,
-	  branches/register-rewrite/src/register/register-gnome/table-gnome.c,
-	  branches/register-rewrite/src/register/register-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/locale-specific/us/Makefile.am,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf-de_DE.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/taxtxf.scm,
-	  branches/register-rewrite/src/report/locale-specific/us/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome,
-	  branches/register-rewrite/src/report/report-gnome/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/dialog-column-view.c,
-	  branches/register-rewrite/src/report/report-gnome/dialog-style-sheet.c,
-	  branches/register-rewrite/src/report/report-gnome/gnc-plugin-page-report.c,
-	  branches/register-rewrite/src/report/report-gnome/gncmod-report-gnome.c,
-	  branches/register-rewrite/src/report/report-gnome/gw-report-gnome-spec.scm,
-	  branches/register-rewrite/src/report/report-gnome/report-gnome.i,
-	  branches/register-rewrite/src/report/report-gnome/report-gnome.scm,
-	  branches/register-rewrite/src/report/report-gnome/report.glade,
-	  branches/register-rewrite/src/report/report-gnome/test/Makefile.am,
-	  branches/register-rewrite/src/report/report-gnome/window-report.c,
-	  branches/register-rewrite/src/report/report-system,
-	  branches/register-rewrite/src/report/report-system/Makefile.am,
-	  branches/register-rewrite/src/report/report-system/commodity-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/gnc-report.c,
-	  branches/register-rewrite/src/report/report-system/gnc-report.h,
-	  branches/register-rewrite/src/report/report-system/gncmod-report-system.c,
-	  branches/register-rewrite/src/report/report-system/gw-report-system-spec.scm,
-	  branches/register-rewrite/src/report/report-system/html-acct-table.scm,
-	  branches/register-rewrite/src/report/report-system/html-barchart.scm,
-	  branches/register-rewrite/src/report/report-system/html-piechart.scm,
-	  branches/register-rewrite/src/report/report-system/html-scatter.scm,
-	  branches/register-rewrite/src/report/report-system/html-style-info.scm,
-	  branches/register-rewrite/src/report/report-system/html-style-sheet.scm,
-	  branches/register-rewrite/src/report/report-system/html-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/options-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/report-system.i,
-	  branches/register-rewrite/src/report/report-system/report-system.scm,
-	  branches/register-rewrite/src/report/report-system/report-utilities.scm,
-	  branches/register-rewrite/src/report/report-system/report.scm,
-	  branches/register-rewrite/src/report/report-system/test/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/account-piecharts.scm,
-	  branches/register-rewrite/src/report/standard-reports/account-summary.scm,
-	  branches/register-rewrite/src/report/standard-reports/advanced-portfolio.scm,
-	  branches/register-rewrite/src/report/standard-reports/average-balance.scm,
-	  branches/register-rewrite/src/report/standard-reports/balance-sheet.scm,
-	  branches/register-rewrite/src/report/standard-reports/budget.scm,
-	  branches/register-rewrite/src/report/standard-reports/cash-flow.scm,
-	  branches/register-rewrite/src/report/standard-reports/category-barchart.scm,
-	  branches/register-rewrite/src/report/standard-reports/daily-reports.scm,
-	  branches/register-rewrite/src/report/standard-reports/equity-statement.scm,
-	  branches/register-rewrite/src/report/standard-reports/general-journal.scm,
-	  branches/register-rewrite/src/report/standard-reports/income-statement.scm,
-	  branches/register-rewrite/src/report/standard-reports/net-barchart.scm,
-	  branches/register-rewrite/src/report/standard-reports/portfolio.scm,
-	  branches/register-rewrite/src/report/standard-reports/price-scatter.scm,
-	  branches/register-rewrite/src/report/standard-reports/register.scm,
-	  branches/register-rewrite/src/report/standard-reports/standard-reports.scm,
-	  branches/register-rewrite/src/report/standard-reports/test/Makefile.am,
-	  branches/register-rewrite/src/report/standard-reports/transaction.scm,
-	  branches/register-rewrite/src/report/standard-reports/trial-balance.scm,
-	  branches/register-rewrite/src/report/stylesheets/Makefile.am,
-	  branches/register-rewrite/src/report/stylesheets/stylesheet-easy.scm,
-	  branches/register-rewrite/src/report/stylesheets/stylesheet-fancy.scm,
-	  branches/register-rewrite/src/report/stylesheets/test/Makefile.am,
-	  branches/register-rewrite/src/report/utility-reports/Makefile.am,
-	  branches/register-rewrite/src/report/utility-reports/hello-world.scm,
-	  branches/register-rewrite/src/report/utility-reports/test-graphing.scm,
-	  branches/register-rewrite/src/report/utility-reports/test/Makefile.am,
-	  branches/register-rewrite/src/report/utility-reports/utility-reports.scm,
-	  branches/register-rewrite/src/report/utility-reports/view-column.scm,
-	  branches/register-rewrite/src/report/utility-reports/welcome-to-gnucash.scm,
-	  branches/register-rewrite/src/scm/Makefile.am,
-	  branches/register-rewrite/src/scm/command-line.scm,
-	  branches/register-rewrite/src/scm/main-window.scm,
-	  branches/register-rewrite/src/scm/main.scm,
-	  branches/register-rewrite/src/scm/price-quotes.scm,
-	  branches/register-rewrite/src/scm/printing/print-check.scm,
-	  branches/register-rewrite/src/tax/us/Makefile.am,
-	  branches/register-rewrite/src/tax/us/test/Makefile.am,
-	  branches/register-rewrite/src/tax/us/txf-de_DE.scm,
-	  branches/register-rewrite/src/test-core/test-stuff.c: Merge -r
-	  14539:15058 from trunk.
-
 2007-01-04 21:23  andi5
 
 	* [r15312]

Modified: gnucash/branches/gda-dev/HACKING
===================================================================
--- gnucash/branches/gda-dev/HACKING	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/HACKING	2007-09-09 16:25:08 UTC (rev 16513)
@@ -111,7 +111,9 @@
     (let ((l (copy-list args)))
       (nconc l (list "-cd" (expand-file-name default-directory) "-fullname"))))
 
+jsled does not need the above with emacs-22, thankfully.  It was getting quite tiresome.
 
+
 Using Electric Fence with GnuCash
 ---------------------------------
     % configure --enable-efence
@@ -127,7 +129,7 @@
 
 Using Valgrind with GnuCash
 ---------------------------
--- run ./src/bin/overrides/gnucash-valgrind
+-- run ${prefix}/bin/gnucash-valgrind
 
 However, I did not find valgrind to be useful.  It reported a bunch of
 guile bugs, some g_hash_table bugs, and then the program exited prematurely 

Modified: gnucash/branches/gda-dev/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/Makefile.am	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/Makefile.am	2007-09-09 16:25:08 UTC (rev 16513)
@@ -59,6 +59,7 @@
   po/glossary/es_NI-policy.txt \
   po/glossary/fr.po \
   po/glossary/gnc-glossary.txt \
+  po/glossary/hu.po \
   po/glossary/it.po \
   po/glossary/nl.po \
   po/glossary/nb.po \

Modified: gnucash/branches/gda-dev/NEWS
===================================================================
--- gnucash/branches/gda-dev/NEWS	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/NEWS	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1,6 +1,44 @@
 Version history:
 ------- -------
 
+ 2.2.1 - 19 August 2007
+  	 Welcome to the GnuCash 2.2.1 Release.
+	 Fixed Bugs:
+	 o #170729: locale-specific delimiters in scheduled transactions
+		    templates and mortgage druid
+	 o #339260: Right-click doesn't select txn but works on the previously
+		    selected in the register
+	 o #361604: Balance sheet report shows incorrect prices for commodities
+		    when using "nearest in time" option
+	 o #445917: Dialog says, Click "Next"..., Button says "Forward"
+	 o #452496: Dirtying a split does not dirty the parent txn or book
+	 o #457027: About dialog shows wrong year in Copyright string
+	 o #457213: Resizing SLR window causes it to show up as blank next time
+	 o #457228: AqBanking Wizard QtCore4.dll error on WinXP, procedure entry
+		    point not found
+	 o #457944: startup delay, keep splash screen during file loading
+	 o #458080: RPM .spec file still depends on g-wrap
+	 o #458567: Ship with windows gtkrc
+	 o #458783: Doesn't start if installed into a directory with an "umlaut"
+	 o #459259: Unshortened column-title in Scheduled Transactions editor
+		    for some locales
+	 o #460432: Crash when running Account Report or Account Transaction
+		    Report against A/R account
+	 o #460924: Fox for warning: the address of '*' will always evaluate as
+		    'true'
+	 o #462567: win32: GnuCash improperly interprets filenames as URLs and
+		    fails
+	 o #465338: hbci module init fails on FreeBSD due to change 15799
+	 o #468115: Save Account Tree Sort Preference
+	 Other Changes:
+	 o Fix XPF [CFP Franc Pacifique] to not use cents, add YER [Yemeni Riyal]
+	 o Update gnome libraries in Win32 build
+	 o Avoid a few critical warnings and improve logging
+	 o Completely remove FreqSpec
+	 o Disable Close books and QSF Import again
+	 o Update translations: British English, Catalan, French, German,
+		                Hungarian, Japanese, Ukrainian
+
  2.2.0 - 14 July 2007
   	 o Welcome to the GnuCash 2.2.0 Release.
 	 o With this new release series, GnuCash is available on Microsoft

Modified: gnucash/branches/gda-dev/accounts/fr_CA/Makefile
===================================================================
--- gnucash/branches/gda-dev/accounts/fr_CA/Makefile	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/accounts/fr_CA/Makefile	2007-09-09 16:25:08 UTC (rev 16513)
@@ -160,7 +160,7 @@
 GNUCASH_ENABLE_GUI_FALSE = #
 GNUCASH_ENABLE_GUI_TRUE = 
 GNUCASH_MAJOR_VERSION = 2
-GNUCASH_MICRO_VERSION = 0
+GNUCASH_MICRO_VERSION = 1
 GNUCASH_MINOR_VERSION = 2
 GNUCASH_SEPARATE_BUILDDIR_FALSE = 
 GNUCASH_SEPARATE_BUILDDIR_TRUE = #
@@ -248,9 +248,9 @@
 PACKAGE = gnucash
 PACKAGE_BUGREPORT = gnucash-devel at gnucash.org
 PACKAGE_NAME = gnucash
-PACKAGE_STRING = gnucash 2.2.0
+PACKAGE_STRING = gnucash 2.2.1
 PACKAGE_TARNAME = gnucash
-PACKAGE_VERSION = 2.2.0
+PACKAGE_VERSION = 2.2.1
 PATH_SEPARATOR = :
 PERL = /usr/bin/perl
 PERLINCL = /usr/lib/perl5/5.8.8/i586-linux-thread-multi
@@ -283,7 +283,7 @@
 USE_LIBQOF_FALSE = #
 USE_LIBQOF_TRUE = 
 USE_NLS = yes
-VERSION = 2.2.0
+VERSION = 2.2.1
 WARN_CFLAGS = -Wall -Wmissing-prototypes 
 XGETTEXT = /usr/bin/xgettext
 ac_ct_CC = gcc

Modified: gnucash/branches/gda-dev/configure.in
===================================================================
--- gnucash/branches/gda-dev/configure.in	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/configure.in	2007-09-09 16:25:08 UTC (rev 16513)
@@ -20,7 +20,7 @@
 
 # Autoconf initialization
 AC_PREREQ(2.59)
-AC_INIT([gnucash], [2.2.0], [gnucash-devel at gnucash.org])
+AC_INIT([gnucash], [2.2.1], [gnucash-devel at gnucash.org])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
 
@@ -102,7 +102,7 @@
 AC_PROG_LN_S
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(limits.h sys/times.h)
+AC_CHECK_HEADERS(limits.h sys/times.h sys/wait.h)
 AC_CHECK_FUNCS(stpcpy memcpy timegm towupper)
 AC_CHECK_FUNCS(setenv,,[
   AC_CHECK_FUNCS(putenv,,[

Modified: gnucash/branches/gda-dev/lib/libqof/qof/qoflog.c
===================================================================
--- gnucash/branches/gda-dev/lib/libqof/qof/qoflog.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/lib/libqof/qof/qoflog.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -196,7 +196,7 @@
 	{
 		log_table = g_hash_table_new(g_str_hash, g_str_equal);
 	}
-	g_hash_table_insert(log_table, (gpointer)log_module, GINT_TO_POINTER((gint)level));
+	g_hash_table_insert(log_table, g_strdup((gchar*)log_module), GINT_TO_POINTER((gint)level));
 }
 
 const char *
@@ -274,7 +274,7 @@
                g_debug("setting log [%s] to level [%s=%d]", logger_name, level_str, level);
                qof_log_set_level(logger_name, level);
 
-	       g_free(logger_name);
+               g_free(logger_name);
                g_free(level_str);
           }
           g_strfreev(levels);
@@ -329,7 +329,7 @@
      _QLC_DBG({ printf("trying [%s] (%d):", log_domain, g_hash_table_size(log_levels)); });
      if (G_LIKELY(log_levels))
      {
-          // e.g., "a.b.c" -> "a\0b.c" -> "a.b\0c", "a.b.c"
+          // e.g., "a.b.c\0" -> "a\0b.c\0" -> "a.b\0c\0", "a.b.c\0"
           gpointer match_level;
           while ((dot_pointer = g_strstr_len(dot_pointer, strlen(dot_pointer), ".")) != NULL)
           {

Modified: gnucash/branches/gda-dev/lib/libqof/qof/qoflog.h
===================================================================
--- gnucash/branches/gda-dev/lib/libqof/qof/qoflog.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/lib/libqof/qof/qoflog.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -140,7 +140,7 @@
     # log.ger.path=level
     gnc.engine.sx=debug
     gnc.gui.sx=debug
-    gnc.gui.freqspec=debug
+    gnc.import-export.qif.parse=debug
     [output]
     # to=["stderr"|"stdout"|filename]
     to=stderr

Modified: gnucash/branches/gda-dev/macros/svn2cl.xsl
===================================================================
--- gnucash/branches/gda-dev/macros/svn2cl.xsl	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/macros/svn2cl.xsl	2007-09-09 16:25:08 UTC (rev 16513)
@@ -110,16 +110,16 @@
   <xsl:text>gnucash/branches/gobject-engine-dev-warlord</xsl:text>
  </xsl:variable>
  <xsl:variable name="sp5">
-  <xsl:text>gnucash/branches/register-rewrite</xsl:text>
+  <xsl:text>gnucash/branches/module-cleanup</xsl:text>
  </xsl:variable>
  <xsl:variable name="sp6">
-  <xsl:text>gnucash/branches/module-cleanup</xsl:text>
+  <xsl:text>gnucash/branches/remove-group2</xsl:text>
  </xsl:variable>
  <xsl:variable name="sp7">
-  <xsl:text>gnucash/branches/remove-group2</xsl:text>
+  <xsl:text>gnucash/branches/sx-cleanup</xsl:text>
  </xsl:variable>
  <xsl:variable name="sp8">
-  <xsl:text>gnucash/branches/sx-cleanup</xsl:text>
+  <xsl:text>NOTUSED</xsl:text>
  </xsl:variable>
  <xsl:variable name="sp9">
   <xsl:text>NOTUSED</xsl:text>

Modified: gnucash/branches/gda-dev/po/de.po
===================================================================
--- gnucash/branches/gda-dev/po/de.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/de.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: gnucash-2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 10:04+0200\n"
-"PO-Revision-Date: 2007-07-21 10:06+0200\n"
+"POT-Creation-Date: 2007-08-11 17:04+0200\n"
+"PO-Revision-Date: 2007-08-11 17:06+0200\n"
 "Last-Translator: Christian Stimming <stimming at tuhh.de>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -426,8 +426,8 @@
 #: ../src/business/business-core/gncInvoice.c:1320
 #: ../src/business/business-core/gncInvoice.c:1414
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:140
-#: ../src/gnome/druid-loan.c:1792 ../src/gnome/druid-loan.c:2273
-#: ../src/gnome/druid-loan.c:2336 ../src/gnome/druid-loan.c:2350
+#: ../src/gnome/druid-loan.c:1795 ../src/gnome/druid-loan.c:2276
+#: ../src/gnome/druid-loan.c:2339 ../src/gnome/druid-loan.c:2353
 #: ../src/register/ledger-core/split-register.c:2028
 #: ../src/register/ledger-core/split-register.c:2033
 #: ../src/register/ledger-core/split-register.c:2042
@@ -469,7 +469,7 @@
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
 #: ../src/business/business-gnome/business-gnome-utils.c:454
-#: ../src/engine/FreqSpec.c:728 ../src/engine/Recurrence.c:479
+#: ../src/engine/Recurrence.c:330 ../src/engine/Recurrence.c:482
 #: ../src/gnome/glade/sched-xact.glade.h:118 ../intl-scm/guile-strings.c:3634
 #: ../intl-scm/guile-strings.c:3660 ../intl-scm/guile-strings.c:3720
 #: ../intl-scm/guile-strings.c:3722 ../intl-scm/guile-strings.c:3828
@@ -477,7 +477,6 @@
 #: ../intl-scm/guile-strings.c:4814 ../intl-scm/guile-strings.c:4874
 #: ../intl-scm/guile-strings.c:4876 ../intl-scm/guile-strings.c:4982
 #: ../intl-scm/guile-strings.c:4998
-#, c-format
 msgid "None"
 msgstr "Keine"
 
@@ -580,9 +579,7 @@
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/business/business-gnome/dialog-billterms.c:471
-#: ../src/engine/FreqSpec.c:987 ../intl-scm/guile-strings.c:6152
-#: ../intl-scm/guile-strings.c:6676
-#, c-format
+#: ../intl-scm/guile-strings.c:6152 ../intl-scm/guile-strings.c:6676
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -780,7 +777,7 @@
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
 #: ../src/business/business-gnome/dialog-employee.c:706
-#: ../src/gnome/dialog-sx-editor.c:1705
+#: ../src/gnome/dialog-sx-editor.c:1695
 #: ../src/gnome/glade/sched-xact.glade.h:115
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:9
 #: ../src/gnome-utils/gnc-dense-cal.c:327
@@ -2044,7 +2041,7 @@
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/glade/payment.glade.h:2
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:70
-#: ../src/gnome/druid-loan.c:1786 ../src/gnome/glade/lots.glade.h:8
+#: ../src/gnome/druid-loan.c:1789 ../src/gnome/glade/lots.glade.h:8
 #: ../src/gnome/glade/register.glade.h:14 ../src/gnome/reconcile-list.c:226
 #: ../src/gnome-utils/gnc-tree-view-price.c:447
 #: ../src/import-export/generic-import.glade.h:15
@@ -3354,149 +3351,6 @@
 msgid "Lot"
 msgstr "Posten"
 
-#. This is displayed instead of the number of the day of month.
-#: ../src/engine/FreqSpec.c:690
-msgid "last day"
-msgstr "Monatsende"
-
-#. %s is the strftime-string of the one-time date.
-#: ../src/engine/FreqSpec.c:738
-#, c-format
-msgid "Once: %s"
-msgstr "Einmalig: %s"
-
-#. %u is the number of intervals
-#: ../src/engine/FreqSpec.c:747
-#, c-format
-msgid "Daily (x%u)"
-msgstr "Täglich (%u Mal)"
-
-#: ../src/engine/FreqSpec.c:752 ../src/engine/Recurrence.c:529
-#: ../src/gnome/glade/sched-xact.glade.h:71
-#, c-format
-msgid "Daily"
-msgstr "Täglich"
-
-#. %u is the number of intervals
-#: ../src/engine/FreqSpec.c:772
-#, c-format
-msgid "Weekdays: (x%u)"
-msgstr "Wochentags: (%u Mal)"
-
-#: ../src/engine/FreqSpec.c:777
-#, c-format
-msgid "Weekdays"
-msgstr "Wochentags"
-
-#. %d are the number of intervals; %s is
-#. the name of the weekday
-#: ../src/engine/FreqSpec.c:816
-#, c-format
-msgid "Weekly (x%d): %s"
-msgstr "Wöchentlich (%d Mal): %s"
-
-#. Translators: %s is the name of the weekday
-#: ../src/engine/FreqSpec.c:822
-#, c-format
-msgid "Weekly: %s"
-msgstr "Wöchentlich: %s"
-
-#. %s is the name of the weekday
-#: ../src/engine/FreqSpec.c:829
-#, c-format
-msgid "Bi-Weekly, %ss"
-msgstr "Zweiwöchentlich am %s"
-
-#. 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/engine/FreqSpec.c:852
-#, c-format
-msgid "Semi-monthly (x%u): %s, %s"
-msgstr "Halbmonatlich (%u Mal): am %s. und %s."
-
-#. 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/engine/FreqSpec.c:863
-#, c-format
-msgid "Semi-monthly: %s, %s"
-msgstr "Halbmonatlich: am %s. und %s."
-
-#. %u is the number of intervals; %u is
-#. the day of month
-#: ../src/engine/FreqSpec.c:879
-#, c-format
-msgid "Monthly (x%u): %u"
-msgstr "Monatlich (%u Mal): am %u."
-
-#. %u is the day of month
-#: ../src/engine/FreqSpec.c:887
-#, c-format
-msgid "Monthly: %u"
-msgstr "Monatlich: am %u."
-
-#. %u is the number of intervals; %u is
-#. the day of month
-#: ../src/engine/FreqSpec.c:897
-#, c-format
-msgid "Quarterly (x%u): %u"
-msgstr "Vierteljährlich (%u Mal): am %u."
-
-#. %u is the day of month
-#: ../src/engine/FreqSpec.c:905
-#, c-format
-msgid "Quarterly: %u"
-msgstr "Vierteljährlich: am %u."
-
-#. %u is the number of intervals; %u is
-#. the day of month
-#: ../src/engine/FreqSpec.c:916
-#, c-format
-msgid "Tri-Yearly (x%u): %u"
-msgstr "Alle 4 Monate (%u Mal): am %u."
-
-#. %u is the day of month
-#: ../src/engine/FreqSpec.c:924
-#, c-format
-msgid "Tri-Yearly: %u"
-msgstr "Alle 4 Monate: am %u."
-
-#. %u is the number of intervals; %u
-#. is the day of month
-#: ../src/engine/FreqSpec.c:939
-#, c-format
-msgid "Semi-Yearly (x%u): %u"
-msgstr "Halbjährlich (%u Mal): am %u."
-
-#. %u is the day of month
-#: ../src/engine/FreqSpec.c:947
-#, c-format
-msgid "Semi-Yearly: %u"
-msgstr "Halbjährlich: am %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/engine/FreqSpec.c:970
-#, c-format
-msgid "Yearly (x%u): %s/%u"
-msgstr "Jährlich (%1$u Mal): %3$u. %2$s"
-
-#. %s is the abbreviated name of the
-#. month; %u is the day of month
-#: ../src/engine/FreqSpec.c:980
-#, c-format
-msgid "Yearly: %s/%u"
-msgstr "Jährlich: %2$u. %1$s"
-
 #: ../src/engine/gnc-budget.c:132 ../src/gnome/gnc-plugin-page-budget.c:846
 msgid "Unnamed Budget"
 msgstr "Unbenanntes Budget"
@@ -3572,7 +3426,12 @@
 "sind nicht korrekt. Die Zugriffsrechte müssen »rwx«\n"
 "(Lesen/Schreiben/Ausführen) für den aktuellen Benutzer erlauben.\n"
 
-#: ../src/engine/Recurrence.c:427 ../src/gnome/glade/fincalc.glade.h:45
+#. translators: " + " is an separator in a list of string-representations of recurrence frequencies
+#: ../src/engine/Recurrence.c:336
+msgid " + "
+msgstr " + "
+
+#: ../src/engine/Recurrence.c:430 ../src/gnome/glade/fincalc.glade.h:45
 #: ../src/gnome/glade/sched-xact.glade.h:190
 msgid "Weekly"
 msgstr "Wöchentlich"
@@ -3580,38 +3439,41 @@
 #. translators: %u is the recurrence multipler.
 #. translators: %u is the recurrence multiplier
 #. translators: %u is the number of intervals
-#. translators: %u is the recurrence multipler.
 #. translators: %u is the recurrence multiplier.
-#: ../src/engine/Recurrence.c:431 ../src/engine/Recurrence.c:505
-#: ../src/engine/Recurrence.c:533 ../src/engine/Recurrence.c:546
-#: ../src/engine/Recurrence.c:560
+#: ../src/engine/Recurrence.c:434 ../src/engine/Recurrence.c:508
+#: ../src/engine/Recurrence.c:536 ../src/engine/Recurrence.c:549
+#: ../src/engine/Recurrence.c:563
 #, c-format
 msgid " (x%u)"
 msgstr "(%u Mal)"
 
 #. translators: %s is an already-localized form of the day of the week.
-#: ../src/engine/Recurrence.c:463
+#: ../src/engine/Recurrence.c:466
 #, c-format
 msgid "last %s"
 msgstr "letzter %s"
 
-#: ../src/engine/Recurrence.c:500 ../src/gnome/glade/fincalc.glade.h:42
+#: ../src/engine/Recurrence.c:503 ../src/gnome/glade/fincalc.glade.h:42
 msgid "Semi-monthly"
 msgstr "Halbmonatlich"
 
 #. translators: %d is the number of Recurrences in the list.
-#: ../src/engine/Recurrence.c:515
+#: ../src/engine/Recurrence.c:518
 #, c-format
 msgid "Unknown, %d-size list."
 msgstr "Unbekannt, Liste mit %d Einträgen."
 
-#: ../src/engine/Recurrence.c:526 ../src/gnome/glade/sched-xact.glade.h:130
+#: ../src/engine/Recurrence.c:529 ../src/gnome/glade/sched-xact.glade.h:130
 msgid "Once"
 msgstr "Einmal"
 
+#: ../src/engine/Recurrence.c:532 ../src/gnome/glade/sched-xact.glade.h:71
+msgid "Daily"
+msgstr "Täglich"
+
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Recurrence.c:542 ../src/gnome/glade/fincalc.glade.h:33
+#: ../src/engine/Recurrence.c:545 ../src/gnome/glade/fincalc.glade.h:33
 #: ../src/gnome/glade/sched-xact.glade.h:111 ../intl-scm/guile-strings.c:3724
 #: ../intl-scm/guile-strings.c:3726 ../intl-scm/guile-strings.c:4878
 #: ../intl-scm/guile-strings.c:4880
@@ -3620,7 +3482,7 @@
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Recurrence.c:556 ../intl-scm/guile-strings.c:3732
+#: ../src/engine/Recurrence.c:559 ../intl-scm/guile-strings.c:3732
 #: ../intl-scm/guile-strings.c:3734 ../intl-scm/guile-strings.c:4886
 #: ../intl-scm/guile-strings.c:4888
 msgid "Yearly"
@@ -3638,7 +3500,7 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/engine/Split.c:1244 ../src/engine/Split.c:1261
+#: ../src/engine/Split.c:1240 ../src/engine/Split.c:1257
 #: ../intl-scm/guile-strings.c:3884 ../intl-scm/guile-strings.c:3906
 #: ../intl-scm/guile-strings.c:5038 ../intl-scm/guile-strings.c:5060
 msgid "-- Split Transaction --"
@@ -3646,7 +3508,7 @@
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Split.c:1277 ../src/gnome/druid-stock-split.c:454
+#: ../src/engine/Split.c:1273 ../src/gnome/druid-stock-split.c:454
 #: ../src/gnome/glade/register.glade.h:67
 #: ../src/gnome/gnc-plugin-page-register.c:328
 #: ../src/register/ledger-core/split-register.c:2072
@@ -3895,7 +3757,7 @@
 msgid "Complete"
 msgstr "Komplett"
 
-#: ../src/gnome/dialog-sx-editor.c:186 ../src/gnome/glade/price.glade.h:22
+#: ../src/gnome/dialog-sx-editor.c:185 ../src/gnome/glade/price.glade.h:22
 #: ../src/gnome/glade/register.glade.h:85
 #: ../src/gnome/gnc-plugin-page-sx-list.c:122
 #: ../src/gnome-utils/gnc-main-window.c:221
@@ -3904,41 +3766,41 @@
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/gnome/dialog-sx-editor.c:187 ../src/gnome/window-reconcile.c:1995
+#: ../src/gnome/dialog-sx-editor.c:186 ../src/gnome/window-reconcile.c:1995
 msgid "_Transaction"
 msgstr "_Buchung"
 
-#: ../src/gnome/dialog-sx-editor.c:188 ../src/gnome/glade/register.glade.h:101
+#: ../src/gnome/dialog-sx-editor.c:187 ../src/gnome/glade/register.glade.h:101
 #: ../src/gnome-utils/gnc-main-window.c:222
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/gnome/dialog-sx-editor.c:189 ../src/gnome/glade/register.glade.h:74
+#: ../src/gnome/dialog-sx-editor.c:188 ../src/gnome/glade/register.glade.h:74
 #: ../src/gnome-utils/gnc-main-window.c:223
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ../src/gnome/dialog-sx-editor.c:219
+#: ../src/gnome/dialog-sx-editor.c:218
 msgid "This SX has changed; are you sure you want to cancel?"
 msgstr ""
 "Diese terminierte Buchung wurde geändert. Sind Sie sicher, dass Sie\n"
 "abbrechen wollen?"
 
-#: ../src/gnome/dialog-sx-editor.c:636
+#: ../src/gnome/dialog-sx-editor.c:635
 #, c-format
 msgid "Couldn't parse credit formula for split \"%s\"."
 msgstr ""
 "Die Berechnungsformel für die Minderungsbuchung konnte nicht verarbeitet "
 "werden im Buchungsteil »%s«. "
 
-#: ../src/gnome/dialog-sx-editor.c:662
+#: ../src/gnome/dialog-sx-editor.c:661
 #, c-format
 msgid "Couldn't parse debit formula for split \"%s\"."
 msgstr ""
 "Die Berechnungsformel für die Mehrungsbuchung konnte nicht verarbeitet "
 "werden im Buchungsteil »%s«. "
 
-#: ../src/gnome/dialog-sx-editor.c:696 ../src/gnome/dialog-sx-from-trans.c:270
+#: ../src/gnome/dialog-sx-editor.c:695 ../src/gnome/dialog-sx-from-trans.c:270
 msgid ""
 "The Scheduled Transaction Editor cannot automatically balance this "
 "transaction. Should it still be entered?"
@@ -3946,11 +3808,11 @@
 "Der Terminierte-Buchungen-Editor kann diese Buchung nicht automatisch "
 "ausgeglichen erstellen. Soll sie trotzdem erstellt werden?"
 
-#: ../src/gnome/dialog-sx-editor.c:715
+#: ../src/gnome/dialog-sx-editor.c:714
 msgid "Please name the Scheduled Transaction."
 msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
 
-#: ../src/gnome/dialog-sx-editor.c:741
+#: ../src/gnome/dialog-sx-editor.c:740
 #, c-format
 msgid ""
 "A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
@@ -3959,12 +3821,12 @@
 "Eine terminierte Buchung mit dem Namen »%s« existiert bereits. Sind Sie "
 "sicher, dass die aktuelle den gleichen Namen erhalten soll?"
 
-#: ../src/gnome/dialog-sx-editor.c:770
+#: ../src/gnome/dialog-sx-editor.c:769
 msgid "Scheduled Transactions with variables cannot be automatically created."
 msgstr ""
 "Terminierte Buchungen mit Variablen können nicht automatisch erstellt werden."
 
-#: ../src/gnome/dialog-sx-editor.c:779
+#: ../src/gnome/dialog-sx-editor.c:778
 msgid ""
 "Scheduled Transactions without a template transaction cannot be "
 "automatically created."
@@ -3972,15 +3834,15 @@
 "Terminierte Buchungen ohne Buchungsvorlage können nicht automatisch erstellt "
 "werden."
 
-#: ../src/gnome/dialog-sx-editor.c:793
+#: ../src/gnome/dialog-sx-editor.c:792
 msgid "Please provide a valid end selection."
 msgstr "Bitte geben Sie ein gültiges Enddatum ein."
 
-#: ../src/gnome/dialog-sx-editor.c:809
+#: ../src/gnome/dialog-sx-editor.c:808
 msgid "There must be some number of occurrences."
 msgstr "Es muss eine Anzahl des Auftretens geben."
 
-#: ../src/gnome/dialog-sx-editor.c:817
+#: ../src/gnome/dialog-sx-editor.c:816
 #, c-format
 msgid ""
 "The number of remaining occurrences (%d) is greater than the number of total "
@@ -3989,7 +3851,7 @@
 "Die Zahl des verbleibenden Auftretens (%d) ist größer als die Zahl des "
 "totalen Auftretens (%d)."
 
-#: ../src/gnome/dialog-sx-editor.c:848
+#: ../src/gnome/dialog-sx-editor.c:847
 msgid ""
 "You have attempted to create a Scheduled Transaction which will never run. "
 "Do you really want to do this?"
@@ -3997,18 +3859,18 @@
 "Sie versuchen gerade, eine Terminierte Buchung zu erstellen, die nie "
 "auftritt. Wollen Sie wirklich fortsetzen?"
 
-#: ../src/gnome/dialog-sx-editor.c:1342
+#: ../src/gnome/dialog-sx-editor.c:1332
 msgid "(never)"
 msgstr "(niemals)"
 
-#: ../src/gnome/dialog-sx-editor.c:1493
+#: ../src/gnome/dialog-sx-editor.c:1483
 msgid ""
 "The current template transaction has been changed. Would you like to record "
 "the changes?"
 msgstr ""
 "Die aktuelle Buchungsvorlage wurde verändert. Soll sie gespeichert werden?"
 
-#: ../src/gnome/dialog-sx-editor.c:1726
+#: ../src/gnome/dialog-sx-editor.c:1716
 #: ../src/gnome/gnc-plugin-page-sx-list.c:197
 msgid "Scheduled Transactions"
 msgstr "Terminierte Buchungen"
@@ -4247,44 +4109,44 @@
 msgid "Loan"
 msgstr "Darlehen"
 
-#: ../src/gnome/druid-loan.c:1041
+#: ../src/gnome/druid-loan.c:1044
 msgid "Are you sure you want to cancel the Mortgage/Loan Setup Druid?"
 msgstr "Wollen Sie den Darlehen-Assistent wirklich abbrechen?"
 
-#: ../src/gnome/druid-loan.c:1160
+#: ../src/gnome/druid-loan.c:1163
 msgid "Please select a valid loan account."
 msgstr "Sie müssen ein gültiges Darlehen-Konto auswählen."
 
-#: ../src/gnome/druid-loan.c:1247
+#: ../src/gnome/druid-loan.c:1250
 msgid "Please select a valid Escrow Account."
 msgstr "Sie müssen ein gültiges Treuhand-Konto auswählen."
 
-#: ../src/gnome/druid-loan.c:1313 ../src/gnome/druid-loan.c:1532
+#: ../src/gnome/druid-loan.c:1316 ../src/gnome/druid-loan.c:1535
 msgid "Please select a valid \"from\" account."
 msgstr "Sie müssen ein gültiges Herkunftskonto angeben."
 
-#: ../src/gnome/druid-loan.c:1320 ../src/gnome/druid-loan.c:1541
+#: ../src/gnome/druid-loan.c:1323 ../src/gnome/druid-loan.c:1544
 msgid "Please select a valid \"to\" account."
 msgstr "Sie müssen ein gültiges Zielkonto angeben."
 
-#: ../src/gnome/druid-loan.c:1327
+#: ../src/gnome/druid-loan.c:1330
 msgid "Please select a valid \"interest\" account."
 msgstr "Sie müssen ein gültiges Zinskonto angeben."
 
 #. Translators: %s is "Taxes", or "Insurance", or similar
-#: ../src/gnome/druid-loan.c:1440
+#: ../src/gnome/druid-loan.c:1443
 #, c-format
 msgid "Payment: \"%s\""
 msgstr "Zahlung: »%s«"
 
-#: ../src/gnome/druid-loan.c:1798 ../src/gnome/druid-loan.c:2371
+#: ../src/gnome/druid-loan.c:1801 ../src/gnome/druid-loan.c:2374
 msgid "Principal"
 msgstr "Endbetrag Kapital"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-#: ../src/gnome/druid-loan.c:1804 ../src/gnome/druid-loan.c:2392
+#: ../src/gnome/druid-loan.c:1807 ../src/gnome/druid-loan.c:2395
 #: ../src/import-export/qif/qif-defaults.c:130
 #: ../src/register/ledger-core/split-register.c:2034
 #: ../intl-scm/guile-strings.c:5746 ../intl-scm/guile-strings.c:5768
@@ -4292,7 +4154,7 @@
 msgid "Interest"
 msgstr "Zinsen"
 
-#: ../src/gnome/druid-loan.c:2272
+#: ../src/gnome/druid-loan.c:2275
 msgid "Escrow "
 msgstr "Treuhand "
 
@@ -7358,7 +7220,7 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:218
 #: ../src/gnome/gnc-plugin-page-budget.c:164 ../src/gnome/lot-viewer.c:434
-#: ../src/gnome-utils/gnc-file.c:96 ../src/gnome-utils/gnc-file.c:851
+#: ../src/gnome-utils/gnc-file.c:96 ../src/gnome-utils/gnc-file.c:848
 #: ../src/gnome/window-reconcile.c:1572
 msgid "Open"
 msgstr "Öffnen"
@@ -10088,7 +9950,7 @@
 
 #. try to load once again
 #: ../src/gnome-utils/druid-gnc-xml-import.c:705
-#: ../src/gnome-utils/gnc-file.c:755 ../src/gnome-utils/gnc-file.c:767
+#: ../src/gnome-utils/gnc-file.c:752 ../src/gnome-utils/gnc-file.c:764
 msgid "Reading file..."
 msgstr "Datei wird gelesen..."
 
@@ -10101,7 +9963,7 @@
 msgstr "Beim Verarbeiten der Datei ist ein Fehler aufgetreten."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:755
-#: ../src/gnome-utils/gnc-file.c:982
+#: ../src/gnome-utils/gnc-file.c:979
 msgid "Writing file..."
 msgstr "Datei wird geschrieben..."
 
@@ -11612,11 +11474,11 @@
 msgid "_Import"
 msgstr "_Importieren"
 
-#: ../src/gnome-utils/gnc-file.c:102 ../src/gnome-utils/gnc-file.c:255
+#: ../src/gnome-utils/gnc-file.c:102 ../src/gnome-utils/gnc-file.c:254
 msgid "Import"
 msgstr "Import"
 
-#: ../src/gnome-utils/gnc-file.c:108 ../src/gnome-utils/gnc-file.c:1030
+#: ../src/gnome-utils/gnc-file.c:108 ../src/gnome-utils/gnc-file.c:1027
 msgid "Save"
 msgstr "Speichern"
 
@@ -11624,8 +11486,8 @@
 msgid "_Export"
 msgstr "E_xportieren"
 
-#: ../src/gnome-utils/gnc-file.c:115 ../src/gnome-utils/gnc-file.c:271
-#: ../src/gnome-utils/gnc-file.c:888
+#: ../src/gnome-utils/gnc-file.c:115 ../src/gnome-utils/gnc-file.c:270
+#: ../src/gnome-utils/gnc-file.c:885
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:999
 msgid "Export"
 msgstr "Exportieren"
@@ -11634,43 +11496,42 @@
 msgid "All files"
 msgstr "Alle Dateien"
 
-#. Just in case
-#: ../src/gnome-utils/gnc-file.c:195
+#: ../src/gnome-utils/gnc-file.c:194
 #: ../src/import-export/hbci/druid-hbci-utils.c:153
 #: ../src/import-export/hbci/druid-hbci-utils.c:167
 msgid "(null)"
 msgstr "(keine)"
 
-#: ../src/gnome-utils/gnc-file.c:204
+#: ../src/gnome-utils/gnc-file.c:203
 #, c-format
 msgid "No suitable backend was found for %s."
 msgstr "Kein passendes Dateimodul wurde gefunden für %s."
 
-#: ../src/gnome-utils/gnc-file.c:209
+#: ../src/gnome-utils/gnc-file.c:208
 #, c-format
 msgid "The URL %s is not supported by this version of GnuCash."
 msgstr "Die URL »%s« kann von dieser GnuCash Version nicht verarbeitet werden."
 
-#: ../src/gnome-utils/gnc-file.c:214
+#: ../src/gnome-utils/gnc-file.c:213
 #, c-format
 msgid "Can't parse the URL %s."
 msgstr "Folgende URL konnte nicht verarbeitet werden: %s"
 
-#: ../src/gnome-utils/gnc-file.c:219
+#: ../src/gnome-utils/gnc-file.c:218
 #, c-format
 msgid "Can't connect to %s. The host, username or password were incorrect."
 msgstr ""
 "Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Der Rechnername, "
 "Benutzername oder Passwort waren falsch."
 
-#: ../src/gnome-utils/gnc-file.c:225
+#: ../src/gnome-utils/gnc-file.c:224
 #, c-format
 msgid "Can't connect to %s. Connection was lost, unable to send data."
 msgstr ""
 "Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Verbindung "
 "verloren. Daten konnten nicht gesendet werden."
 
-#: ../src/gnome-utils/gnc-file.c:231
+#: ../src/gnome-utils/gnc-file.c:230
 msgid ""
 "This file/URL appears to be from a newer version of GnuCash. You must "
 "upgrade your version of GnuCash to work with this data."
@@ -11678,13 +11539,13 @@
 "Diese Datei scheint von einer neueren Version von GnuCash zu sein. Sie "
 "brauchen eine neuere GnuCash Version, um die Datei lesen zu können."
 
-#: ../src/gnome-utils/gnc-file.c:238
+#: ../src/gnome-utils/gnc-file.c:237
 #, c-format
 msgid "The database %s doesn't seem to exist. Do you want to create it?"
 msgstr ""
 "Die Datenbank oder Datei »%s« existiert nicht. Möchten Sie sie erstellen?"
 
-#: ../src/gnome-utils/gnc-file.c:248
+#: ../src/gnome-utils/gnc-file.c:247
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11697,7 +11558,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Öffnen der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:256
+#: ../src/gnome-utils/gnc-file.c:255
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11710,7 +11571,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Importieren der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:264
+#: ../src/gnome-utils/gnc-file.c:263
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11723,7 +11584,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Speichern der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:272
+#: ../src/gnome-utils/gnc-file.c:271
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11736,7 +11597,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Öffnen der Datei fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:295
+#: ../src/gnome-utils/gnc-file.c:294
 #, c-format
 msgid ""
 "GnuCash could not write to %s. That database may be on a read-only file "
@@ -11746,14 +11607,14 @@
 "einem schreibgeschützten Dateisystem befinden oder Sie haben keine "
 "Schreibberechtigung in das Verzeichnis. "
 
-#: ../src/gnome-utils/gnc-file.c:302
+#: ../src/gnome-utils/gnc-file.c:301
 #, c-format
 msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
 msgstr ""
 "Die Datei/URL »%s« verweist nicht auf GnuCash-Daten oder diese Daten sind "
 "fehlerhaft."
 
-#: ../src/gnome-utils/gnc-file.c:308
+#: ../src/gnome-utils/gnc-file.c:307
 #, c-format
 msgid ""
 "The server at URL %s experienced an error or encountered bad or corrupt data."
@@ -11761,19 +11622,19 @@
 "Der Server unter der URL »%s« stiess auf einen Fehler oder benutzte falsche "
 "oder fehlerhafte Daten."
 
-#: ../src/gnome-utils/gnc-file.c:314
+#: ../src/gnome-utils/gnc-file.c:313
 #, c-format
 msgid "You do not have permission to access %s."
 msgstr "Sie haben keine Zugriffsberechtigung für die Datei »%s«."
 
-#: ../src/gnome-utils/gnc-file.c:319
+#: ../src/gnome-utils/gnc-file.c:318
 #: ../src/register/register-core/formulacell.c:117
 #: ../src/register/register-core/pricecell.c:180
 #, c-format
 msgid "An error occurred while processing %s."
 msgstr "Fehler aufgetreten beim Verarbeiten von »%s«."
 
-#: ../src/gnome-utils/gnc-file.c:325
+#: ../src/gnome-utils/gnc-file.c:324
 #, c-format
 msgid ""
 "Invalid QSF Object file! The QSF object file %s failed to validate against "
@@ -11784,7 +11645,7 @@
 "verglichen mit dem QSF Objekt-Schema. Die XML-Struktur ist entweder nicht "
 "wohlgeformt oder enthält ungültige Daten."
 
-#: ../src/gnome-utils/gnc-file.c:332
+#: ../src/gnome-utils/gnc-file.c:331
 #, c-format
 msgid ""
 "Invalid QSF Map file! The QSF map file %s failed to validate against the QSF "
@@ -11795,7 +11656,7 @@
 "Format, verglichen mit dem QSF Map-Schema. Die XML-Struktur ist entweder "
 "nicht wohlgeformt oder enthält ungültige Daten."
 
-#: ../src/gnome-utils/gnc-file.c:339
+#: ../src/gnome-utils/gnc-file.c:338
 #, c-format
 msgid ""
 "The QSF Map file %s was written for a different version of QOF.  It may need "
@@ -11806,7 +11667,7 @@
 "Sie in der Dokumentation der anderen Version, ob Sie Konvertierungsschritte "
 "durchführen müssen, um sie mit dieser Version zu lesen."
 
-#: ../src/gnome-utils/gnc-file.c:346
+#: ../src/gnome-utils/gnc-file.c:345
 #, c-format
 msgid ""
 "The selected QSF map %s contains unusable data. This is usually because not "
@@ -11817,7 +11678,7 @@
 "sein, wenn nicht für alle erforderlichen Parameter für die gewünschten "
 "Objekte alle notwendigen Berechnungsformeln in der Zuordnung angegeben waren."
 
-#: ../src/gnome-utils/gnc-file.c:353
+#: ../src/gnome-utils/gnc-file.c:352
 #, c-format
 msgid ""
 "The selected QSF object file %s contains one or more invalid GUIDs. The file "
@@ -11827,14 +11688,14 @@
 "GUIDs. Die Datei kann nicht verarbeitet werden. Versuchen Sie, eine "
 "korrigierte Datei zu erhalten."
 
-#: ../src/gnome-utils/gnc-file.c:360
+#: ../src/gnome-utils/gnc-file.c:359
 #, c-format
 msgid "The selected QSF Object file %s requires a map but it was not provided."
 msgstr ""
 "Die gewählte QSF-Objekt-Datei »%s« erfordert eine QSF-Zuordnung (Map), aber "
 "es ist keine verfügbar."
 
-#: ../src/gnome-utils/gnc-file.c:366
+#: ../src/gnome-utils/gnc-file.c:365
 #, c-format
 msgid ""
 "Wrong QSF map selected. The selected map %s validates but was written for "
@@ -11846,14 +11707,14 @@
 "in dieser Zuordnung enthält nicht alle Objekte, die in der aktuellen QSF-"
 "Objekt-Datei zu finden sind."
 
-#: ../src/gnome-utils/gnc-file.c:374
+#: ../src/gnome-utils/gnc-file.c:373
 #, c-format
 msgid "The selected file %s is a QSF map and cannot be opened as a QSF object."
 msgstr ""
 "Die gewählte Datei »%s« ist eine QSF-Zuordnung (Map) und kann nicht als QSF-"
 "Objekt geöffnet werden."
 
-#: ../src/gnome-utils/gnc-file.c:380
+#: ../src/gnome-utils/gnc-file.c:379
 #, c-format
 msgid ""
 "When converting XML strings into numbers, an overflow has been detected. The "
@@ -11864,7 +11725,7 @@
 "QSF-Datei »%s« enthält ungültige Daten in einem Feld, das eine Zahl "
 "enthalten soll."
 
-#: ../src/gnome-utils/gnc-file.c:387
+#: ../src/gnome-utils/gnc-file.c:386
 #, c-format
 msgid ""
 "The QSF object file %s is valid and contains GnuCash objects. However, "
@@ -11878,42 +11739,42 @@
 "GnuCash-Buch fusioniert werden muss. Bitte öffnen Sie eine GnuCash-Datei "
 "oder erstellen eine neue, und importieren dann diese QSF-Datei."
 
-#: ../src/gnome-utils/gnc-file.c:397
+#: ../src/gnome-utils/gnc-file.c:396
 msgid "There was an error reading the file. Do you want to continue?"
 msgstr "Es gab einen Fehler beim Öffnen der Datei. Möchten Sie fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:403
+#: ../src/gnome-utils/gnc-file.c:402
 #, c-format
 msgid "There was an error parsing the file %s."
 msgstr "Beim Lesen der Datei »%s« ist ein Fehler aufgetreten."
 
-#: ../src/gnome-utils/gnc-file.c:408
+#: ../src/gnome-utils/gnc-file.c:407
 #, c-format
 msgid "The file %s is empty."
 msgstr "Die Datei »%s« ist leer."
 
-#: ../src/gnome-utils/gnc-file.c:416
+#: ../src/gnome-utils/gnc-file.c:415
 #, c-format
 msgid "The file %s could not be found."
 msgstr "Die Datei »%s« konnte nicht gefunden werden."
 
-#: ../src/gnome-utils/gnc-file.c:422
+#: ../src/gnome-utils/gnc-file.c:421
 msgid "This file is from an older version of GnuCash. Do you want to continue?"
 msgstr ""
 "Diese Datei ist von einer älteren Version von GnuCash. Möchten Sie "
 "fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:428
+#: ../src/gnome-utils/gnc-file.c:427
 #, c-format
 msgid "The file type of file %s is unknown."
 msgstr "Der Dateityp der Datei »%s« ist unbekannt."
 
-#: ../src/gnome-utils/gnc-file.c:433
+#: ../src/gnome-utils/gnc-file.c:432
 #, c-format
 msgid "Could not make a backup of the file %s"
 msgstr "Von der Datei »%s« konnte kein Backup erstellt werden."
 
-#: ../src/gnome-utils/gnc-file.c:438
+#: ../src/gnome-utils/gnc-file.c:437
 #, c-format
 msgid ""
 "Could not write to file %s.  Check that you have permission to write to this "
@@ -11923,12 +11784,12 @@
 "dass Sie Schreibberechtigung für das Verzeichnis und diese Datei haben und "
 "dass genug Platz auf dem Datenträger frei ist."
 
-#: ../src/gnome-utils/gnc-file.c:445
+#: ../src/gnome-utils/gnc-file.c:444
 #, c-format
 msgid "No read permission to read from file %s."
 msgstr "Sie haben keine Leseberechtigung für die Datei »%s«."
 
-#: ../src/gnome-utils/gnc-file.c:450
+#: ../src/gnome-utils/gnc-file.c:449
 msgid ""
 "This database is from an older version of GnuCash. Do you want to want to "
 "upgrade the database to the current version?"
@@ -11936,7 +11797,7 @@
 "Diese Datei ist von einer älteren Version von GnuCash.  Möchten Sie die "
 "Datei zur aktuellen GnuCash-Version aktualisieren?"
 
-#: ../src/gnome-utils/gnc-file.c:457
+#: ../src/gnome-utils/gnc-file.c:456
 msgid ""
 "The SQL database is in use by other users, and the upgrade cannot be "
 "performed until they logoff. If there are currently no other users, consult "
@@ -11949,32 +11810,32 @@
 "Wenn keine anderen Anwender mehr im System sind, konsultieren Sie bitte das "
 "Handbuch, um Anweisungen zum Löschen von 'dangling login sessions' zu finden."
 
-#: ../src/gnome-utils/gnc-file.c:467
+#: ../src/gnome-utils/gnc-file.c:466
 #, c-format
 msgid "An unknown I/O error (%d) occurred."
 msgstr "Ein unbekannter Eingabe/Ausgabefehler (%d) ist aufgetreten."
 
-#: ../src/gnome-utils/gnc-file.c:562
+#: ../src/gnome-utils/gnc-file.c:561
 msgid "Save changes to the file?"
 msgstr "Änderungen in Datei speichern?"
 
-#: ../src/gnome-utils/gnc-file.c:565 ../src/gnome-utils/gnc-main-window.c:999
+#: ../src/gnome-utils/gnc-file.c:564 ../src/gnome-utils/gnc-main-window.c:999
 #, c-format
 msgid "If you don't save, changes from the past %d minutes will be discarded."
 msgstr ""
 "Wenn Sie nicht speichern, gehen die Änderungen der letzten %d Minuten "
 "verloren."
 
-#: ../src/gnome-utils/gnc-file.c:579
+#: ../src/gnome-utils/gnc-file.c:578
 msgid "Continue _Without Saving"
 msgstr "Schließen _ohne zu speichern"
 
-#: ../src/gnome-utils/gnc-file.c:659
+#: ../src/gnome-utils/gnc-file.c:658
 #, c-format
 msgid "GnuCash could not obtain the lock for %s."
 msgstr "GnuCash konnte keine exklusive Schreibberechtigung für %s erreichen."
 
-#: ../src/gnome-utils/gnc-file.c:661
+#: ../src/gnome-utils/gnc-file.c:660
 msgid ""
 "That database may be in use by another user, in which case you should not "
 "open the database. What would you like to do?"
@@ -11988,7 +11849,7 @@
 "\n"
 "Was möchten Sie tun?"
 
-#: ../src/gnome-utils/gnc-file.c:664
+#: ../src/gnome-utils/gnc-file.c:663
 msgid ""
 "That database may be on a read-only file system, or you may not have write "
 "permission for the directory. If you proceed you may not be able to save any "
@@ -12003,15 +11864,15 @@
 "\n"
 "Was möchten Sie tun?"
 
-#: ../src/gnome-utils/gnc-file.c:681
+#: ../src/gnome-utils/gnc-file.c:678
 msgid "_Open Anyway"
 msgstr "Tr_otzdem öffnen"
 
-#: ../src/gnome-utils/gnc-file.c:683
+#: ../src/gnome-utils/gnc-file.c:680
 msgid "_Create New File"
 msgstr "_Neue Datei anlegen"
 
-#: ../src/gnome-utils/gnc-file.c:923 ../src/gnome-utils/gnc-file.c:1127
+#: ../src/gnome-utils/gnc-file.c:920 ../src/gnome-utils/gnc-file.c:1124
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1355
 #, c-format
 msgid "The file %s already exists. Are you sure you want to overwrite it?"
@@ -12019,12 +11880,12 @@
 "Die Datei »%s« existiert bereits. Sind Sie sicher, dass sie überschrieben "
 "werden soll?"
 
-#: ../src/gnome-utils/gnc-file.c:938
+#: ../src/gnome-utils/gnc-file.c:935
 msgid "Exporting file..."
 msgstr "Datei exportieren..."
 
 #. %s is the strerror(3) error string of the error that occurred.
-#: ../src/gnome-utils/gnc-file.c:951
+#: ../src/gnome-utils/gnc-file.c:948
 #, c-format
 msgid ""
 "There was an error saving the file.\n"
@@ -12060,7 +11921,7 @@
 msgid "The specified URL could not be loaded."
 msgstr "Die angegebene URL konnte nicht geladen werden."
 
-#: ../src/gnome-utils/gnc-html.c:507 ../src/gnome-utils/gnc-html.c:962
+#: ../src/gnome-utils/gnc-html.c:509 ../src/gnome-utils/gnc-html.c:964
 msgid ""
 "Secure HTTP access is disabled. You can enable it in the Network section of "
 "the Preferences dialog."
@@ -12069,7 +11930,7 @@
 "Sie den Netzwerk Abschnitt der Einstellungen und aktivieren die "
 "entsprechende Option."
 
-#: ../src/gnome-utils/gnc-html.c:516 ../src/gnome-utils/gnc-html.c:972
+#: ../src/gnome-utils/gnc-html.c:518 ../src/gnome-utils/gnc-html.c:974
 msgid ""
 "Network HTTP access is disabled. You can enable it in the Network section of "
 "the Preferences dialog."
@@ -12078,7 +11939,7 @@
 "Menü »Voreinstellungen«einschalten"
 
 #. %s is a URL (some location somewhere).
-#: ../src/gnome-utils/gnc-html.c:902
+#: ../src/gnome-utils/gnc-html.c:904
 #, c-format
 msgid "There was an error accessing %s."
 msgstr "Beim Zugriff auf %s ist ein Fehler aufgetreten."
@@ -12469,7 +12330,7 @@
 msgid "Version: GnuCash-%s (r%s built %s)"
 msgstr "Version: GnuCash-%s svn (Revision %s, erstellt am %s)"
 
-#: ../src/gnome-utils/gnc-splash.c:111
+#: ../src/gnome-utils/gnc-splash.c:116
 msgid "Loading..."
 msgstr "Laden..."
 
@@ -13101,7 +12962,7 @@
 msgstr "Entscheidungsschwelle für Anzeige in Zuordnung"
 
 #: ../src/import-export/generic-import.glade.h:35
-#: ../src/import-export/hbci/druid-hbci-initial.c:767
+#: ../src/import-export/hbci/druid-hbci-initial.c:770
 #: ../src/import-export/qif-import/dialog-account-picker.c:296
 #: ../src/import-export/qif-import/druid-qif-import.c:1055
 msgid "New?"
@@ -13339,29 +13200,29 @@
 msgid "The two passwords didn't match. Please try again."
 msgstr "Die beiden PINs haben nicht übereingestimmt. Bitte erneut eingeben."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:140
+#: ../src/import-export/hbci/druid-hbci-initial.c:143
 #, c-format
 msgid "%s at %s (code %s)"
 msgstr "%s bei %s (BLZ %s)"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:145
+#: ../src/import-export/hbci/druid-hbci-initial.c:148
 #, c-format
 msgid "%s at bank code %s"
 msgstr "%s bei %s"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:503
+#: ../src/import-export/hbci/druid-hbci-initial.c:506
 msgid "Choose AqBanking Backend"
 msgstr "AqBanking-Modul wählen"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:504
+#: ../src/import-export/hbci/druid-hbci-initial.c:507
 msgid "Please choose an AqBanking backend to be configured"
 msgstr "Wählen Sie das Modul von AqBanking, das Sie einrichten möchten."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:505
+#: ../src/import-export/hbci/druid-hbci-initial.c:508
 msgid "Co_nfigure"
 msgstr "_Einrichten"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:658
+#: ../src/import-export/hbci/druid-hbci-initial.c:661
 msgid ""
 "The external program \"AqBanking Setup Wizard\" failed to run successfully "
 "because the additional software \"Qt\" was not found.  Please install the "
@@ -13388,7 +13249,7 @@
 "»Schließen« und dann »Abbrechen«, um die Einrichtung des Online-Banking "
 "wieder abzubrechen."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:675
+#: ../src/import-export/hbci/druid-hbci-initial.c:678
 msgid ""
 "The external program \"AqBanking Setup Wizard\" failed to run successfully.  "
 "Online Banking can only be setup if this wizard has run successfully.  "
@@ -13401,7 +13262,7 @@
 "»AqBanking Assistent« erfolgreich aufgerufen worden ist. Bitte versuchen Sie "
 "erneut, den »AqBanking Einrichtungs-Assistent« korrekt auszuführen."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:686
+#: ../src/import-export/hbci/druid-hbci-initial.c:689
 msgid ""
 "The external program \"AqBanking Setup Wizard\" has not been found. \n"
 "\n"
@@ -13416,11 +13277,11 @@
 "dann ein Programm namens »qt3-wizard« installiert ist. Bitte kontrollieren "
 "Sie Ihre Installation der Bibliothek aqbanking."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:752
+#: ../src/import-export/hbci/druid-hbci-initial.c:755
 msgid "Online Banking Account Name"
 msgstr "Online-Banking Kontoname"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:759
+#: ../src/import-export/hbci/druid-hbci-initial.c:762
 msgid "GnuCash Account Name"
 msgstr "GnuCash Kontoname"
 
@@ -14596,7 +14457,7 @@
 "eindeutige Abkürzung an."
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1751
-msgid "Click \"Next\" to accept the information and move on."
+msgid "Click \"Forward\" to accept the information and move on."
 msgstr ""
 "Wenn Sie fertig gelesen haben, klicken Sie bitte »Vor«, um fortzufahren."
 

Modified: gnucash/branches/gda-dev/po/hu.po
===================================================================
--- gnucash/branches/gda-dev/po/hu.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/hu.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1,25 +1,23 @@
-# gnucash at 2.1@.po to @hu@
+# gnucash2.2.po to hu
 # Hungarian Tanslation of GNUCash
 # Copyright ? 2003-2006 Free Software Foundation, Inc.
 #
 # HOSSZÚ Péter <hosszu at web.de>, 2001-2003.
 # SULYOK Péter <peti at sulyok.hu>, 2003-2006.
-# Takó Kornél <takokornel at gmail.com>, 2006.
 # Kornel Tako <takokornel at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: @gnucash at 2.1.4@po\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: gnucash 2.2\n"
+"Report-Msgid-Bugs-To: takokornel at gmail.com\n"
 "POT-Creation-Date: 2007-07-10 22:05+0200\n"
-"PO-Revision-Date: 2007-06-27 10:48+0200\n"
+"PO-Revision-Date: 2007-08-16 09:42+0200\n"
 "Last-Translator: Kornel Tako <takokornel at gmail.com>\n"
-"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Country: HUNGARY\n"
 
 #: ../src/app-utils/gnc-exp-parser.c:633
 msgid "Illegal variable in expression."
@@ -31,11 +29,11 @@
 
 #: ../src/app-utils/gnc-exp-parser.c:645
 msgid "Stack overflow"
-msgstr "Stack overflow"
+msgstr "Verem túlcsordulás"
 
 #: ../src/app-utils/gnc-exp-parser.c:647
 msgid "Stack underflow"
-msgstr "Stack underflow"
+msgstr "Verem alulcsordulás"
 
 #: ../src/app-utils/gnc-exp-parser.c:649
 msgid "Undefined character"
@@ -214,11 +212,11 @@
 
 #: ../src/bin/gnucash-bin.c:221
 msgid "Enable debugging mode: increasing logging to provide deep detail."
-msgstr ""
+msgstr "Hibakereső mód engedélyezése, részletesebb naplózással."
 
 #: ../src/bin/gnucash-bin.c:224
 msgid "Enable extra/development/debugging features."
-msgstr ""
+msgstr "Extrta / fejlesztői hibajelentés engedélyezése."
 
 #: ../src/bin/gnucash-bin.c:227
 msgid ""
@@ -231,6 +229,8 @@
 "File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or "
 "\"stdout\"."
 msgstr ""
+"Log-fájl  \"/tmp/gnucash.trace\"; lehet \"stderr\" vagy "
+"\"stdout\" is."
 
 #. Translators: This is the command line option autohelp text; see popt(3)
 #: ../src/bin/gnucash-bin.c:237
@@ -280,14 +280,13 @@
 
 #: ../src/bin/gnucash-bin.c:263
 msgid "Set the prefix path for gconf queries"
-msgstr ""
+msgstr "Gconf kérések telepítési útvonala"
 
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:266
-#, fuzzy
 msgid "GCONFPATH"
-msgstr "CONFIGPATH"
+msgstr "GCONFPATH"
 
 #: ../src/bin/gnucash-bin.c:268
 msgid "Add price quotes to given GnuCash datafile"
@@ -300,10 +299,8 @@
 msgstr "FILE"
 
 #: ../src/bin/gnucash-bin.c:273
-msgid ""
-"Regular expression determining which namespace commodities will be retrieved"
-msgstr ""
-"Regular expression determining which namespace commodities will be retrieved"
+msgid "Regular expression determining which namespace commodities will be retrieved"
+msgstr "Regular expression determining which namespace commodities will be retrieved"
 
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
@@ -598,8 +595,7 @@
 msgid ""
 "This transaction needs to be assigned to a Customer.  Please choose the "
 "Customer below."
-msgstr ""
-"E tranzakciót hozzá kell rendelni egy ügyfélhez.  Válasszon ügyfelet alul."
+msgstr "E tranzakciót hozzá kell rendelni egy ügyfélhez.  Válasszon ügyfelet alul."
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:77
 msgid ""
@@ -623,8 +619,7 @@
 
 #: ../src/business/business-gnome/dialog-customer.c:289
 msgid "Discount percentage must be between 0-100 or you must leave it blank."
-msgstr ""
-"Engedmény százaléka lehet 0-100 közötti érték, vagy üresen kell hagyni."
+msgstr "Engedmény százaléka lehet 0-100 közötti érték, vagy üresen kell hagyni."
 
 #: ../src/business/business-gnome/dialog-customer.c:294
 msgid "Credit must be a positive amount or you must leave it blank."
@@ -805,8 +800,7 @@
 msgstr "Biztosan, törölni kívánja kiválasztott tételt?"
 
 #: ../src/business/business-gnome/dialog-invoice.c:497
-msgid ""
-"This entry is attached to an order and will be deleted from that as well!"
+msgid "This entry is attached to an order and will be deleted from that as well!"
 msgstr "E tételt egy megrendeléshez kapcsolódik és onnan is törlésre kerülne!"
 
 #: ../src/business/business-gnome/dialog-invoice.c:605
@@ -1382,10 +1376,12 @@
 "Days\n"
 "Proximo"
 msgstr ""
+"Nap\n"
+"Következő hónap"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:12
 msgid "De_scription:"
-msgstr "Magyarázat:"
+msgstr "Ma_gyarázat:"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:13
 msgid "Delete the current Billing Term"
@@ -1518,7 +1514,7 @@
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:6
 #: ../src/gnome-utils/glade/preferences.glade.h:88
 msgid "Number of _rows:"
-msgstr "Cellák száma:"
+msgstr "Cellák _száma:"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:7
 #: ../src/gnome/glade/sched-xact.glade.h:141
@@ -1530,7 +1526,7 @@
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:8
 msgid "Ta_x included"
-msgstr "Adót tartalmaz"
+msgstr "Ad_ót tartalmaz"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:9
 msgid ""
@@ -1568,7 +1564,7 @@
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:14
 msgid "_Days in advance:"
-msgstr "Nappal korábban:"
+msgstr "_Nappal korábban:"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:15
 msgid "_Notify when due"
@@ -1576,7 +1572,7 @@
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:16
 msgid "_Open in new window"
-msgstr "Megnyitás új ablakban"
+msgstr "_Megnyitás új ablakban"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:17
 msgid "_Tax included"
@@ -1851,8 +1847,7 @@
 msgid ""
 "The employee ID number.  If left blank a reasonable number will be chosen "
 "for you"
-msgstr ""
-"Az alkalmazottszám. Üresen hagyva egy megfelelő érték kerül kiválasztásra"
+msgstr "Az alkalmazottszám. Üresen hagyva egy megfelelő érték kerül kiválasztásra"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:22
 msgid "Username: "
@@ -1943,8 +1938,7 @@
 msgstr "Tulajdonos-információ"
 
 #: ../src/business/business-gnome/glade/job.glade.h:9
-msgid ""
-"The job ID number.  If left blank a reasonable number will be chosen for you"
+msgid "The job ID number.  If left blank a reasonable number will be chosen for you"
 msgstr ""
 "Az megbízás azonosítószáma. Üresen hagyva egy megfelelő érték kerül "
 "kiválasztásra"
@@ -2093,8 +2087,7 @@
 msgid ""
 "The vendor ID number.  If left blank a reasonable number will be chosen for "
 "you"
-msgstr ""
-"A beszállító sorszáma. Üresen hagyva megfelelő szám kerül kiválasztásra"
+msgstr "A beszállító sorszáma. Üresen hagyva megfelelő szám kerül kiválasztásra"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
@@ -2128,16 +2121,16 @@
 #: ../src/business/business-gnome/gnc-plugin-business.c:241
 #: ../intl-scm/guile-strings.c:6124 ../intl-scm/guile-strings.c:6648
 msgid "_Business"
-msgstr "Ãœzlet"
+msgstr "_Ãœzlet"
 
 #. Customer submenu
 #: ../src/business/business-gnome/gnc-plugin-business.c:151
 msgid "_Customer"
-msgstr "Ügyfél"
+msgstr "_Ügyfél"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:152
 msgid "_New Customer..."
-msgstr "Új ügyfél..."
+msgstr "_Új ügyfél..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:153
 msgid "Open the New Customer dialog"
@@ -2145,7 +2138,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:155
 msgid "_Find Customer..."
-msgstr "Ügy_felek keresése..."
+msgstr "_Ügyfelek keresése..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:156
 msgid "Open the Find Customer dialog"
@@ -2153,7 +2146,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:158
 msgid "New _Invoice..."
-msgstr "Új számla..."
+msgstr "Új _számla..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:159
 msgid "Open the New Invoice dialog"
@@ -2161,7 +2154,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:161
 msgid "Find In_voice..."
-msgstr "Számla keresése..."
+msgstr "Számla _keresése..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:162
 msgid "Open the Find Invoice dialog"
@@ -2191,7 +2184,7 @@
 #: ../src/business/business-gnome/gnc-plugin-business.c:194
 #: ../src/business/business-gnome/gnc-plugin-business.c:212
 msgid "_Process Payment..."
-msgstr "Kifizetés lebonyolítása..."
+msgstr "_Kifizetés lebonyolítása..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:171
 #: ../src/business/business-gnome/gnc-plugin-business.c:195
@@ -2202,11 +2195,11 @@
 #. Vendor submenu
 #: ../src/business/business-gnome/gnc-plugin-business.c:175
 msgid "_Vendor"
-msgstr "Beszállító"
+msgstr "_Beszállító"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:176
 msgid "_New Vendor..."
-msgstr "Új beszállító..."
+msgstr "_Új beszállító..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:177
 msgid "Open the New Vendor dialog"
@@ -2214,7 +2207,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:179
 msgid "_Find Vendor..."
-msgstr "Beszállító keresése..."
+msgstr "Beszállító _keresése..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:180
 msgid "Open the Find Vendor dialog"
@@ -2222,7 +2215,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:182
 msgid "New _Bill..."
-msgstr "Új számla..."
+msgstr "Új _számla..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:183
 msgid "Open the New Bill dialog"
@@ -2239,7 +2232,7 @@
 #. Employee submenu
 #: ../src/business/business-gnome/gnc-plugin-business.c:199
 msgid "_Employee"
-msgstr "Munkatárs"
+msgstr "_Munkatárs"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:200
 msgid "_New Employee..."
@@ -2251,7 +2244,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:203
 msgid "_Find Employee..."
-msgstr "Munkatárs keresése..."
+msgstr "_Munkatárs keresése..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:204
 msgid "Open the Find Employee dialog"
@@ -2259,7 +2252,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:206
 msgid "New _Expense Voucher..."
-msgstr "Új kiadási bizonylat..."
+msgstr "Új _kiadási bizonylat..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:207
 msgid "Open the New Expense Voucher dialog"
@@ -2267,7 +2260,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:209
 msgid "Find Expense _Voucher..."
-msgstr "Kiadási bizonylat keresése..."
+msgstr "_Kiadási bizonylat keresése..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:210
 msgid "Open the Find Expense Voucher dialog"
@@ -2284,7 +2277,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:220
 msgid "_Billing Terms Editor"
-msgstr "Fizetésifeltétel-szerkesztő"
+msgstr "_Fizetésifeltétel-szerkesztő"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:221
 msgid "View and edit the list of Billing Terms"
@@ -2304,7 +2297,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:227
 msgid "QSF _Invoice..."
-msgstr "QSF számla..."
+msgstr "QSF _számla..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:228
 msgid "Export one or more invoices to QSF"
@@ -2312,7 +2305,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:230
 msgid "QSF _Customer..."
-msgstr "QSF ügyfél..."
+msgstr "QSF _ügyfél..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:231
 msgid "Export one or more customers to QSF"
@@ -2320,7 +2313,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:233
 msgid "QSF _Vendor..."
-msgstr "QSF beszállító..."
+msgstr "QSF _beszállító..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:234
 msgid "Export one or more vendors to QSF"
@@ -2328,7 +2321,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:236
 msgid "QSF _Employee..."
-msgstr "QSF munkatárs..."
+msgstr "QSF _munkatárs..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:237
 msgid "Export one or more employees to QSF"
@@ -2392,7 +2385,7 @@
 #. File menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:98
 msgid "New _Invoice"
-msgstr "Új számla"
+msgstr "Új _számla"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:99
 msgid "Create a new invoice"
@@ -2419,7 +2412,7 @@
 #. Edit menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:109
 msgid "_Cut"
-msgstr "Kivágás"
+msgstr "_Kivágás"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:112
 msgid "Copy"
@@ -2430,7 +2423,7 @@
 #: ../src/gnome-utils/gnc-main-window.c:257
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:962
 msgid "_Paste"
-msgstr "Beillesztés"
+msgstr "_Beillesztés"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:118
 msgid "_Edit Invoice"
@@ -2442,7 +2435,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:121
 msgid "_Post Invoice"
-msgstr "Számla könyvelése"
+msgstr "_Számla könyvelése"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:122
 msgid "Post this Invoice to your Chart of Accounts"
@@ -2450,7 +2443,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:124
 msgid "_Unpost Invoice"
-msgstr "Számla könyvelésének visszavonása"
+msgstr "Számla könyvelésének _visszavonása"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:125
 msgid "Unpost this Invoice and make it editable"
@@ -2469,7 +2462,7 @@
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:132
 #: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2010
 msgid "_Cancel"
-msgstr "Mégsem"
+msgstr "_Mégsem"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:133
 msgid "Cancel the current entry"
@@ -2480,7 +2473,7 @@
 #: ../src/gnome/gnc-plugin-page-sx-list.c:124
 #: ../src/gnome/window-reconcile.c:2038
 msgid "_Delete"
-msgstr "Törlés"
+msgstr "_Törlés"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:136
 msgid "Delete the current entry"
@@ -2489,7 +2482,7 @@
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:138
 #: ../src/gnome/glade/register.glade.h:78
 msgid "_Blank"
-msgstr "Ãœres"
+msgstr "_Ãœres"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:139
 msgid "Move to the blank entry at the bottom of the Invoice"
@@ -2506,7 +2499,7 @@
 #. Business menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:146
 msgid "_Pay Invoice"
-msgstr "Számla kifizetése"
+msgstr "S_zámla kifizetése"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:147
 msgid "Enter a payment for the owner of this Invoice"
@@ -2538,18 +2531,18 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:162
 msgid "_Quantity"
-msgstr "Mennyiség"
+msgstr "_Mennyiség"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:163
 #: ../src/register/ledger-core/split-register.c:1717
 #: ../src/register/ledger-core/split-register.c:1719
 msgid "_Price"
-msgstr "Ár"
+msgstr "_Ár"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:164
 #: ../src/gnome/glade/register.glade.h:18
 msgid "Descri_ption"
-msgstr "Magyarázat"
+msgstr "M_agyarázat"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:193
 #: ../src/gnome/glade/register.glade.h:25
@@ -3048,8 +3041,7 @@
 msgstr "Számlázható?"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:528
-msgid ""
-"Enter the income/expense account for the Entry, or choose one from the list"
+msgid "Enter the income/expense account for the Entry, or choose one from the list"
 msgstr ""
 "Adja meg a bevétel/költség folyószámlát a tételhez, vagy válasszon egyet a "
 "listából"
@@ -3159,8 +3151,7 @@
 msgid ""
 "You must provide a unique name for this Tax Table. Your choice \"%s\" is "
 "already in use."
-msgstr ""
-"Egyedi nevet kell adni az adótáblázatnak. Ez \"%s\" már használatban van."
+msgstr "Egyedi nevet kell adni az adótáblázatnak. Ez \"%s\" már használatban van."
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:144
 msgid "You must choose a Tax Account."
@@ -3209,6 +3200,8 @@
 "Value $\n"
 "Percent %"
 msgstr ""
+"Érték $\n"
+"Százalék %"
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:9
 msgid "_Account:"
@@ -3224,19 +3217,20 @@
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:12
 msgid "_Value: "
-msgstr "Érték: "
+msgstr "_Érték: "
 
 #: ../src/core-utils/gnc-gkeyfile-utils.c:111
 #, c-format
+#, fuzzy
 msgid "Value '%s' cannot be interpreted as a float number."
-msgstr ""
+msgstr "A(z) '%s' érték nem értelmezhető lebegő számként."
 
 #: ../src/core-utils/gnc-gkeyfile-utils.c:154
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has a value that cannot be "
 "interpreted."
-msgstr ""
+msgstr "Kulcs fájl '%s' kulcsot tartalmaz a(z) '%s' csoportban, melynek értéke nem értelmezhető."
 
 #. src/report/report-system/report-utilities.scm
 #: ../src/engine/Account.c:3634 ../src/import-export/hbci/gnc-hbci-utils.c:900
@@ -3301,8 +3295,7 @@
 msgid ""
 "Realized Gains or Losses from Commodity or Trading Accounts that haven't "
 "been recorded elsewhere."
-msgstr ""
-"Realizált nyereség/veszteség más számlákról melyek máshol nicsenek elmentve."
+msgstr "Realizált nyereség/veszteség más számlákról melyek máshol nicsenek elmentve."
 
 #: ../src/engine/cap-gains.c:585
 msgid "Lot"
@@ -3542,7 +3535,7 @@
 #: ../src/engine/Recurrence.c:463
 #, c-format
 msgid "last %s"
-msgstr ""
+msgstr "Utolsó %s"
 
 #: ../src/engine/Recurrence.c:500 ../src/gnome/glade/fincalc.glade.h:42
 msgid "Semi-monthly"
@@ -3620,8 +3613,7 @@
 msgid ""
 "That commodity is currently used by at least one of your accounts. You may "
 "not delete it."
-msgstr ""
-"Ez a pénznem jelenleg használatban van legalább egy számlán. Nem törölhető."
+msgstr "Ez a pénznem jelenleg használatban van legalább egy számlán. Nem törölhető."
 
 #: ../src/gnome/dialog-commodities.c:149
 msgid ""
@@ -3799,11 +3791,11 @@
 
 #: ../src/gnome/dialog-print-check.c:551
 msgid "Cannot save check format file."
-msgstr ""
+msgstr "Csekk űrlap fájlt nem lehet menteni."
 
 #: ../src/gnome/dialog-print-check.c:1083
 msgid "There is a duplicate check format file."
-msgstr ""
+msgstr "Csekk-űrlap fájl másolata létezik."
 
 #. Translators: %1$s is the type of the first check
 #. * format (user defined or application defined); %2$s
@@ -3815,7 +3807,7 @@
 msgid ""
 "The guids in the %s check format file '%s' and the %s check format file '%s' "
 "match."
-msgstr ""
+msgstr "A GUID-k, a %s csekk-űrlap fájlban '%s' és a %s csekk-űrlap fájl '%s' egyeznek."
 
 #. Translators: This is a directory name. It may be presented to
 #. * the user to indicate that some data file was defined by the
@@ -3856,12 +3848,12 @@
 #: ../src/gnome/dialog-sx-editor.c:188 ../src/gnome/glade/register.glade.h:101
 #: ../src/gnome-utils/gnc-main-window.c:222
 msgid "_View"
-msgstr "Nézet"
+msgstr "_Nézet"
 
 #: ../src/gnome/dialog-sx-editor.c:189 ../src/gnome/glade/register.glade.h:74
 #: ../src/gnome-utils/gnc-main-window.c:223
 msgid "_Actions"
-msgstr "Műveletek"
+msgstr "M_űveletek"
 
 #: ../src/gnome/dialog-sx-editor.c:219
 msgid "This SX has changed; are you sure you want to cancel?"
@@ -3904,8 +3896,7 @@
 
 #: ../src/gnome/dialog-sx-editor.c:770
 msgid "Scheduled Transactions with variables cannot be automatically created."
-msgstr ""
-"Nem lehet automatikusan létrehozni időzített tranzakciókat változókkal."
+msgstr "Nem lehet automatikusan létrehozni időzített tranzakciókat változókkal."
 
 #: ../src/gnome/dialog-sx-editor.c:779
 msgid ""
@@ -3948,8 +3939,7 @@
 msgid ""
 "The current template transaction has been changed. Would you like to record "
 "the changes?"
-msgstr ""
-"A jelenlegi tranzakciósablon megváltozott. Kívánja rögzíteni a változásokat?"
+msgstr "A jelenlegi tranzakciósablon megváltozott. Kívánja rögzíteni a változásokat?"
 
 #: ../src/gnome/dialog-sx-editor.c:1726
 #: ../src/gnome/gnc-plugin-page-sx-list.c:197
@@ -3960,8 +3950,7 @@
 msgid ""
 "The Scheduled Transaction is unbalanced. You are strongly encouraged to "
 "correct this situation."
-msgstr ""
-"Az ütemezett tranzakció kiegyenlítetlen. Erősen ajánlott a korrigálása."
+msgstr "Az ütemezett tranzakció kiegyenlítetlen. Erősen ajánlott a korrigálása."
 
 #: ../src/gnome/dialog-sx-from-trans.c:771
 msgid ""
@@ -3972,38 +3961,32 @@
 "tranzakcióból. Előbb fejezze be a tranzakció szerkesztését."
 
 #: ../src/gnome/dialog-sx-since-last-run.c:374
-#, fuzzy
 msgid "Ignored"
-msgstr "Kihagy"
+msgstr "Kihagyott"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:375
-#, fuzzy
 msgid "Postponed"
-msgstr "Halaszt"
+msgstr "Halasztott"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:376
-#, fuzzy
 msgid "To-Create"
 msgstr "Létrehozás"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:377
-#, fuzzy
 msgid "Reminder"
-msgstr "Folyószámla-könyv"
+msgstr "Emlékeztető"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:378
-#, fuzzy
 msgid "Created"
-msgstr "Létrehozás"
+msgstr "Létrehozva"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:441
-#, fuzzy
 msgid "Never"
-msgstr "Végtelen"
+msgstr "Soha"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:511
 msgid "(Need Value)"
-msgstr ""
+msgstr "(Érték)"
 
 #. Translators: %d is the number of transactions. This is a
 #. ngettext(3) message.
@@ -4021,9 +4004,8 @@
 "létrehozva)"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:929
-#, fuzzy
 msgid "Transaction"
-msgstr "Tra_nzakciók"
+msgstr "Tranzakciók"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:945
 #: ../src/gnome/glade/register.glade.h:70
@@ -4116,9 +4098,9 @@
 
 #. Translators: '%s' is the name of the selected account hierarchy template.
 #: ../src/gnome/druid-hierarchy.c:486
-#, fuzzy, c-format
+#, c-format
 msgid "Accounts in '%s'"
-msgstr "<b>Folyószámlák '%s'-ban</b>"
+msgstr "<b>Számlák '%s'-ban</b>"
 
 #: ../src/gnome/druid-hierarchy.c:505
 msgid "Accounts in Category"
@@ -4148,24 +4130,24 @@
 
 #: ../src/gnome/druid-loan.c:161
 msgid "Tax Payment"
-msgstr ""
+msgstr "Adófizetés"
 
 #: ../src/gnome/druid-loan.c:162
 msgid "Insurance"
-msgstr ""
+msgstr "Kamat"
 
 #: ../src/gnome/druid-loan.c:162
 msgid "Insurance Payment"
-msgstr ""
+msgstr "Kamatfizetés"
 
 #. Translators: PMI stands for Private Mortgage Insurance.
 #: ../src/gnome/druid-loan.c:164
 msgid "PMI"
-msgstr ""
+msgstr "MJB"
 
 #: ../src/gnome/druid-loan.c:164
 msgid "PMI Payment"
-msgstr ""
+msgstr "MJB Fizetés"
 
 #: ../src/gnome/druid-loan.c:165
 msgid "Other Expense"
@@ -4173,7 +4155,7 @@
 
 #: ../src/gnome/druid-loan.c:165
 msgid "Miscellaneous Payment"
-msgstr ""
+msgstr "Egyéb kifizetés"
 
 #. Add payment checkbox.
 #. Translators: %s is "Taxes",
@@ -4248,14 +4230,13 @@
 
 #: ../src/gnome/druid-merge.c:170
 #, c-format
-msgid ""
-"Error: Please resolve all %d conflicts before trying to commit the data."
+msgid "Error: Please resolve all %d conflicts before trying to commit the data."
 msgstr "Hiba: Oldja fel mind a %d ütközést, mielőtt jóváhagyja az adatokat."
 
 #: ../src/gnome/druid-merge.c:225
 #, c-format
 msgid "Error: the Commit operation failed, error code %d."
-msgstr "Hiba: a jóváhagyási művelet sikertelen."
+msgstr "Hiba: a jóváhagyási művelet sikertelen. Hibakód %d."
 
 #. Translators: %i is the number of conflicts. This is a
 #. ngettext(3) message.
@@ -4399,7 +4380,7 @@
 
 #: ../src/gnome/glade/account.glade.h:13
 msgid "<b>_Parent Account</b>"
-msgstr "<b>Fő számla</b>"
+msgstr "<b>_Szülő számla</b>"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
@@ -4497,7 +4478,7 @@
 
 #: ../src/gnome/glade/account.glade.h:26
 msgid "H_idden"
-msgstr "Rejtett"
+msgstr "Re_jtett"
 
 #: ../src/gnome/glade/account.glade.h:27
 msgid "Hide accounts which have a zero total value."
@@ -4546,7 +4527,7 @@
 
 #: ../src/gnome/glade/account.glade.h:36
 msgid "New Account (not implemented)"
-msgstr ""
+msgstr "Új Számla (nem megvalósított)"
 
 #: ../src/gnome/glade/account.glade.h:37
 msgid "New Account Hierarchy Setup"
@@ -4554,7 +4535,7 @@
 
 #: ../src/gnome/glade/account.glade.h:38
 msgid "No_tes:"
-msgstr "Megjegyzések:"
+msgstr "Me_gjegyzések:"
 
 #: ../src/gnome/glade/account.glade.h:39
 msgid ""
@@ -4585,7 +4566,7 @@
 
 #: ../src/gnome/glade/account.glade.h:43
 msgid "Placeholde_r"
-msgstr "Töltelék"
+msgstr "T_öltelék"
 
 #: ../src/gnome/glade/account.glade.h:44
 msgid "Please choose the currency to use for new accounts."
@@ -4642,7 +4623,7 @@
 
 #: ../src/gnome/glade/account.glade.h:56
 msgid "Show _hidden accounts"
-msgstr "Rejtett számlák megjelenítése"
+msgstr "Rej_tett számlák megjelenítése"
 
 #: ../src/gnome/glade/account.glade.h:57
 msgid "Show _zero total accounts"
@@ -4658,7 +4639,7 @@
 
 #: ../src/gnome/glade/account.glade.h:60
 msgid "Ta_x related"
-msgstr "Adóvonatkozású"
+msgstr "A_dóvonatkozású"
 
 #: ../src/gnome/glade/account.glade.h:61
 msgid ""
@@ -4671,8 +4652,7 @@
 
 #: ../src/gnome/glade/account.glade.h:62
 msgid "This account contains read-only transactions which may not be deleted."
-msgstr ""
-"A számla tartalmaz csak olvasható tranzakciókat is, amiket nem törölhet."
+msgstr "A számla tartalmaz csak olvasható tranzakciókat is, amiket nem törölhet."
 
 #: ../src/gnome/glade/account.glade.h:63
 msgid ""
@@ -4720,6 +4700,14 @@
 "1/100000\n"
 "1/1000000"
 msgstr ""
+"Alkalmazandó egység\n"
+"1\n"
+"1/10\n"
+"1/100\n"
+"1/1000\n"
+"1/10000\n"
+"1/100000\n"
+"1/1000000"
 
 #: ../src/gnome/glade/account.glade.h:77
 msgid "_Account code:"
@@ -4727,7 +4715,7 @@
 
 #: ../src/gnome/glade/account.glade.h:78
 msgid "_Balance:"
-msgstr "Egyenleg:"
+msgstr "_Egyenleg:"
 
 #: ../src/gnome/glade/account.glade.h:79 ../src/gnome/glade/price.glade.h:21
 #: ../src/gnome/glade/print.glade.h:27 ../src/gnome/glade/register.glade.h:81
@@ -4738,11 +4726,11 @@
 
 #: ../src/gnome/glade/account.glade.h:80
 msgid "_Default"
-msgstr "Alapértelmezés"
+msgstr "_Alapértelmezés"
 
 #: ../src/gnome/glade/account.glade.h:81
 msgid "_Description:"
-msgstr "Magyarázat:"
+msgstr "_Magyarázat:"
 
 #: ../src/gnome/glade/account.glade.h:82
 msgid "_Move to:"
@@ -4750,7 +4738,7 @@
 
 #: ../src/gnome/glade/account.glade.h:83
 msgid "_Renumber"
-msgstr "Újra számozás"
+msgstr "_Újra számozás"
 
 #: ../src/gnome/glade/account.glade.h:84
 #: ../src/gnome-utils/dialog-commodity.c:270
@@ -4760,7 +4748,7 @@
 #: ../src/gnome/glade/account.glade.h:85
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:6
 msgid "_Select All"
-msgstr "Mindent kijelöl"
+msgstr "M_indent kijelöl"
 
 #: ../src/gnome/glade/account.glade.h:86
 msgid "_Select transfer account"
@@ -4768,7 +4756,7 @@
 
 #: ../src/gnome/glade/account.glade.h:87
 msgid "_Use equity 'Opening Balances' account"
-msgstr "Saját tőke számla használata nyitóegyenlegnek "
+msgstr "_Saját tőke számla használata nyitóegyenlegnek "
 
 #: ../src/gnome/glade/acctperiod.glade.h:1
 msgid "Book Closing Dates"
@@ -4979,8 +4967,7 @@
 msgstr "Jövőbeli dátumokat nem támogatottak"
 
 #: ../src/gnome/glade/chart-export.glade.h:4
-msgid ""
-"Select the date to use and click Export to choose the filename and location."
+msgid "Select the date to use and click Export to choose the filename and location."
 msgstr ""
 "Válasszon dátumot és kattintson az Exportra, hogy fájlnevet és helyet "
 "válasszon."
@@ -5188,7 +5175,7 @@
 
 #: ../src/gnome/glade/fincalc.glade.h:49
 msgid "_Payments:"
-msgstr "Fizetések:"
+msgstr "_Fizetések:"
 
 #: ../src/gnome/glade/fincalc.glade.h:50
 msgid "total"
@@ -5204,11 +5191,11 @@
 
 #: ../src/gnome/glade/lots.glade.h:3
 msgid "<b>_Notes</b>"
-msgstr "<b>Megjegyzések</b>"
+msgstr "<b>_Megjegyzések</b>"
 
 #: ../src/gnome/glade/lots.glade.h:4
 msgid "<b>_Title</b>"
-msgstr "<b>Cím</b>"
+msgstr "<b>_Cím</b>"
 
 #: ../src/gnome/glade/lots.glade.h:5
 msgid "A summary of all of the transactions in the selected lot"
@@ -5390,8 +5377,7 @@
 msgstr "<span size=\"larger\" weight=\"bold\">Üdvözli a GnuCash!</span>"
 
 #: ../src/gnome/glade/newuser.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
+msgid "<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Üdvözlő ablak megjelenítése ismét?</"
 "span>"
@@ -5428,7 +5414,7 @@
 
 #: ../src/gnome/glade/newuser.glade.h:7
 msgid "_Open the new user tutorial"
-msgstr "Az új felhasználói tankönyv megnyitása"
+msgstr "_Új felhasználói tankönyv megnyitása"
 
 #: ../src/gnome/glade/price.glade.h:1
 msgid "Add a new price."
@@ -5451,7 +5437,7 @@
 #: ../src/gnome/glade/price.glade.h:7
 #: ../src/gnome-utils/dialog-commodity.c:279
 msgid "Cu_rrency:"
-msgstr "Pénznem:"
+msgstr "Pé_nznem:"
 
 #: ../src/gnome/glade/price.glade.h:8
 msgid "Delete _last price for a stock"
@@ -5459,7 +5445,7 @@
 
 #: ../src/gnome/glade/price.glade.h:9
 msgid "Delete _manually entered prices"
-msgstr "Kézi bevitelű árak törlése"
+msgstr "Kézi _bevitelű árak törlése"
 
 #: ../src/gnome/glade/price.glade.h:10
 msgid "Delete all stock prices based upon the critera below:"
@@ -5471,7 +5457,7 @@
 
 #: ../src/gnome/glade/price.glade.h:12
 msgid "Get _Quotes"
-msgstr "Árfolyamadatok lehívása"
+msgstr "_Árfolyamadatok lehívása"
 
 #: ../src/gnome/glade/price.glade.h:13
 msgid "Get new online quotes for stock accounts."
@@ -5517,20 +5503,20 @@
 
 #: ../src/gnome/glade/price.glade.h:23
 msgid "_Price:"
-msgstr "Ár:"
+msgstr "_Ár:"
 
 #: ../src/gnome/glade/price.glade.h:24
 #: ../src/gnome-utils/dialog-commodity.c:274
 msgid "_Security:"
-msgstr "Értékpapír:"
+msgstr "_Értékpapír:"
 
 #: ../src/gnome/glade/print.glade.h:1
 msgid "Amount (_numbers):"
-msgstr "Összeg (számokkal):"
+msgstr "Összeg (_számokkal):"
 
 #: ../src/gnome/glade/print.glade.h:2
 msgid "Amount (_words):"
-msgstr "Összeg (szó):"
+msgstr "Összeg (_szó):"
 
 #: ../src/gnome/glade/print.glade.h:3
 msgid "Check _format:"
@@ -5546,7 +5532,7 @@
 
 #: ../src/gnome/glade/print.glade.h:6
 msgid "Degrees"
-msgstr ""
+msgstr "Fokozat"
 
 #: ../src/gnome/glade/print.glade.h:7
 msgid ""
@@ -5589,15 +5575,15 @@
 
 #: ../src/gnome/glade/print.glade.h:19
 msgid "Save Custom Check Format"
-msgstr ""
+msgstr "Saját csekk-űrlap mentése"
 
 #: ../src/gnome/glade/print.glade.h:20
 msgid "The origin point is the lower left-hand corner of the page."
-msgstr ""
+msgstr "Kiinduló pont, az oldal bal alsó sarka."
 
 #: ../src/gnome/glade/print.glade.h:21
 msgid "The origin point is the upper left-hand corner of the page."
-msgstr ""
+msgstr "Kiinduló pont, az oldal bal felső sarka."
 
 #: ../src/gnome/glade/print.glade.h:22
 msgid ""
@@ -5625,7 +5611,7 @@
 
 #: ../src/gnome/glade/print.glade.h:30
 msgid "_Save format"
-msgstr ""
+msgstr "_Formátum mentése"
 
 #: ../src/gnome/glade/print.glade.h:31
 msgid "_Translation:"
@@ -5633,7 +5619,7 @@
 
 #: ../src/gnome/glade/print.glade.h:32
 msgid "_Units:"
-msgstr "Mértékegységek:"
+msgstr "_Mértékegységek:"
 
 #: ../src/gnome/glade/print.glade.h:33
 msgid "x"
@@ -5657,7 +5643,7 @@
 
 #: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:721
 msgid "Enter _Interest Payment..."
-msgstr ""
+msgstr "_Kamatfizetés bevitele..."
 
 #: ../src/gnome/glade/reconcile.glade.h:3
 msgid "Include _subaccounts"
@@ -5682,11 +5668,11 @@
 
 #: ../src/gnome/glade/register.glade.h:2
 msgid "Amo_unt"
-msgstr "Összeg"
+msgstr "Öss_zeg"
 
 #: ../src/gnome/glade/register.glade.h:4
 msgid "C_hoose Date:"
-msgstr "Dátum választás:"
+msgstr "D_átum választás:"
 
 #: ../src/gnome/glade/register.glade.h:5
 msgid "C_leared"
@@ -5711,8 +5697,7 @@
 
 #: ../src/gnome/glade/register.glade.h:11
 #: ../src/gnome/gnc-plugin-page-register.c:249
-msgid ""
-"Create a Scheduled Transaction with the current transaction as a template"
+msgid "Create a Scheduled Transaction with the current transaction as a template"
 msgstr "Ütemezett tranzakció létrehozása a jelenlegi tranzakció mintájára"
 
 #: ../src/gnome/glade/register.glade.h:12
@@ -5730,7 +5715,7 @@
 
 #: ../src/gnome/glade/register.glade.h:19
 msgid "Dup_licate Transaction..."
-msgstr "Tranzakció dup_likálása"
+msgstr "Tra_nzakció duplikálása"
 
 #: ../src/gnome/glade/register.glade.h:21
 #: ../src/import-export/generic-import.glade.h:17
@@ -5755,7 +5740,7 @@
 
 #: ../src/gnome/glade/register.glade.h:27
 msgid "Filter register by..."
-msgstr ""
+msgstr "Regiszter szűrése..."
 
 #: ../src/gnome/glade/register.glade.h:28
 msgid "Jump"
@@ -5782,7 +5767,7 @@
 
 #: ../src/gnome/glade/register.glade.h:33
 msgid "Num_ber"
-msgstr "Szám"
+msgstr "Szá_m"
 
 #: ../src/gnome/glade/register.glade.h:34
 msgid "Paste Transaction"
@@ -5810,7 +5795,7 @@
 #: ../src/gnome/gnc-plugin-page-register.c:272
 #: ../src/gnome-utils/gnc-icons.c:22
 msgid "S_plit Transaction"
-msgstr "Tranzakció osztása"
+msgstr "T_ranzakció osztása"
 
 #: ../src/gnome/glade/register.glade.h:40
 msgid "S_tatement Date"
@@ -5818,7 +5803,7 @@
 
 #: ../src/gnome/glade/register.glade.h:42
 msgid "Schedule..."
-msgstr "Ütemezés"
+msgstr "Ütemezés..."
 
 #: ../src/gnome/glade/register.glade.h:43
 msgid "Select Range:"
@@ -5826,7 +5811,7 @@
 
 #: ../src/gnome/glade/register.glade.h:44
 msgid "Select _All"
-msgstr "Mindent kijelöl"
+msgstr "Mindent _kijelöl"
 
 #: ../src/gnome/glade/register.glade.h:45
 msgid "Show _All"
@@ -5849,8 +5834,7 @@
 
 #: ../src/gnome/glade/register.glade.h:49
 #: ../src/gnome/gnc-plugin-page-register.c:285
-msgid ""
-"Show transactions on one or two lines and expand the current transaction"
+msgid "Show transactions on one or two lines and expand the current transaction"
 msgstr "Tranzakciók egy vagy két sorban, és a jelenlegi tranzakció kifejtése"
 
 #: ../src/gnome/glade/register.glade.h:50
@@ -5925,8 +5909,7 @@
 
 #: ../src/gnome/glade/register.glade.h:65
 msgid "Sort by the statement date (unreconciled items last)"
-msgstr ""
-"Rendezés a bankszámlakivonat dátuma szerint (nem egyeztetett elemek a végén)"
+msgstr "Rendezés a bankszámlakivonat dátuma szerint (nem egyeztetett elemek a végén)"
 
 #: ../src/gnome/glade/register.glade.h:66
 msgid "Sort register by..."
@@ -5934,7 +5917,7 @@
 
 #: ../src/gnome/glade/register.glade.h:68
 msgid "St_yle"
-msgstr "Stílus"
+msgstr "St_ílus"
 
 #: ../src/gnome/glade/register.glade.h:69
 msgid "Start:"
@@ -5942,7 +5925,7 @@
 
 #: ../src/gnome/glade/register.glade.h:71
 msgid "Toda_y"
-msgstr "Ma"
+msgstr "M_a"
 
 #: ../src/gnome/glade/register.glade.h:72
 msgid "Void Transaction"
@@ -5950,11 +5933,11 @@
 
 #: ../src/gnome/glade/register.glade.h:73
 msgid "_Action"
-msgstr "Művelet"
+msgstr "_Művelet"
 
 #: ../src/gnome/glade/register.glade.h:75
 msgid "_Amount"
-msgstr "Összeg"
+msgstr "_Összeg"
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/glade/register.glade.h:76
@@ -5966,12 +5949,12 @@
 #: ../src/gnome/glade/register.glade.h:77
 #: ../src/gnome/gnc-plugin-page-register.c:281
 msgid "_Basic Ledger"
-msgstr "Alap-főkönyv"
+msgstr "_Alap-főkönyv"
 
 #: ../src/gnome/glade/register.glade.h:83
 #: ../src/gnome/gnc-plugin-page-register.c:268
 msgid "_Double Line"
-msgstr "Kétsoros"
+msgstr "_Kétsoros"
 
 #: ../src/gnome/glade/register.glade.h:84
 msgid "_Earliest"
@@ -5985,7 +5968,7 @@
 #: ../src/gnome/gnc-plugin-page-register.c:245
 #: ../src/gnome-utils/gnc-icons.c:23
 msgid "_Jump"
-msgstr "Ugrás"
+msgstr "_Ugrás"
 
 #: ../src/gnome/glade/register.glade.h:89
 msgid "_Latest"
@@ -5997,19 +5980,19 @@
 
 #: ../src/gnome/glade/register.glade.h:91
 msgid "_Notes"
-msgstr "Megjegyzések"
+msgstr "_Megjegyzések"
 
 #: ../src/gnome/glade/register.glade.h:92
 msgid "_Number"
-msgstr "Szám"
+msgstr "_Szám"
 
 #: ../src/gnome/glade/register.glade.h:93
 msgid "_Number:"
-msgstr "Szám:"
+msgstr "_Szám:"
 
 #: ../src/gnome/glade/register.glade.h:94
 msgid "_Reconciled"
-msgstr "Egyeztetett"
+msgstr "_Egyeztetett"
 
 #: ../src/gnome/glade/register.glade.h:96
 msgid "_Standard Order"
@@ -6021,7 +6004,7 @@
 
 #: ../src/gnome/glade/register.glade.h:98
 msgid "_Today"
-msgstr "Ma"
+msgstr "_Ma"
 
 #: ../src/gnome/glade/register.glade.h:99
 msgid "_Transaction Journal"
@@ -6029,7 +6012,7 @@
 
 #: ../src/gnome/glade/register.glade.h:100
 msgid "_Unreconciled"
-msgstr "Nem egyeztetett"
+msgstr "_Nem egyeztetett"
 
 #: ../src/gnome/glade/register.glade.h:102
 msgid "_Voided"
@@ -6085,6 +6068,45 @@
 "Last Saturday\n"
 "Last Sunday"
 msgstr ""
+"1.\n"
+"2.\n"
+"3.\n"
+"4.\n"
+"5.\n"
+"6.\n"
+"7.\n"
+"8.\n"
+"9.\n"
+"10.\n"
+"11.\n"
+"12.\n"
+"13.\n"
+"14.\n"
+"15.\n"
+"16.\n"
+"17.\n"
+"18.\n"
+"19.\n"
+"20.\n"
+"21.\n"
+"22.\n"
+"23.\n"
+"24.\n"
+"25.\n"
+"26.\n"
+"27.\n"
+"28.\n"
+"29.\n"
+"30.\n"
+"31.\n"
+"Hónap utlsó napja\n"
+"Utolsó hétfő\n"
+"Utolsó kedd\n"
+"Utolsó szerda\n"
+"Utolsó  csütörtök\n"
+"Utolsó péntek\n"
+"Utolsó szombat\n"
+"Utolsó vasárnap"
 
 #: ../src/gnome/glade/sched-xact.glade.h:44
 msgid "<b>End</b>"
@@ -6182,6 +6204,10 @@
 "Whole Loan\n"
 "Custom"
 msgstr ""
+"Aktuális év\n"
+"Idei+1 év\n"
+"Teljes hitel\n"
+"Egyéni"
 
 #: ../src/gnome/glade/sched-xact.glade.h:72
 msgid ""
@@ -6469,7 +6495,7 @@
 msgid "Set the 'auto-create' flag on newly created scheduled transactions."
 msgstr ""
 "Az újonnan létrehozott, ütemezett tranzakciók megjelölése 'automatikusan-"
-"létrehozandó' -ként"
+"létrehozandó' -ként."
 
 #: ../src/gnome/glade/sched-xact.glade.h:159
 msgid "Set the 'notify' flag on newly created scheduled transactions."
@@ -6673,7 +6699,7 @@
 
 #: ../src/gnome/glade/stocks.glade.h:2
 msgid "<b>_Income Account</b>"
-msgstr "<b>Bevételszámla</b>"
+msgstr "<b>_Bevételszámla</b>"
 
 #: ../src/gnome/glade/stocks.glade.h:3
 msgid "Cash In Lieu"
@@ -6681,7 +6707,7 @@
 
 #: ../src/gnome/glade/stocks.glade.h:4
 msgid "Currenc_y:"
-msgstr "Pénznem:"
+msgstr "Pénzne_m:"
 
 #: ../src/gnome/glade/stocks.glade.h:5
 msgid "Desc_ription:"
@@ -6725,11 +6751,10 @@
 
 #: ../src/gnome/glade/stocks.glade.h:10
 msgid "New _Price:"
-msgstr "Új ár:"
+msgstr "Új _ár:"
 
 #: ../src/gnome/glade/stocks.glade.h:11
-msgid ""
-"Select the account for which you want to record a stock split or merger."
+msgid "Select the account for which you want to record a stock split or merger."
 msgstr ""
 "Válassza ki a számlát, amelyre részvényosztást vagy összevonást kíván "
 "rögzíteni."
@@ -6753,7 +6778,7 @@
 #: ../src/gnome/glade/stocks.glade.h:16
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:4
 msgid "_Amount:"
-msgstr "Összeg:"
+msgstr "_Összeg:"
 
 #: ../src/gnome/glade/stocks.glade.h:18
 msgid "_Memo:"
@@ -6761,7 +6786,7 @@
 
 #: ../src/gnome/glade/stocks.glade.h:19
 msgid "_Shares:"
-msgstr "Darab:"
+msgstr "_Darab:"
 
 #: ../src/gnome/glade/tax.glade.h:1
 msgid "0"
@@ -6777,7 +6802,7 @@
 
 #: ../src/gnome/glade/tax.glade.h:4
 msgid "<b>_Accounts</b>"
-msgstr "<b>Számlák</b>"
+msgstr "<b>_Számlák</b>"
 
 #: ../src/gnome/glade/tax.glade.h:5
 msgid "<b>_TXF Categories</b>"
@@ -6789,7 +6814,7 @@
 
 #: ../src/gnome/glade/tax.glade.h:7
 msgid "C_urrent Account"
-msgstr "A jelenlegi számla"
+msgstr "A _jelenlegi számla"
 
 #: ../src/gnome/glade/tax.glade.h:8
 msgid "Tax Information"
@@ -6797,19 +6822,19 @@
 
 #: ../src/gnome/glade/tax.glade.h:9
 msgid "Tax _Related"
-msgstr "Adó vonatkozású"
+msgstr "Adó _vonatkozású"
 
 #: ../src/gnome/glade/tax.glade.h:10
 msgid "_Expense"
-msgstr "Költség"
+msgstr "_Költség"
 
 #: ../src/gnome/glade/tax.glade.h:11
 msgid "_Income"
-msgstr "Bevétel"
+msgstr "_Bevétel"
 
 #: ../src/gnome/glade/tax.glade.h:12
 msgid "_Parent Account"
-msgstr "Fő számla"
+msgstr "_Fő számla"
 
 #: ../src/gnome/glade/tax.glade.h:13
 msgid "_Select Subaccounts"
@@ -6963,8 +6988,7 @@
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:151
 msgid "View and edit the commodities for stocks and mutual funds"
-msgstr ""
-"Értékpapírok és befektetési alapok (javak) megtekintése és szerkesztése"
+msgstr "Értékpapírok és befektetési alapok (javak) megtekintése és szerkesztése"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:153
 msgid "_Financial Calculator"
@@ -7064,7 +7088,7 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:164
 msgid "_Delete Account..."
-msgstr "Számla törlése"
+msgstr "_Számla törlése..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:165
 msgid "Delete selected account"
@@ -7072,7 +7096,7 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:167
 msgid "_Renumber Subaccounts..."
-msgstr "Alszámlák új_raszámozása"
+msgstr "_Alszámlák újraszámozása..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:168
 msgid "Renumber the children of the selected account"
@@ -7090,7 +7114,7 @@
 #: ../src/gnome/gnc-plugin-page-account-tree.c:176
 #: ../src/gnome/gnc-plugin-page-register.c:230
 msgid "_Reconcile..."
-msgstr "Egyeztetés"
+msgstr "_Egyeztetés..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:177
 #: ../src/gnome/gnc-plugin-page-register.c:231
@@ -7113,7 +7137,7 @@
 #: ../src/gnome/gnc-plugin-page-account-tree.c:182
 #: ../src/gnome/gnc-plugin-page-register.c:233
 msgid "Stoc_k Split..."
-msgstr "Részvény_kifejtés"
+msgstr "Részvény_kifejtés..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:183
 #: ../src/gnome/gnc-plugin-page-register.c:234
@@ -7270,8 +7294,7 @@
 msgstr "Költségvetés becslése"
 
 #: ../src/gnome/gnc-plugin-page-budget.c:144
-msgid ""
-"Estimate a budget value for the selected accounts from past transactions"
+msgid "Estimate a budget value for the selected accounts from past transactions"
 msgstr ""
 "Költségvetésérték becslése a kiválasztott számlákra múltbéli tranzakciók "
 "alapján"
@@ -7304,7 +7327,7 @@
 #. File menu
 #: ../src/gnome/gnc-plugin-page-register.c:167
 msgid "_Print Check..."
-msgstr "Nyomtatás ellenőrzése"
+msgstr "_Nyomtatás ellenőrzése..."
 
 #. Edit menu
 #: ../src/gnome/gnc-plugin-page-register.c:172
@@ -7415,7 +7438,7 @@
 
 #: ../src/gnome/gnc-plugin-page-register.c:248
 msgid "Sche_dule..."
-msgstr "Ütemezés"
+msgstr "Üte_mezés..."
 
 #: ../src/gnome/gnc-plugin-page-register.c:251
 msgid "_All transactions"
@@ -7631,8 +7654,7 @@
 #: ../src/gnome/gnc-split-reg.c:936
 #, c-format
 msgid "This transaction is marked read-only with the comment: '%s'"
-msgstr ""
-"A tranzakciót csak olvashatóként jelölték meg a következő megjegyzéssel: '%s'"
+msgstr "A tranzakciót csak olvashatóként jelölték meg a következő megjegyzéssel: '%s'"
 
 #: ../src/gnome/gnc-split-reg.c:968
 msgid "Remove the splits from this transaction?"
@@ -7876,8 +7898,7 @@
 "jelenik meg."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:5
-msgid ""
-"If active, the new user dialog will be shown. Otherwise it will not be shown."
+msgid "If active, the new user dialog will be shown. Otherwise it will not be shown."
 msgstr ""
 "Ha aktív, megjelenik az új felhasználó párbeszédablak. Különben nem jelenik "
 "meg."
@@ -7904,8 +7925,7 @@
 msgid ""
 "The X,Y coordinates of the top left corner of the dialog when it was last "
 "closed."
-msgstr ""
-"Az párbeszédablak bal felső sarkának X,Y koordinátái az utolsó bezáráskor."
+msgstr "Az párbeszédablak bal felső sarkának X,Y koordinátái az utolsó bezáráskor."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:12
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:11
@@ -8239,8 +8259,7 @@
 msgid ""
 "Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog "
 "will be shown. Otherwise it will not be shown."
-msgstr ""
-"Ha aktív, megjelenik a \"Nap Tippje\" indításkor. Különben nem jelenik meg."
+msgstr "Ha aktív, megjelenik a \"Nap Tippje\" indításkor. Különben nem jelenik meg."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in.h:2
 msgid "Show \"Tip Of The Day\" at GnuCash start"
@@ -8445,8 +8464,7 @@
 "kilépés után. Különben a méretek nem maradnak meg."
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
-msgid ""
-"If active, use a 24 hour time format. Otherwise use a 12 hour time format."
+msgid "If active, use a 24 hour time format. Otherwise use a 12 hour time format."
 msgstr "Aktiválva 24 órás időalak használata. Különben 12 órás."
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:37
@@ -8745,8 +8763,7 @@
 msgid ""
 "This dialog is presented before allowing you to delete multiple price quotes "
 "at one time."
-msgstr ""
-"E dialógus megjelenik, mielőtt engedélyezik egyszerre több áradat törlését."
+msgstr "E dialógus megjelenik, mielőtt engedélyezik egyszerre több áradat törlését."
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:20
 msgid ""
@@ -8772,8 +8789,7 @@
 msgid ""
 "This dialog is presented before allowing you to remove a splits from a "
 "transaction."
-msgstr ""
-"E dialógus megjelenik, mielőtt engedélyezik kifejtés törlését tranzakcióból."
+msgstr "E dialógus megjelenik, mielőtt engedélyezik kifejtés törlését tranzakcióból."
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:23
 msgid ""
@@ -8859,8 +8875,7 @@
 msgstr "Nyereség/veszteség kezdő dátum típus"
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:6
-msgid ""
-"Show a grand total of all accounts converted to the default report currency"
+msgid "Show a grand total of all accounts converted to the default report currency"
 msgstr "Főösszeg megjelenítése minden számlán az alapértelmezett pénznemben"
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:7
@@ -9074,11 +9089,10 @@
 msgstr "Felvétel a jelenlegi keresés eredményei közé"
 
 #: ../src/gnome-search/search.glade.h:4
-msgid ""
-"Choose whether to search all your data or only that marked as \"active\""
+msgid "Choose whether to search all your data or only that marked as \"active\""
 msgstr ""
 "Válasza ki, hogy minden adat között keressen, vagy csak az 'aktív'-ként "
-"megjelöltek között."
+"megjelöltek között"
 
 #: ../src/gnome-search/search.glade.h:5
 msgid "Delete results from current search"
@@ -9286,8 +9300,7 @@
 msgid ""
 "You must select a transfer account or choose the opening balances equity "
 "account."
-msgstr ""
-"Vagy egy célszámlát, vagy a nyitóegyenlegek > saját tőke számlát válassza ki."
+msgstr "Vagy egy célszámlát, vagy a nyitóegyenlegek > saját tőke számlát válassza ki."
 
 #: ../src/gnome-utils/dialog-account.c:1324
 msgid "Edit Account"
@@ -9391,8 +9404,7 @@
 msgid ""
 "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type"
 "\" for the commodity."
-msgstr ""
-"Meg kell adni az áru \"Megnevezés\"-ét \"Rövidítés\"-ét és \"Típus\"-át."
+msgstr "Meg kell adni az áru \"Megnevezés\"-ét \"Rövidítés\"-ét és \"Típus\"-át."
 
 #: ../src/gnome-utils/dialog-options.c:880
 msgid "Select all accounts."
@@ -10226,7 +10238,7 @@
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:5
 msgid "December 31, 2000"
-msgstr "2003. december 31."
+msgstr "2003. december 31"
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:6
 #: ../src/import-export/generic-import.glade.h:28
@@ -10289,7 +10301,6 @@
 msgstr "'_Enter' ugrás az üres tranzakcióra"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:2
-#, fuzzy
 msgid "07/31/2005"
 msgstr "07/31/2005"
 
@@ -10298,12 +10309,10 @@
 msgstr "2005-07-31"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:4
-#, fuzzy
 msgid "31.07.2005"
 msgstr "31.07.2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:5
-#, fuzzy
 msgid "31/07/2005"
 msgstr "31/07/2005"
 
@@ -10734,8 +10743,7 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:107
-msgid ""
-"Show a grand total of all accounts converted to the default report currency."
+msgid "Show a grand total of all accounts converted to the default report currency."
 msgstr "Főösszeg megjelenítése minden számlán az alapértelmezett pénznemben."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:108
@@ -10760,7 +10768,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:113
 msgid "Show splash screen at startup."
-msgstr "Indító ablak megjelenítése"
+msgstr "Indító ablak megjelenítése."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:114
 msgid ""
@@ -10872,8 +10880,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:137
 msgid "Use the specified absolute starting date for profit/loss calculations."
-msgstr ""
-"A megadott abszolút kezdő dátum használata nyereség/veszteség számításhoz."
+msgstr "A megadott abszolút kezdő dátum használata nyereség/veszteség számításhoz."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:138
 msgid "Use the specified currency for all newly created accounts."
@@ -10893,8 +10900,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:141
 msgid "Use the specified relative starting date for profit/loss calculations."
-msgstr ""
-"A megadott relatív kezdő dátum használata nyereség/veszteség számításhoz."
+msgstr "A megadott relatív kezdő dátum használata nyereség/veszteség számításhoz."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:142
 msgid "Use the system locale currency for all newly created accounts."
@@ -10902,8 +10908,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:143
 msgid "Use the system locale currency for all newly created reports."
-msgstr ""
-"A rendszerben alapértelmezett pénznem használata minden új jelentésben."
+msgstr "A rendszerben alapértelmezett pénznem használata minden új jelentésben."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:144
 msgid "Use the system setting for displaying toolbar items."
@@ -11077,9 +11082,8 @@
 msgstr "Új..."
 
 #: ../src/gnome-utils/gnc-autosave.c:99
-#, fuzzy
 msgid "Save file automatically?"
-msgstr "(automatikus kitöltés)"
+msgstr "Automatikus mentés?"
 
 #: ../src/gnome-utils/gnc-autosave.c:102
 #, c-format
@@ -11095,18 +11099,16 @@
 msgstr ""
 
 #: ../src/gnome-utils/gnc-autosave.c:107
-#, fuzzy
 msgid "_Yes, this time"
-msgstr "Időben a legközelebbi"
+msgstr "_Igen, ekkor"
 
 #: ../src/gnome-utils/gnc-autosave.c:108
 msgid "Yes, _always"
 msgstr ""
 
 #: ../src/gnome-utils/gnc-autosave.c:109
-#, fuzzy
 msgid "No, n_ever"
-msgstr "Végtelen"
+msgstr "Nem, _Soha"
 
 #: ../src/gnome-utils/gnc-autosave.c:110
 msgid "_No, not this time"
@@ -11172,7 +11174,7 @@
 
 #: ../src/gnome-utils/gnc-dense-cal.c:277
 msgid "View:"
-msgstr "Nézet"
+msgstr "Nézet:"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
@@ -11337,15 +11339,12 @@
 #: ../src/gnome-utils/gnc-file.c:302
 #, c-format
 msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
-msgstr ""
-"%s fájl/URL nem tartalmaz GnuCash-adatokat, vagy az adatállomány sérült."
+msgstr "%s fájl/URL nem tartalmaz GnuCash-adatokat, vagy az adatállomány sérült."
 
 #: ../src/gnome-utils/gnc-file.c:308
 #, c-format
-msgid ""
-"The server at URL %s experienced an error or encountered bad or corrupt data."
-msgstr ""
-"%s URL-en a szerver hibát észlelt, vagy rossz illetve sérült adatot talált."
+msgid "The server at URL %s experienced an error or encountered bad or corrupt data."
+msgstr "%s URL-en a szerver hibát észlelt, vagy rossz illetve sérült adatot talált."
 
 #: ../src/gnome-utils/gnc-file.c:314
 #, c-format
@@ -11896,7 +11895,7 @@
 msgid ""
 "If you don't save, changes from the past %d days and %d hours will be "
 "discarded."
-msgstr "Ha nem rögzíti a változásokat az előző %d percből, azok elvesznek."
+msgstr "Ha nem rögzíti a változásokat az előző %d nap és %d órából, azok elvesznek."
 
 #: ../src/gnome-utils/gnc-main-window.c:1011
 msgid "<unknown>"
@@ -11904,7 +11903,7 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:1041
 msgid "Close _Without Saving"
-msgstr "Bezárás rögzítés nélkül"
+msgstr "Bezárás _rögzítés nélkül"
 
 #: ../src/gnome-utils/gnc-main-window.c:1229
 msgid "<no file>"
@@ -11927,7 +11926,7 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:3501
 msgid "translator_credits"
-msgstr "Fordítók"
+msgstr "Fordító_k"
 
 #. CY Strings
 #. src/app-utils/date-utilities.scm
@@ -12157,7 +12156,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-account.c:643
 msgid "Column letter for 'Placeholder'|P"
-msgstr "Column letter for 'Placeholder'|P"
+msgstr "P"
 
 #. Translators: %s is a currency mnemonic.
 #: ../src/gnome-utils/gnc-tree-view-account.c:1388
@@ -12223,7 +12222,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:438
 msgid "Column letter for 'Get Quotes'|Q"
-msgstr "Column letter for 'Get Quotes'|Q"
+msgstr "Q"
 
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:444
 #: ../src/gnome-utils/gnc-tree-view-price.c:453
@@ -12314,8 +12313,7 @@
 msgstr "E mező tartalmazza a legutóbb megnyitott fájl teljes útját."
 
 #: ../src/gnome-utils/schemas/apps_gnucash_history.schemas.in.h:5
-msgid ""
-"This field contains the full path of the next most recently opened file."
+msgid "This field contains the full path of the next most recently opened file."
 msgstr "E mező tartalmazza a következő legutóbb megnyitott fájl teljes útját."
 
 #: ../src/gnome-utils/schemas/apps_gnucash_history.schemas.in.h:6
@@ -12433,11 +12431,11 @@
 #. Toplevel
 #: ../src/gnome/window-reconcile.c:1993
 msgid "_Reconcile"
-msgstr "Egyeztetés"
+msgstr "_Egyeztetés"
 
 #: ../src/gnome/window-reconcile.c:1994
 msgid "_Account"
-msgstr "Fiók"
+msgstr "_Fiók"
 
 #. Reconcile menu
 #: ../src/gnome/window-reconcile.c:2000
@@ -12445,8 +12443,7 @@
 msgstr "_Információ egyeztetése..."
 
 #: ../src/gnome/window-reconcile.c:2001
-msgid ""
-"Change the reconcile information including statement date and ending balance."
+msgid "Change the reconcile information including statement date and ending balance."
 msgstr ""
 "Az egyeztetési információ változtatása beleértve a bankszámlakivonat dátumát "
 "és a záróegyenleget is."
@@ -12461,7 +12458,7 @@
 
 #: ../src/gnome/window-reconcile.c:2007
 msgid "_Postpone"
-msgstr "Halaszt"
+msgstr "_Halaszt"
 
 #: ../src/gnome/window-reconcile.c:2008
 msgid "Postpone the reconciliation of this account"
@@ -12547,7 +12544,7 @@
 
 #: ../src/import-export/generic-import.glade.h:12
 msgid "Auto-c_lear threshold"
-msgstr "Auto-egyezés küszöb"
+msgstr "Auto-e_gyezés küszöb"
 
 #: ../src/import-export/generic-import.glade.h:13
 msgid "Choose a format"
@@ -12555,7 +12552,7 @@
 
 #: ../src/import-export/generic-import.glade.h:14
 msgid "Commercial ATM _fees threshold"
-msgstr "Kereskedelmi bankomat díj küszöb"
+msgstr "Kereskedelmi _bankomat díj küszöb"
 
 #: ../src/import-export/generic-import.glade.h:18
 msgid "Enable edit match action"
@@ -12651,7 +12648,7 @@
 
 #: ../src/import-export/generic-import.glade.h:36
 msgid "Online account ID here..."
-msgstr "(Online folyószámla azonosító... "
+msgstr "Online számla azonosító..."
 
 #: ../src/import-export/generic-import.glade.h:37
 msgid "Other Account"
@@ -12720,10 +12717,8 @@
 msgstr "Bayes-i illesztés"
 
 #: ../src/import-export/generic-import.glade.h:53
-msgid ""
-"Use bayesian algorithms to match new transactions with existing accounts."
-msgstr ""
-"Bayes-i illesztés használata új tranzakciók meglévő számlákra illesztéséhez."
+msgid "Use bayesian algorithms to match new transactions with existing accounts."
+msgstr "Bayes-i illesztés használata új tranzakciók meglévő számlákra illesztéséhez."
 
 #: ../src/import-export/generic-import.glade.h:54
 msgid "Yellow"
@@ -12911,19 +12906,16 @@
 msgstr ""
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:675
-#, fuzzy
 msgid ""
 "The external program \"AqBanking Setup Wizard\" failed to run successfully.  "
 "Online Banking can only be setup if this wizard has run successfully.  "
 "Please try running the \"AqBanking Setup Wizard\" again."
 msgstr ""
-"Az \"%s beállító tündér\" külső program nem nulla értékkel lépett ki, tehát "
-"nem sikerült befejezni. A további HBCI beállítás csak akkor végezhető el, ha "
-"%s beállító tündér sikeresen lefutott. Próbálja ismét elindítani és "
-"sikeresen befejezni az %s beállító tündér programot."
+"A(z) \"AqBanking Setup Wizard\" beállító program futtatása nem volt sikeres.  "
+"Az Online Banking beállítása csak akkor lehetségesl, ha ez a program sikeresen lefutott.  "
+"Próbálja ismét futtatni az és sikeresen befejezni beállító programot."
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:686
-#, fuzzy
 msgid ""
 "The external program \"AqBanking Setup Wizard\" has not been found. \n"
 "\n"
@@ -12931,10 +12923,10 @@
 "check your installation to ensure this program is present.  On some "
 "distributions this may require installing additional packages."
 msgstr ""
-"Az \"%s beállító tündér\" külső program nem található. \n"
+"Az \"AqBanking Setup Wizard\" külső program nem található. \n"
 "\n"
-"Az aqbanking csomagnak kellene telepítenie a \"%s-qt3-wizard\" programot. "
-"Ellenőrizze az aqbanking csomag telepítését."
+"Az aqbanking csomagnak tartalmaznia kellene \"qt3-wizard\" programot."
+"Ellenőrizze az aqbanking csomag meglétét. Némelyik disztribúció esetén további csomagok telepítésére lehet szükség."
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:752
 msgid "Online Banking Account Name"
@@ -12989,9 +12981,8 @@
 msgstr "Bankkód"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:10
-#, fuzzy
 msgid "Choose an Online Banking Version to use with the selected bank:"
-msgstr "Válassza ki a banknál használni kívánt HBCI változatot:"
+msgstr "Válassza ki a banknál használni kívánt Online Banking változatot:"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:11
 msgid ""
@@ -13057,9 +13048,8 @@
 msgstr "Online Banking kezdő beállítása"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:26
-#, fuzzy
 msgid "Match Online Banking accounts with GnuCash accounts"
-msgstr "HBCI és GnuCash számlák összevetése"
+msgstr "Online Banking és GnuCash számlák összevetése"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:27
 msgid "Move the selected transaction template one row down"
@@ -13074,14 +13064,12 @@
 msgstr "Új sablon neve"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:30
-#, fuzzy
 msgid "Online Banking Connection Window"
-msgstr "HBCI kapcsolat ablak"
+msgstr "Online Banking kapcsolat ablak"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:31
-#, fuzzy
 msgid "Online Banking Setup Finished"
-msgstr "HBCI beállítása kész"
+msgstr "Online Banking beállítása kész"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:32
 msgid "Online Banking Version"
@@ -13160,7 +13148,6 @@
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:48
-#, fuzzy
 msgid ""
 "The setup for matching Online Banking accounts to GnuCash accounts is now "
 "finished.  You can now invoke Online Banking actions on those accounts.\n"
@@ -13170,16 +13157,14 @@
 "\n"
 "Press \"Apply\" now."
 msgstr ""
-"Most minden HBCI számla, ami egyezik egy GnuCash számlával, kész. "
-"Végrehajthat HBCI akciókat azokon a számlákon.\n"
+"Online Banking számlák beállítása, ami egyezik egy GnuCash számlával, befejeződött. "
+"Most már végrehajthat Online Banking akciókat azokon a számlákon.\n"
 "\n"
-"Ha akarnak újabb HBCI bankot, használót vagy számlát felvenni, bármikor újra "
-"elindíthatják e tündért.\n"
+"Ha akar újabb Bankot, Felhasználót vagy Számlát felvenni, bármikor újra elindíthatja ezt a programot.\n"
 "\n"
-"Kattintsona az 'Alkalmazás' -ra."
+"Kattintson az \"Alkalmazás\" -ra."
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:53
-#, fuzzy
 msgid ""
 "This druid helps you setting up your Online Banking connection with your "
 "bank.\n"
@@ -13204,25 +13189,23 @@
 "Press \"Cancel\" if you do not wish to setup any Online Banking connection "
 "now."
 msgstr ""
-"E tündér segít beállítani a HBCI kapcsolatot a bankkal.\n"
+"Ez a tündér segít beállítani az Online Banking kapcsolatot a bankjával.\n"
 "\n"
-"Először kérni kell egy HBCI hozzáférést a banktól. Ha a bank megadja, küld "
+"Először kérni kell egy Online Banking hozzáférést a banktól. Ha a bank megadja, küld "
 "egy levelet, ami tartalmazza:\n"
 "\n"
 "* a bank kódját\n"
 "* a felhasználó azonosítóját, amivel a bank azonosítja a felhasználót\n"
-"* bank HBCI kiszolgálójának az internetes címét\n"
-"* információt a bank nyilvános kulcsának kriptográfiájáról (\"Ini-Letter"
-"\").\n"
+"* a bank Online Banking kiszolgálójának az internetes címét\n"
+"* HBCI Online Banking információt a bank nyilvános kulcsának kriptográfiájáról (\"Ini-Letter\").\n"
 "\n"
-"Ez az információ a következőkben lesz szükséges.Kattintson az \"Előre\" -re "
-"most.\n"
+"Ez az információ a következőkben lesz szükséges.Kattintson az \"Előre\" -re.\n"
 "\n"
 "MEGJEGYZÉS: SEMMI SEM GARANTÁLT. Néhány bank szegényesen megvalósított HBCI-"
 "t használ.Ne bízzon idő-kritikus átutalásokat HBCI-re, mert időnként a bank "
 "pozitív visszaigazolást ad, amikor az átutalást elutasították!\n"
 "\n"
-"Nyomjon 'Megszkítás' -t,ha mégsem akarja beállítani a HBCI kapcsolatot most."
+"Nyomjon 'Megszkítás' -t,ha mégsem akarja beállítani az Online Banking kapcsolatot."
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:67
 msgid "Use Transaction Template"
@@ -13281,9 +13264,8 @@
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:2
-#, fuzzy
 msgid "Activate verbose debug messages for Online Banking."
-msgstr "Bőbeszédű hibaüzenetek aktiválása a HBCI online bankoláshoz."
+msgstr "Bőbeszédű hibaüzenetek aktiválása az Online Banking-hez."
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:4
 msgid "Remember _PIN"
@@ -13309,7 +13291,6 @@
 #. * in your country, you may safely ignore strings from the
 #. * import-export/hbci subdirectory.
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:271
-#, fuzzy
 msgid ""
 "The downloaded Online Banking Balance was zero.\n"
 "\n"
@@ -13319,12 +13300,12 @@
 "(AqBanking or HBCI) Setup. After that, try again to download the Online "
 "Banking Balance."
 msgstr ""
-"A letöltött HBCI egyenleg nulla.\n"
+"A letöltött Online Banking egyenleg nulla volt.\n"
 "\n"
 "Vagy ez a helyes egyenleg, vagy a bank nem támogatja az egyenleg-letöltést "
-"ebben a HBCI változatban. A második esetén önnek magasabb számú HBCI "
-"változatot kell választania a HBCI beállításában. Azután próbálja újra "
-"letölteni a HBCI-egyenleget."
+"ebben az Online Banking változatban. A következőkben más verziószámú Online Banking-t"
+"kell választania a(z) beállításban (AqBanking vagy HBCI). Azután próbálja meg újra "
+"letölteni az Online Banking egyenleget."
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:289
 #, c-format
@@ -13342,23 +13323,20 @@
 msgid ""
 "The booked balance is identical to the current reconciled balance of the "
 "account."
-msgstr ""
-"A könyvelt egyenleg megegyezik a számla jelenlegi egyeztetett egyenlegével."
+msgstr "A könyvelt egyenleg megegyezik a számla jelenlegi egyeztetett egyenlegével."
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:315
 msgid "Reconcile account now?"
 msgstr "Folyószámla egyeztetése most ?"
 
 #: ../src/import-export/hbci/gnc-hbci-gettrans.c:208
-#, fuzzy
 msgid ""
 "The Online Banking import returned no transactions for the selected time "
 "period."
-msgstr "A HBCI-importálás nem adott vissza átutalást a kiválasztott időszakra."
+msgstr "Az Online Banking-importálás nem jelzett tranzakciót a kiválasztott időszakra."
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:136
 #: ../src/import-export/hbci/gnc-hbci-utils.c:711
-#, fuzzy
 msgid ""
 "The backend found an error during the preparation of the job. It is not "
 "possible to execute this job. \n"
@@ -13373,10 +13351,10 @@
 "végrehajtása. \n"
 "\n"
 "Legvalószínűbb, hogy a bank nem támogatja a kiválasztott feladatot, vagy a "
-"HBCI számlán nincs engedélyezve e feladat végrehajtása. További hibaüzenet "
-"feltűnhet a konzol-naplóban.\n"
+"HBCI számlán nincs engedélyezve a feladat végrehajtása. További hibaüzenetet"
+"találhat a konzol-naplóban.\n"
 "\n"
-"Újra be akarja vinni a feladatot?"
+"Újra végre akarja hajtani a feladatot?"
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:219
 msgid ""
@@ -13437,17 +13415,15 @@
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:393
-#, fuzzy
 msgid ""
 "The server of your bank refused the Online Banking connection. Please try "
 "again later. Aborting."
 msgstr ""
-"A bank kiszolgálója elutasította a HBCI kapcsolatot. Próbálja újra később. "
+"A bank kiszolgálója elutasította az Online Banking kapcsolatot. Próbálja újra később. "
 "Kilépés."
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:544
-msgid ""
-"Executing the Online Banking outbox failed. Please check the log window."
+msgid "Executing the Online Banking outbox failed. Please check the log window."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:572
@@ -13462,7 +13438,6 @@
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:588
-#, fuzzy
 msgid ""
 "One of the jobs was sent to the bank successfully, but the bank is refusing "
 "to execute the job. Please check the log window for the exact error message "
@@ -13471,11 +13446,10 @@
 "\n"
 "The job has been removed from the queue."
 msgstr ""
-"A feladatot sikerült elküldeni a bankba, de a bank elutasította a feladat "
-"végrehajtását. Ellenőrizze a napló ablakot a bank pontos hibaüzenetéért! A "
-"hibaüzenet sora 9000-nél nagyobb kódszámot tartalmaz.\n"
+"A feladatot sikerült elküldeni a bankba, de a bank elutasította a feladat végrehajtását. Ellenőrizze a napló ablakot a bank pontos hibaüzenetéért! "
+"A hibaüzenet sora 9000-nél nagyobb kódszámot tartalmaz.\n"
 "\n"
-"Akarja újból bevinni a feladatot?"
+"A feladat el lett távolítva a kérésből."
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:663
 msgid ""
@@ -13513,9 +13487,8 @@
 msgstr "HBCI-_egyenleg lehívása"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:103
-#, fuzzy
 msgid "Get the account balance online through Online Banking"
-msgstr "Számlaegyenleg online lekérdezése HBCI/AqBanking útján"
+msgstr "Számlaegyenleg online lekérdezése Online Banking útján"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:105
 msgid "Get _Transactions..."
@@ -13527,30 +13500,27 @@
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:108
 msgid "_Issue Transaction..."
-msgstr "Tranzakc_ió intézése"
+msgstr "_Tranzakció intézése..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:109
-#, fuzzy
 msgid "Issue a new transaction online through Online Banking"
-msgstr "Új online átutalás intézése HBCI-vel"
+msgstr "Új online átutalás intézése Online Banking-gel"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:117
 msgid "I_nternal Transaction..."
-msgstr "Belső tranzakc_ió "
+msgstr "B_első tranzakció..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:118
-#, fuzzy
 msgid "Issue a new bank-internal transaction online through Online Banking"
-msgstr "Belső átutalás intézése HBCI/AqBanking útján"
+msgstr "Új belső tranzakció intézése Online Banking-gel"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:121
 msgid "_Direct Debit..."
-msgstr "Direkt terhelés"
+msgstr "_Direkt terhelés..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:122
-#, fuzzy
 msgid "Issue a new direct debit note online through Online Banking"
-msgstr "Új online direkt terhelés intézése HBCI/AqBanking útján"
+msgstr "Új online direkt terhelés intézése Online Banking-gel"
 
 #. File -> Import menu item
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:126
@@ -13607,8 +13577,7 @@
 
 #: ../src/import-export/hbci/hbci-interaction.c:401
 #, c-format
-msgid ""
-"The PIN needs to be at least %d characters long. Do you want to try again?"
+msgid "The PIN needs to be at least %d characters long. Do you want to try again?"
 msgstr "A PIN-kód legalább %d karakter kell legyen. Akarja újrapróbálni?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:414
@@ -13616,13 +13585,11 @@
 msgid ""
 "You entered %ld characters, but the PIN must be no longer than %d "
 "characters. Do you want to try again?"
-msgstr ""
-"%ld betűt adtak meg, de a PIN legfeljebb %d betű lehet. Akarja újrapróbálni?"
+msgstr "%ld betűt adtak meg, de a PIN legfeljebb %d betű lehet. Akarja újrapróbálni?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:482
 #, c-format
-msgid ""
-"This TAN needs to be at least %d characters long. Do you want to try again?"
+msgid "This TAN needs to be at least %d characters long. Do you want to try again?"
 msgstr "A TAN legalább %d karakter kell legyen. Akarja újrapróbálni?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:495
@@ -13630,8 +13597,7 @@
 msgid ""
 "You entered %ld characters, but the TAN must be no longer than %d "
 "characters. Do you want to try again?"
-msgstr ""
-"%ld betűt adtak meg, de a TAN legfeljebb %d betű lehet. Akarja újrapróbálni?"
+msgstr "%ld betűt adtak meg, de a TAN legfeljebb %d betű lehet. Akarja újrapróbálni?"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:1
 msgid "CSV import data format"
@@ -13840,7 +13806,6 @@
 
 #: ../src/import-export/import-provider-format.glade.h:5
 #: ../src/import-export/qif-import/qif.glade.h:71
-#, fuzzy
 msgid ""
 "The QIF file format does not specify which order the day, month, and year "
 "components of a date are printed.  In most cases, it is possible to "
@@ -13896,8 +13861,7 @@
 
 #: ../src/import-export/log-replay/gnc-plugin-log-replay.c:46
 msgid "Replay a GnuCash log file after a crash.  This cannot be undone."
-msgstr ""
-"Egy GnuCash naplófájl visszajátszása összeomlás után. Vissza nem vonható."
+msgstr "Egy GnuCash naplófájl visszajátszása összeomlás után. Vissza nem vonható."
 
 #. This string is a default account
 #. name. It MUST NOT contain the
@@ -14045,8 +14009,7 @@
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1684
 msgid "Pick the commodity's exchange or listing (NASDAQ, NYSE, etc)."
-msgstr ""
-"Válassza ki az áru tőzsdéjét vagy besorolását (BUX, NASDAQ, NYSE stb.)."
+msgstr "Válassza ki az áru tőzsdéjét vagy besorolását (BUX, NASDAQ, NYSE stb.)."
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1708
 msgid "Enter the full name of the commodity, such as \"Red Hat Stock\""
@@ -14080,7 +14043,7 @@
 
 #: ../src/import-export/qif-import/gnc-plugin-qif-import.c:48
 msgid "Import _QIF..."
-msgstr "QIF-fájl importálása"
+msgstr "_QIF-fájl importálása..."
 
 #: ../src/import-export/qif-import/gnc-plugin-qif-import.c:49
 msgid "Import a Quicken QIF file"
@@ -14179,7 +14142,6 @@
 "\" -ra a kilépéshez. "
 
 #: ../src/import-export/qif-import/qif.glade.h:22
-#, fuzzy
 msgid ""
 "GnuCash uses separate Income and Expense accounts rather than categories to "
 "classify your transactions. Each of the categories in your QIF file will be "
@@ -14205,7 +14167,6 @@
 "biztonsággal átszervezhető."
 
 #: ../src/import-export/qif-import/qif.glade.h:27
-#, fuzzy
 msgid ""
 "If you are importing a QIF file downloaded from a bank or other financial "
 "institution, some of the information in the QIF file may duplicate "
@@ -14225,15 +14186,17 @@
 "\n"
 "Click \"Forward\" to find duplicate transactions. "
 msgstr ""
-"Egy bank vagy más pénzintézet QIF fájljának betöltésekor a QIF fájlban "
-"duplikált információ előfordulhat, ami már a GnuCash-fájlban szerepel. A "
-"GnuCash megkísérli a létező tranzakciók duplikált információit felderíteni.\n"
+"Egy bank vagy más pénzintézet QIF fájljának importálásakor, némelyik információ a QIF fájlban "
+"megduplázhat információkat a GnuCash-fájlban.  "
+"A GnuCash megkísérli a létező tranzakciók duplikált információit felderíteni.\n"
 "\n"
-"A következő oldalon válaszhat,hogy egy létező tranzakció megfelel -e egy "
-"importált tranzakciónak.Bal oldalon láthatóak az importáltak,jobb oldalon a "
+"A következő oldalon válaszhat,hogy egy létező tranzakció megfelel -e egy importált tranzakciónak.  Bal oldalon láthatóak az importáltak, jobb oldalon a "
 "meglévő,lehetséges megfelelő tranzakciók.Több régi tranzakció is megfelelhet "
-"az importáltnak,válassza ki a megfelelőt.Kattintson a megfelelő tranzakció "
-"\"Dup\" oszlopára."
+"az importáltnak, kiválaszthatja a megfelelőt dupla kattintással a megfelelő tranzakció \"Dup\" oszlopára.\n"
+"\n"
+"Vezérelheti a GnuCash által használt szabályokat a megduplázott tranzakciók megtalálására, a GnuCash Beállítások párbeszédablak, \"QIF Import\"részében.\n"
+"\n"
+"Kattintson az \"Előre\" gombra a folytatáshoz. "
 
 #: ../src/import-export/qif-import/qif.glade.h:34
 msgid "Import QIF files"
@@ -14316,7 +14279,8 @@
 "azonos, vagy hasonló nevű és kompatibilis típusú GnuCash-számla, akkor a "
 "program azzal veti össze. Különben a GnuCash létrehoz egy új számlát "
 "ugyanazzal a névvel és típussal, mint amilyen a QIF fájlban van. Ha a "
-"javasolt GnuCash-számla nem tetszik, az megváltoztatható.\n"
+"javasolt GnuCash-számla nem tetszik, az megváltoztatható dupla kattintással.\n"
+"\n"
 
 #: ../src/import-export/qif-import/qif.glade.h:51
 msgid "Payees and memos"
@@ -14379,8 +14343,7 @@
 
 #: ../src/import-export/qif-import/qif.glade.h:70
 msgid "Show some documentation-only pages in QIF Import druid."
-msgstr ""
-"A QIF Importálása tündér néhány,csak dokumentációs lapjának megjelenítése."
+msgstr "A QIF Importálása tündér néhány,csak dokumentációs lapjának megjelenítése."
 
 #: ../src/import-export/qif-import/qif.glade.h:75
 msgid ""
@@ -14586,7 +14549,7 @@
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:8
 msgid "Maximum ATM fee amount in your area"
-msgstr "Legnagyobb ATM díj az ön körzetében."
+msgstr "Legnagyobb ATM díj az ön körzetében"
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:9
 msgid "Minimum score to be displayed"
@@ -14858,8 +14821,7 @@
 msgstr "Új_rakiegyenlítés"
 
 #: ../src/register/ledger-core/split-register-control.c:1042
-msgid ""
-"You need to expand the transaction in order to modify its exchange rates."
+msgid "You need to expand the transaction in order to modify its exchange rates."
 msgstr "A tranzakciók kibontása szükséges az árfolyamok változtatásához."
 
 #: ../src/register/ledger-core/split-register-control.c:1165
@@ -15032,15 +14994,13 @@
 msgstr "Forrás-számla megadása vagy kiválasztása listából"
 
 #: ../src/register/ledger-core/split-register-model.c:1298
-msgid ""
-"This transaction has multiple splits; press the Split button to see them all"
+msgid "This transaction has multiple splits; press the Split button to see them all"
 msgstr ""
 "E tranzakciónak több kifejtése van. Nyomja meg a 'Kibontás' gombot hogy "
 "mindent lássa"
 
 #: ../src/register/ledger-core/split-register-model.c:1301
-msgid ""
-"This transaction is a stock split; press the Split button to see details"
+msgid "This transaction is a stock split; press the Split button to see details"
 msgstr ""
 "E tranzakció egy készlet-kifejtés. Nyomja meg a 'Kibontás' gombot a "
 "részletek megtekintéséhez "
@@ -15124,7 +15084,7 @@
 
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:953
 msgid "_Print Report..."
-msgstr "Jelentés nyomtatása"
+msgstr "_Jelentés nyomtatása..."
 
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:954
 msgid "Print the current report"
@@ -16384,8 +16344,7 @@
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1224
-msgid ""
-"Override account-selection and show sub-accounts of all selected accounts?"
+msgid "Override account-selection and show sub-accounts of all selected accounts?"
 msgstr ""
 "A számlakiválasztás figyelmen kívül hagyása, és minden kiválasztott számla "
 "alszámláinak megjelenítése?"
@@ -17301,8 +17260,7 @@
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
 #: ../intl-scm/guile-strings.c:1610 ../intl-scm/guile-strings.c:1776
-msgid ""
-"For details on subscribing to that list, see &lt;http://www.gnucash.org/&gt;."
+msgid "For details on subscribing to that list, see &lt;http://www.gnucash.org/&gt;."
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
@@ -18387,8 +18345,7 @@
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
 #: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2708
 msgid "Any text in the Description column which identifies adjusting entries"
-msgstr ""
-"Bármilyen szöveg a Leírás oszlopban, ami azonosítja a korrigáló tételeket"
+msgstr "Bármilyen szöveg a Leírás oszlopban, ami azonosítja a korrigáló tételeket"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
@@ -18411,8 +18368,7 @@
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
 #: ../intl-scm/guile-strings.c:2092 ../intl-scm/guile-strings.c:2716
-msgid ""
-"Causes the Adjusting Entries Pattern to be treated as a regular expression"
+msgid "Causes the Adjusting Entries Pattern to be treated as a regular expression"
 msgstr "A korrigáló tételek mintáját reguláris kifejezésként kezelik"
 
 #. src/report/standard-reports/trial-balance.scm
@@ -18484,8 +18440,7 @@
 #: ../intl-scm/guile-strings.c:2104 ../intl-scm/guile-strings.c:2328
 #: ../intl-scm/guile-strings.c:2728 ../intl-scm/guile-strings.c:2952
 #: ../intl-scm/guile-strings.c:3444 ../intl-scm/guile-strings.c:4598
-msgid ""
-"Causes the Closing Entries Pattern to be treated as a regular expression"
+msgid "Causes the Closing Entries Pattern to be treated as a regular expression"
 msgstr "A záró tételek mintáját reguláris kifejezésként kezelik"
 
 #. src/report/standard-reports/trial-balance.scm
@@ -18546,8 +18501,7 @@
 #: ../intl-scm/guile-strings.c:3122 ../intl-scm/guile-strings.c:3230
 #: ../intl-scm/guile-strings.c:4276 ../intl-scm/guile-strings.c:4384
 msgid "Shows each account in the table as a hyperlink to its register window"
-msgstr ""
-"Minden számla a főkönyvi ablakára mutató hiperhivatkozásként jelenik meg"
+msgstr "Minden számla a főkönyvi ablakára mutató hiperhivatkozásként jelenik meg"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -19141,15 +19095,13 @@
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
 #: ../intl-scm/guile-strings.c:2358 ../intl-scm/guile-strings.c:2982
 msgid "Shows a barchart with the Income per interval developing over time"
-msgstr ""
-"Oszlopdiagram megjelenítése az időszakonkénti bevétel időbeli alakulásával"
+msgstr "Oszlopdiagram megjelenítése az időszakonkénti bevétel időbeli alakulásával"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
 #: ../intl-scm/guile-strings.c:2360 ../intl-scm/guile-strings.c:2984
 msgid "Shows a barchart with the Expenses per interval developing over time"
-msgstr ""
-"Oszlopdiagram megjelenítése az időszakonkénti költségek időbeli alakulásával"
+msgstr "Oszlopdiagram megjelenítése az időszakonkénti költségek időbeli alakulásával"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
@@ -19799,10 +19751,8 @@
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:3394 ../intl-scm/guile-strings.c:4548
-msgid ""
-"If you are in a multi-currency situation, the exchanges may not be correct."
-msgstr ""
-"Ha ön egy több pénznemű helyzetben van, az átváltások talán nem pontosak."
+msgid "If you are in a multi-currency situation, the exchanges may not be correct."
+msgstr "Ha ön egy több pénznemű helyzetben van, az átváltások talán nem pontosak."
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
@@ -20814,7 +20764,7 @@
 #: ../intl-scm/guile-strings.c:5400 ../intl-scm/guile-strings.c:5490
 #: ../intl-scm/guile-strings.c:5580 ../intl-scm/guile-strings.c:5670
 msgid "Jan 1 - Mar 31"
-msgstr "jan. 1. - márc. 31."
+msgstr "Jan. 1 - Márc. 31"
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
@@ -20832,7 +20782,7 @@
 #: ../intl-scm/guile-strings.c:5404 ../intl-scm/guile-strings.c:5494
 #: ../intl-scm/guile-strings.c:5584 ../intl-scm/guile-strings.c:5674
 msgid "Apr 1 - May 31"
-msgstr "Ápr. 1. - máj. 31."
+msgstr "Ápr. 1 - Máj. 31"
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
@@ -21088,8 +21038,7 @@
 #: ../intl-scm/guile-strings.c:5466 ../intl-scm/guile-strings.c:5556
 #: ../intl-scm/guile-strings.c:5646 ../intl-scm/guile-strings.c:5736
 msgid "This report shows your Taxable Income and Deductible Expenses."
-msgstr ""
-"E jelentés az adóköteles jövedelemet és a levonható költségeket mutatja."
+msgstr "E jelentés az adóköteles jövedelemet és a levonható költségeket mutatja."
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
@@ -21104,8 +21053,7 @@
 #: ../intl-scm/guile-strings.c:5472 ../intl-scm/guile-strings.c:5562
 #: ../intl-scm/guile-strings.c:5652 ../intl-scm/guile-strings.c:5742
 msgid "This page shows your Taxable Income and Deductible Expenses."
-msgstr ""
-"Ez az oldal az adóköteles jövedelemet és a levonható költségeket mutatja."
+msgstr "Ez az oldal az adóköteles jövedelemet és a levonható költségeket mutatja."
 
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
@@ -22363,8 +22311,7 @@
 "When entering dates, you can type '+' or '-' to increment or decrement the "
 "selected date. You can use '+' and '-' to increment and decrement check "
 "numbers as well."
-msgstr ""
-"Dátumok megadásakor nyomhat '+' vagy '-' -t a megfelelő dátum kiválasztáshoz."
+msgstr "Dátumok megadásakor nyomhat '+' vagy '-' -t a megfelelő dátum kiválasztáshoz."
 
 #: ../doc/tip_of_the_day.list.in:60
 msgid ""
@@ -22436,8 +22383,3 @@
 "\""
 msgstr ""
 
-#~ msgid "Enables support for the European Union EURO currency."
-#~ msgstr "Engedélyezi az EU pénzének (EURO) használatát."
-
-#~ msgid "_Enable euro support"
-#~ msgstr "EURO támogatás _engedélyezése"

Modified: gnucash/branches/gda-dev/po/ja.po
===================================================================
--- gnucash/branches/gda-dev/po/ja.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/ja.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -2,14 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Shimpei Yamashita <shimpei at gol.com>, 2000.
 # Mitsuo Hamada <mhamada at redhat.com>, 2001.
+# Hiroto Kagotani <hiroto.kagotani at gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnucash 1.5.X\n"
+"Project-Id-Version: gnucash 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-10 22:05+0200\n"
-"PO-Revision-Date: 2007-07-20 23:06+0200\n"
-"Last-Translator: \"Hiroto Kagotani\" <hiroto.kagotani at gmail.com>\n"
+"PO-Revision-Date: 2007-08-01 11:20+0900\n"
+"Last-Translator: Hiroto Kagotani <hiroto.kagotani at gmail.com>\n"
 "Language-Team: Japanese <translation at gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@
 
 #: ../src/app-utils/gnc-exp-parser.c:653
 msgid "Not a defined function"
-msgstr ""
+msgstr "関数が定義されていません"
 
 #: ../src/app-utils/gnc-exp-parser.c:655
 msgid "Out of memory"
@@ -76,11 +77,12 @@
 #. Translators: Please only translate the letter *after* the colon.
 #: ../src/app-utils/gnc-ui-util.c:525
 msgid "void:v"
-msgstr ""
+msgstr "無効:v"
 
-#: ../src/app-utils/gnc-ui-util.c:566 ../src/gnome/dialog-chart-export.c:44
+#: ../src/app-utils/gnc-ui-util.c:566
+#: ../src/gnome/dialog-chart-export.c:44
 msgid "Opening Balances"
-msgstr "期首残高"
+msgstr "開始残高"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
@@ -88,27 +90,35 @@
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/app-utils/gnc-ui-util.c:569
-#: ../src/import-export/qif/qif-defaults.c:60 ../intl-scm/guile-strings.c:3176
-#: ../intl-scm/guile-strings.c:4330 ../intl-scm/guile-strings.c:5756
-#: ../intl-scm/guile-strings.c:5758 ../intl-scm/guile-strings.c:5778
-#: ../intl-scm/guile-strings.c:5780 ../intl-scm/guile-strings.c:5800
+#: ../src/import-export/qif/qif-defaults.c:60
+#: ../intl-scm/guile-strings.c:3176
+#: ../intl-scm/guile-strings.c:4330
+#: ../intl-scm/guile-strings.c:5756
+#: ../intl-scm/guile-strings.c:5758
+#: ../intl-scm/guile-strings.c:5778
+#: ../intl-scm/guile-strings.c:5780
+#: ../intl-scm/guile-strings.c:5800
 #: ../intl-scm/guile-strings.c:5802
 msgid "Retained Earnings"
 msgstr "内部留保"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../src/app-utils/gnc-ui-util.c:641 ../src/engine/Account.c:3644
+#: ../src/app-utils/gnc-ui-util.c:641
+#: ../src/engine/Account.c:3644
 #: ../src/register/ledger-core/split-register.c:2053
-#: ../intl-scm/guile-strings.c:3174 ../intl-scm/guile-strings.c:4328
+#: ../intl-scm/guile-strings.c:3174
+#: ../intl-scm/guile-strings.c:4328
 msgid "Equity"
 msgstr "資本"
 
-#: ../src/app-utils/gnc-ui-util.c:696 ../src/gnome/dialog-chart-export.c:45
-#: ../src/gnome/druid-hierarchy.c:922 ../src/gnome/glade/account.glade.h:41
+#: ../src/app-utils/gnc-ui-util.c:696
+#: ../src/gnome/dialog-chart-export.c:45
+#: ../src/gnome/druid-hierarchy.c:922
+#: ../src/gnome/glade/account.glade.h:41
 #: ../src/gnome-utils/dialog-account.c:273
 msgid "Opening Balance"
-msgstr "期首残高"
+msgstr "開始残高"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/trial-balance.scm
@@ -120,10 +130,14 @@
 #. src/report/standard-reports/register.scm
 #: ../src/app-utils/guile-util.c:1104
 #: ../src/register/ledger-core/split-register.c:1903
-#: ../intl-scm/guile-strings.c:1978 ../intl-scm/guile-strings.c:2164
-#: ../intl-scm/guile-strings.c:2602 ../intl-scm/guile-strings.c:2788
-#: ../intl-scm/guile-strings.c:3596 ../intl-scm/guile-strings.c:3908
-#: ../intl-scm/guile-strings.c:4750 ../intl-scm/guile-strings.c:5062
+#: ../intl-scm/guile-strings.c:1978
+#: ../intl-scm/guile-strings.c:2164
+#: ../intl-scm/guile-strings.c:2602
+#: ../intl-scm/guile-strings.c:2788
+#: ../intl-scm/guile-strings.c:3596
+#: ../intl-scm/guile-strings.c:3908
+#: ../intl-scm/guile-strings.c:4750
+#: ../intl-scm/guile-strings.c:5062
 msgid "Debit"
 msgstr "借方"
 
@@ -140,10 +154,14 @@
 #: ../src/register/ledger-core/split-register.c:2001
 #: ../src/register/ledger-core/split-register.c:2017
 #: ../src/register/ledger-core/split-register.c:2035
-#: ../intl-scm/guile-strings.c:1980 ../intl-scm/guile-strings.c:2166
-#: ../intl-scm/guile-strings.c:2604 ../intl-scm/guile-strings.c:2790
-#: ../intl-scm/guile-strings.c:3598 ../intl-scm/guile-strings.c:3910
-#: ../intl-scm/guile-strings.c:4752 ../intl-scm/guile-strings.c:5064
+#: ../intl-scm/guile-strings.c:1980
+#: ../intl-scm/guile-strings.c:2166
+#: ../intl-scm/guile-strings.c:2604
+#: ../intl-scm/guile-strings.c:2790
+#: ../intl-scm/guile-strings.c:3598
+#: ../intl-scm/guile-strings.c:3910
+#: ../intl-scm/guile-strings.c:4752
+#: ../intl-scm/guile-strings.c:5064
 msgid "Credit"
 msgstr "貸方"
 
@@ -153,6 +171,8 @@
 "There is a problem with option %s:%s.\n"
 "%s"
 msgstr ""
+"オプション %s:%s に問題があります。\n"
+"%s"
 
 #: ../src/backend/postgres/PostgresBackend.c:1866
 #, c-format
@@ -160,13 +180,15 @@
 msgstr ""
 
 #: ../src/backend/postgres/PostgresBackend.c:1984
-#: ../src/backend/postgres/putil.c:79 ../src/backend/postgres/putil.c:105
+#: ../src/backend/postgres/putil.c:79
+#: ../src/backend/postgres/putil.c:105
 #: ../src/backend/postgres/putil.c:147
 #, c-format
 msgid "From the Postgresql Server: %s"
 msgstr ""
 
-#: ../src/backend/postgres/putil.c:57 ../src/backend/postgres/upgrade.c:398
+#: ../src/backend/postgres/putil.c:57
+#: ../src/backend/postgres/upgrade.c:398
 msgid "Backend connection is not available"
 msgstr ""
 
@@ -207,15 +229,11 @@
 msgstr ""
 
 #: ../src/bin/gnucash-bin.c:227
-msgid ""
-"Log level overrides, of the form \"log.ger.path={debug,info,warn,crit,error}"
-"\""
+msgid "Log level overrides, of the form \"log.ger.path={debug,info,warn,crit,error}\""
 msgstr ""
 
 #: ../src/bin/gnucash-bin.c:231
-msgid ""
-"File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or "
-"\"stdout\"."
+msgid "File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or \"stdout\"."
 msgstr ""
 
 #. Translators: This is the command line option autohelp text; see popt(3)
@@ -227,7 +245,7 @@
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:240
 msgid "LOGLEVEL"
-msgstr ""
+msgstr "LOGLEVEL"
 
 #: ../src/bin/gnucash-bin.c:244
 msgid "Do not load the last file opened"
@@ -241,7 +259,7 @@
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:250
 msgid "CONFIGPATH"
-msgstr ""
+msgstr "CONFIGPATH"
 
 #: ../src/bin/gnucash-bin.c:253
 msgid "Set shared data file search path"
@@ -251,10 +269,11 @@
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:256
 msgid "SHAREPATH"
-msgstr ""
+msgstr "SHAREPATH"
 
 #. src/scm/command-line.scm
-#: ../src/bin/gnucash-bin.c:258 ../intl-scm/guile-strings.c:6
+#: ../src/bin/gnucash-bin.c:258
+#: ../intl-scm/guile-strings.c:6
 msgid "Set the search path for documentation files"
 msgstr "文書ファイル検索パスを設定する"
 
@@ -262,7 +281,7 @@
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:261
 msgid "DOCPATH"
-msgstr ""
+msgstr "DOCPATH"
 
 #: ../src/bin/gnucash-bin.c:263
 msgid "Set the prefix path for gconf queries"
@@ -272,28 +291,27 @@
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:266
 msgid "GCONFPATH"
-msgstr ""
+msgstr "GCONFPATH"
 
 #: ../src/bin/gnucash-bin.c:268
 msgid "Add price quotes to given GnuCash datafile"
-msgstr ""
+msgstr "指定したGnuCashデータファイルに価格見積りを追加する"
 
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:271
 msgid "FILE"
-msgstr ""
+msgstr "FILE"
 
 #: ../src/bin/gnucash-bin.c:273
-msgid ""
-"Regular expression determining which namespace commodities will be retrieved"
+msgid "Regular expression determining which namespace commodities will be retrieved"
 msgstr ""
 
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
 #: ../src/bin/gnucash-bin.c:276
 msgid "REGEXP"
-msgstr ""
+msgstr "REGEXP"
 
 #. Translators: %s is the version number
 #: ../src/bin/gnucash-bin.c:301
@@ -312,7 +330,7 @@
 #: ../src/bin/gnucash-bin.c:311
 #, c-format
 msgid "Built %s from r%s"
-msgstr ""
+msgstr "ビルド日時: %s, リビジョン: r%s"
 
 #: ../src/bin/gnucash-bin.c:387
 msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
@@ -325,7 +343,7 @@
 
 #: ../src/bin/gnucash-bin.c:472
 msgid "Loading data..."
-msgstr ""
+msgstr "データをロード中..."
 
 #. src/app-utils/prefs.scm
 #. src/report/standard-reports/gnucash/report/register.scm
@@ -345,14 +363,19 @@
 #: ../src/business/business-gnome/glade/invoice.glade.h:12
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:316
 #: ../src/register/ledger-core/split-register.c:2032
-#: ../intl-scm/guile-strings.c:130 ../intl-scm/guile-strings.c:3992
-#: ../intl-scm/guile-strings.c:5146 ../intl-scm/guile-strings.c:6096
-#: ../intl-scm/guile-strings.c:6194 ../intl-scm/guile-strings.c:6410
-#: ../intl-scm/guile-strings.c:6620 ../intl-scm/guile-strings.c:6718
-#: ../intl-scm/guile-strings.c:6934 ../intl-scm/guile-strings.c:7164
+#: ../intl-scm/guile-strings.c:130
+#: ../intl-scm/guile-strings.c:3992
+#: ../intl-scm/guile-strings.c:5146
+#: ../intl-scm/guile-strings.c:6096
+#: ../intl-scm/guile-strings.c:6194
+#: ../intl-scm/guile-strings.c:6410
+#: ../intl-scm/guile-strings.c:6620
+#: ../intl-scm/guile-strings.c:6718
+#: ../intl-scm/guile-strings.c:6934
+#: ../intl-scm/guile-strings.c:7164
 #: ../intl-scm/guile-strings.c:7404
 msgid "Invoice"
-msgstr "納品書"
+msgstr "顧客宛請求書"
 
 #. src/app-utils/prefs.scm
 #. src/business/business-reports/fancy-invoice.scm
@@ -366,19 +389,25 @@
 #: ../src/business/business-core/gncInvoice.c:624
 #: ../src/business/business-gnome/business-gnome-utils.c:214
 #: ../src/business/business-gnome/dialog-invoice.c:2393
-#: ../intl-scm/guile-strings.c:156 ../intl-scm/guile-strings.c:6098
-#: ../intl-scm/guile-strings.c:6196 ../intl-scm/guile-strings.c:6412
-#: ../intl-scm/guile-strings.c:6622 ../intl-scm/guile-strings.c:6720
-#: ../intl-scm/guile-strings.c:6936 ../intl-scm/guile-strings.c:7166
+#: ../intl-scm/guile-strings.c:156
+#: ../intl-scm/guile-strings.c:6098
+#: ../intl-scm/guile-strings.c:6196
+#: ../intl-scm/guile-strings.c:6412
+#: ../intl-scm/guile-strings.c:6622
+#: ../intl-scm/guile-strings.c:6720
+#: ../intl-scm/guile-strings.c:6936
+#: ../intl-scm/guile-strings.c:7166
 #: ../intl-scm/guile-strings.c:7406
 msgid "Bill"
-msgstr "請求書"
+msgstr "納入業者請求書"
 
 #. src/app-utils/prefs.scm
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../src/business/business-core/gncInvoice.c:626 ../src/engine/Account.c:3643
-#: ../intl-scm/guile-strings.c:126 ../intl-scm/guile-strings.c:1952
+#: ../src/business/business-core/gncInvoice.c:626
+#: ../src/engine/Account.c:3643
+#: ../intl-scm/guile-strings.c:126
+#: ../intl-scm/guile-strings.c:1952
 #: ../intl-scm/guile-strings.c:2576
 msgid "Expense"
 msgstr "費用"
@@ -405,20 +434,22 @@
 #: ../src/business/business-core/gncInvoice.c:1320
 #: ../src/business/business-core/gncInvoice.c:1414
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:140
-#: ../src/gnome/druid-loan.c:1792 ../src/gnome/druid-loan.c:2273
-#: ../src/gnome/druid-loan.c:2336 ../src/gnome/druid-loan.c:2350
+#: ../src/gnome/druid-loan.c:1792
+#: ../src/gnome/druid-loan.c:2273
+#: ../src/gnome/druid-loan.c:2336
+#: ../src/gnome/druid-loan.c:2350
 #: ../src/register/ledger-core/split-register.c:2028
 #: ../src/register/ledger-core/split-register.c:2033
 #: ../src/register/ledger-core/split-register.c:2042
-#: ../intl-scm/guile-strings.c:112 ../intl-scm/guile-strings.c:128
+#: ../intl-scm/guile-strings.c:112
+#: ../intl-scm/guile-strings.c:128
 #: ../intl-scm/guile-strings.c:158
 msgid "Payment"
 msgstr "支払"
 
 #: ../src/business/business-core/gncInvoice.c:1441
-#, fuzzy
 msgid "Pre-Payment"
-msgstr "支払"
+msgstr "繰上げ返済"
 
 #: ../src/business/business-core/gncInvoice.c:1538
 msgid " (posted)"
@@ -443,20 +474,26 @@
 msgstr "編集..."
 
 #: ../src/business/business-gnome/business-gnome-utils.c:217
-#, fuzzy
 msgid "Voucher"
-msgstr "請求書"
+msgstr "立替払請求書"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
 #: ../src/business/business-gnome/business-gnome-utils.c:454
-#: ../src/engine/FreqSpec.c:728 ../src/engine/Recurrence.c:479
-#: ../src/gnome/glade/sched-xact.glade.h:118 ../intl-scm/guile-strings.c:3634
-#: ../intl-scm/guile-strings.c:3660 ../intl-scm/guile-strings.c:3720
-#: ../intl-scm/guile-strings.c:3722 ../intl-scm/guile-strings.c:3828
-#: ../intl-scm/guile-strings.c:3844 ../intl-scm/guile-strings.c:4788
-#: ../intl-scm/guile-strings.c:4814 ../intl-scm/guile-strings.c:4874
-#: ../intl-scm/guile-strings.c:4876 ../intl-scm/guile-strings.c:4982
+#: ../src/engine/FreqSpec.c:728
+#: ../src/engine/Recurrence.c:479
+#: ../src/gnome/glade/sched-xact.glade.h:118
+#: ../intl-scm/guile-strings.c:3634
+#: ../intl-scm/guile-strings.c:3660
+#: ../intl-scm/guile-strings.c:3720
+#: ../intl-scm/guile-strings.c:3722
+#: ../intl-scm/guile-strings.c:3828
+#: ../intl-scm/guile-strings.c:3844
+#: ../intl-scm/guile-strings.c:4788
+#: ../intl-scm/guile-strings.c:4814
+#: ../intl-scm/guile-strings.c:4874
+#: ../intl-scm/guile-strings.c:4876
+#: ../intl-scm/guile-strings.c:4982
 #: ../intl-scm/guile-strings.c:4998
 #, c-format
 msgid "None"
@@ -528,26 +565,24 @@
 #: ../src/business/business-gnome/dialog-billterms.c:267
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:136
 msgid "Percentage amount must be between 0 and 100."
-msgstr ""
+msgstr "パーセントの値は0から100まででなければなりません。"
 
 #: ../src/business/business-gnome/dialog-billterms.c:290
-#, fuzzy
 msgid "You must provide a name for this Billing Term."
-msgstr "金融商品の名前を入力しなければなりません。"
+msgstr "この支払条件の名前を入力しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-billterms.c:296
-#, fuzzy, c-format
-msgid ""
-"You must provide a unique name for this Billing Term. Your choice \"%s\" is "
-"already in use."
-msgstr "金融商品の名前を入力しなければなりません。"
+#, c-format
+msgid "You must provide a unique name for this Billing Term. Your choice \"%s\" is already in use."
+msgstr "この支払条件の名前は他と重複してはいけません。選択した \"%s\" は既に使われています。"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #: ../src/business/business-gnome/dialog-billterms.c:465
 #: ../src/business/business-gnome/glade/billterms.glade.h:9
 #: ../src/gnome/glade/sched-xact.glade.h:79
-#: ../src/gnome-utils/gnc-date-delta.c:214 ../intl-scm/guile-strings.c:1878
+#: ../src/gnome-utils/gnc-date-delta.c:214
+#: ../intl-scm/guile-strings.c:1878
 #: ../intl-scm/guile-strings.c:2502
 msgid "Days"
 msgstr "æ—¥"
@@ -561,7 +596,8 @@
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/business/business-gnome/dialog-billterms.c:471
-#: ../src/engine/FreqSpec.c:987 ../intl-scm/guile-strings.c:6152
+#: ../src/engine/FreqSpec.c:987
+#: ../intl-scm/guile-strings.c:6152
 #: ../intl-scm/guile-strings.c:6676
 #, c-format
 msgid "Unknown"
@@ -570,7 +606,7 @@
 #: ../src/business/business-gnome/dialog-billterms.c:592
 #, c-format
 msgid "Term \"%s\" is in use.  You cannot delete it."
-msgstr ""
+msgstr "支払条件 \"%s\" は使われています。削除できません。"
 
 #: ../src/business/business-gnome/dialog-billterms.c:598
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:542
@@ -579,36 +615,29 @@
 msgstr "\"%s\" を本当に削除してもよろしいですか?"
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:72
-msgid ""
-"This transaction needs to be assigned to a Customer.  Please choose the "
-"Customer below."
+msgid "This transaction needs to be assigned to a Customer.  Please choose the Customer below."
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:77
-msgid ""
-"This transaction needs to be assigned to a Vendor.  Please choose the Vendor "
-"below."
+msgid "This transaction needs to be assigned to a Vendor.  Please choose the Vendor below."
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-customer.c:268
-msgid ""
-"You must enter a company name. If this customer is an individual (and not a "
-"company) you should set the \"company name\" and \"contact name\" the same."
+msgid "You must enter a company name. If this customer is an individual (and not a company) you should set the \"company name\" and \"contact name\" the same."
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-customer.c:279
-#, fuzzy
 msgid "You must enter a billing address."
-msgstr "適正な式を入力してください。"
+msgstr "請求先を入力してください。"
 
 #: ../src/business/business-gnome/dialog-customer.c:289
 msgid "Discount percentage must be between 0-100 or you must leave it blank."
-msgstr ""
+msgstr "値引きパーセントは0から100までの値を入力するか空白のままにしなければなりません。"
 
 #: ../src/business/business-gnome/dialog-customer.c:294
 #, fuzzy
 msgid "Credit must be a positive amount or you must leave it blank."
-msgstr "貸方にはプラスの金額を入力するか空白のままにしておかなければなりません。"
+msgstr "貸方にはプラスの金額を入力するか空白のままにしなければなりません。"
 
 #: ../src/business/business-gnome/dialog-customer.c:365
 #: ../src/business/business-gnome/dialog-employee.c:301
@@ -652,12 +681,12 @@
 
 #: ../src/business/business-gnome/dialog-customer.c:794
 msgid "Shipping Contact"
-msgstr "配達先"
+msgstr "納品担当者"
 
 #: ../src/business/business-gnome/dialog-customer.c:796
 #: ../src/business/business-gnome/dialog-vendor.c:659
 msgid "Billing Contact"
-msgstr "請求先"
+msgstr "支払担当者"
 
 #: ../src/business/business-gnome/dialog-customer.c:798
 msgid "Customer ID"
@@ -667,7 +696,8 @@
 #. src/business/business-utils/business-utils.scm
 #: ../src/business/business-gnome/dialog-customer.c:800
 #: ../src/business/business-gnome/dialog-vendor.c:663
-#: ../intl-scm/guile-strings.c:5876 ../intl-scm/guile-strings.c:5894
+#: ../intl-scm/guile-strings.c:5876
+#: ../intl-scm/guile-strings.c:5894
 msgid "Company Name"
 msgstr "会社名"
 
@@ -686,8 +716,10 @@
 #: ../src/business/business-gnome/dialog-job.c:540
 #: ../src/business/business-gnome/dialog-order.c:826
 #: ../src/business/business-gnome/dialog-vendor.c:671
-#: ../intl-scm/guile-strings.c:6128 ../intl-scm/guile-strings.c:6652
-#: ../intl-scm/guile-strings.c:7002 ../intl-scm/guile-strings.c:7242
+#: ../intl-scm/guile-strings.c:6128
+#: ../intl-scm/guile-strings.c:6652
+#: ../intl-scm/guile-strings.c:7002
+#: ../intl-scm/guile-strings.c:7242
 msgid "Company"
 msgstr "会社"
 
@@ -703,24 +735,20 @@
 msgstr "顧客を検索"
 
 #: ../src/business/business-gnome/dialog-date-close.c:72
-#, fuzzy
 msgid "No Account selected.  Please try again."
-msgstr "勘定科目が選択されていません"
+msgstr "勘定科目が選択されていません。もう一度試してください。"
 
 #: ../src/business/business-gnome/dialog-employee.c:216
-#, fuzzy
 msgid "You must enter a username."
-msgstr "勘定科目の名前を入力しなければなりません。"
+msgstr "ユーザ名を入力しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-employee.c:221
-#, fuzzy
 msgid "You must enter the employee's name."
-msgstr "勘定科目の名前を入力しなければなりません。"
+msgstr "従業員名を入力しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-employee.c:229
-#, fuzzy
 msgid "You must enter an address."
-msgstr "適正な式を入力してください。"
+msgstr "住所を入力しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-employee.c:308
 msgid "Edit Employee"
@@ -736,9 +764,8 @@
 msgstr "従業員を表示/編集する"
 
 #: ../src/business/business-gnome/dialog-employee.c:683
-#, fuzzy
 msgid "Expense Vouchers"
-msgstr "費用チャート"
+msgstr "立替払請求書"
 
 #: ../src/business/business-gnome/dialog-employee.c:692
 msgid "Employee ID"
@@ -767,7 +794,8 @@
 #: ../src/gnome-utils/gnc-tree-model-budget.c:96
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:405
 #: ../src/gnome-utils/gnc-tree-view-sx-list.c:167
-#: ../intl-scm/guile-strings.c:6976 ../intl-scm/guile-strings.c:7216
+#: ../intl-scm/guile-strings.c:6976
+#: ../intl-scm/guile-strings.c:7216
 msgid "Name"
 msgstr "名前"
 
@@ -786,18 +814,16 @@
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-invoice.c:495
-#, fuzzy
 msgid "Are you sure you want to delete the selected entry?"
-msgstr "%sの勘定を本当に削除してもよろしいですか?"
+msgstr "選択されたエントリを本当に削除してもよろしいですか?"
 
 #: ../src/business/business-gnome/dialog-invoice.c:497
-msgid ""
-"This entry is attached to an order and will be deleted from that as well!"
+msgid "This entry is attached to an order and will be deleted from that as well!"
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-invoice.c:605
 msgid "The Invoice must have at least one Entry."
-msgstr ""
+msgstr "顧客宛請求書には一つ以上のエントリが必要です。"
 
 #: ../src/business/business-gnome/dialog-invoice.c:612
 #, fuzzy
@@ -824,21 +850,22 @@
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/dialog-invoice.c:627
 #: ../src/register/ledger-core/split-register-model.c:108
-#: ../intl-scm/guile-strings.c:6132 ../intl-scm/guile-strings.c:6328
-#: ../intl-scm/guile-strings.c:6656 ../intl-scm/guile-strings.c:6852
-#: ../intl-scm/guile-strings.c:7174 ../intl-scm/guile-strings.c:7414
+#: ../intl-scm/guile-strings.c:6132
+#: ../intl-scm/guile-strings.c:6328
+#: ../intl-scm/guile-strings.c:6656
+#: ../intl-scm/guile-strings.c:6852
+#: ../intl-scm/guile-strings.c:7174
+#: ../intl-scm/guile-strings.c:7414
 msgid "Due Date"
 msgstr "期限日"
 
 #: ../src/business/business-gnome/dialog-invoice.c:628
-#, fuzzy
 msgid "Post Date"
-msgstr "日付順にソート"
+msgstr "転記日"
 
 #: ../src/business/business-gnome/dialog-invoice.c:629
-#, fuzzy
 msgid "Post to Account"
-msgstr "損失科目"
+msgstr "勘定科目に転記"
 
 #: ../src/business/business-gnome/dialog-invoice.c:630
 #, fuzzy
@@ -869,72 +896,59 @@
 
 #: ../src/business/business-gnome/dialog-invoice.c:1547
 #: ../src/business/business-gnome/glade/invoice.glade.h:18
-#, fuzzy
 msgid "New Invoice"
-msgstr "Invoiceを新規作成"
+msgstr "顧客宛請求書を新規作成"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1551
-#, fuzzy
 msgid "Edit Invoice"
-msgstr "Invoiceを編集"
+msgstr "顧客宛請求書を編集"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1554
-#, fuzzy
 msgid "View Invoice"
-msgstr "Invoiceを表示"
+msgstr "顧客宛請求書を表示"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1562
-#, fuzzy
 msgid "New Bill"
-msgstr "Billを新規作成"
+msgstr "納入業者請求書を新規作成"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1566
-#, fuzzy
 msgid "Edit Bill"
-msgstr "Billを編集"
+msgstr "納入業者請求書を編集"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1569
-#, fuzzy
 msgid "View Bill"
-msgstr "Billを表示"
+msgstr "納入業者請求書を表示"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1577
-#, fuzzy
 msgid "New Expense Voucher"
-msgstr "Expense Voucherを新規作成"
+msgstr "立替払請求書を新規作成"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1581
-#, fuzzy
 msgid "Edit Expense Voucher"
-msgstr "Expense Voucherを編集"
+msgstr "立替払請求書を編集"
 
 #: ../src/business/business-gnome/dialog-invoice.c:1584
-#, fuzzy
 msgid "View Expense Voucher"
-msgstr "Expense Voucherを表示"
+msgstr "立替払請求書を表示"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2196
-#, fuzzy
 msgid "View/Edit Invoice"
-msgstr "Invoiceを表示/編集する"
+msgstr "顧客宛請求書を表示/編集する"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2201
 #: ../src/business/business-gnome/dialog-invoice.c:2454
-#, fuzzy
 msgid "View/Edit Bill"
-msgstr "Billを表示/編集する"
+msgstr "納入業者請求書を表示/編集する"
 
 #. Translators: The terms 'Voucher' and 'Expense Voucher' are used
 #. interchangeably in gnucash and mean the same thing.
 #: ../src/business/business-gnome/dialog-invoice.c:2208
-#, fuzzy
 msgid "View/Edit Voucher"
-msgstr "Voucherを表示/編集する"
+msgstr "立替払請求書を表示/編集する"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2218
-#, fuzzy
 msgid "Invoice Owner"
-msgstr "Invoiceオーナー"
+msgstr "顧客宛請求書オーナー"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -943,12 +957,14 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/dialog-invoice.c:2221
-#: ../intl-scm/guile-strings.c:6028 ../intl-scm/guile-strings.c:6370
-#: ../intl-scm/guile-strings.c:6552 ../intl-scm/guile-strings.c:6894
-#: ../intl-scm/guile-strings.c:7130 ../intl-scm/guile-strings.c:7370
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6028
+#: ../intl-scm/guile-strings.c:6370
+#: ../intl-scm/guile-strings.c:6552
+#: ../intl-scm/guile-strings.c:6894
+#: ../intl-scm/guile-strings.c:7130
+#: ../intl-scm/guile-strings.c:7370
 msgid "Invoice Notes"
-msgstr "請求書"
+msgstr "顧客宛請求書備考"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -965,10 +981,14 @@
 #: ../src/business/business-gnome/dialog-order.c:824
 #: ../src/business/business-gnome/glade/invoice.glade.h:4
 #: ../src/business/business-gnome/glade/job.glade.h:2
-#: ../intl-scm/guile-strings.c:6022 ../intl-scm/guile-strings.c:6364
-#: ../intl-scm/guile-strings.c:6422 ../intl-scm/guile-strings.c:6546
-#: ../intl-scm/guile-strings.c:6888 ../intl-scm/guile-strings.c:6946
-#: ../intl-scm/guile-strings.c:7124 ../intl-scm/guile-strings.c:7364
+#: ../intl-scm/guile-strings.c:6022
+#: ../intl-scm/guile-strings.c:6364
+#: ../intl-scm/guile-strings.c:6422
+#: ../intl-scm/guile-strings.c:6546
+#: ../intl-scm/guile-strings.c:6888
+#: ../intl-scm/guile-strings.c:6946
+#: ../intl-scm/guile-strings.c:7124
+#: ../intl-scm/guile-strings.c:7364
 #, fuzzy
 msgid "Billing ID"
 msgstr "請求日:"
@@ -985,15 +1005,14 @@
 #: ../src/business/business-gnome/dialog-invoice.c:2290
 #: ../src/business/business-gnome/glade/invoice.glade.h:9
 #: ../src/gnome/dialog-find-transactions.c:117
-#, fuzzy
 msgid "Date Posted"
-msgstr "日付の書式"
+msgstr "転記日"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2233
 #: ../src/business/business-gnome/dialog-invoice.c:2263
 #: ../src/business/business-gnome/dialog-invoice.c:2293
 msgid "Is Posted?"
-msgstr ""
+msgstr "転記済?"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2236
 #: ../src/business/business-gnome/dialog-invoice.c:2266
@@ -1007,45 +1026,37 @@
 
 #: ../src/business/business-gnome/dialog-invoice.c:2239
 #: ../src/business/business-gnome/dialog-invoice.c:2269
-#, fuzzy
 msgid "Company Name "
-msgstr "会社のロゴ画像"
+msgstr "会社名 "
 
 #: ../src/business/business-gnome/dialog-invoice.c:2243
 #: ../src/business/business-gnome/glade/invoice.glade.h:14
-#, fuzzy
 msgid "Invoice ID"
-msgstr "請求書"
+msgstr "顧客宛請求書ID"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2248
-#, fuzzy
 msgid "Bill Owner"
-msgstr "請求書"
+msgstr "納入業者請求書オーナー"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2251
-#, fuzzy
 msgid "Bill Notes"
-msgstr "請求書"
+msgstr "納入業者請求書備考"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2273
-#, fuzzy
 msgid "Bill ID"
-msgstr "請求日:"
+msgstr "納入業者請求書ID:"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2278
-#, fuzzy
 msgid "Voucher Owner"
-msgstr "請求書"
+msgstr "立替払請求書オーナー"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2281
-#, fuzzy
 msgid "Voucher Notes"
-msgstr "請求書"
+msgstr "立替払請求書備考"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2303
-#, fuzzy
 msgid "Voucher ID"
-msgstr "請求書"
+msgstr "立替払請求書ID"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
@@ -1055,10 +1066,12 @@
 #: ../src/gnome-utils/gnc-tree-view-account.c:512
 #: ../src/gnome-utils/gnc-tree-view-price.c:459
 #: ../src/register/ledger-core/split-register-model.c:197
-#: ../intl-scm/guile-strings.c:3280 ../intl-scm/guile-strings.c:4434
-#: ../intl-scm/guile-strings.c:6136 ../intl-scm/guile-strings.c:6660
+#: ../intl-scm/guile-strings.c:3280
+#: ../intl-scm/guile-strings.c:4434
+#: ../intl-scm/guile-strings.c:6136
+#: ../intl-scm/guile-strings.c:6660
 msgid "Type"
-msgstr "åž‹"
+msgstr "タイプ"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2313
 #: ../src/register/ledger-core/split-register-model.c:151
@@ -1067,9 +1080,8 @@
 msgstr "空白"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2316
-#, fuzzy
 msgid "Posted"
-msgstr "延期(_P)"
+msgstr "転記済"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2321
 #: ../src/business/business-gnome/dialog-order.c:831
@@ -1089,27 +1101,33 @@
 #: ../src/business/business-gnome/dialog-invoice.c:2323
 #: ../src/business/business-gnome/dialog-order.c:833
 #: ../src/business/business-gnome/glade/payment.glade.h:4
-#: ../src/gnome/glade/lots.glade.h:15 ../src/gnome/reconcile-list.c:222
+#: ../src/gnome/glade/lots.glade.h:15
+#: ../src/gnome/reconcile-list.c:222
 #: ../src/register/ledger-core/split-register-model.c:122
-#: ../intl-scm/guile-strings.c:1986 ../intl-scm/guile-strings.c:2188
-#: ../intl-scm/guile-strings.c:2610 ../intl-scm/guile-strings.c:2812
-#: ../intl-scm/guile-strings.c:3518 ../intl-scm/guile-strings.c:3580
-#: ../intl-scm/guile-strings.c:3772 ../intl-scm/guile-strings.c:3892
-#: ../intl-scm/guile-strings.c:3928 ../intl-scm/guile-strings.c:4672
-#: ../intl-scm/guile-strings.c:4734 ../intl-scm/guile-strings.c:4926
-#: ../intl-scm/guile-strings.c:5046 ../intl-scm/guile-strings.c:5082
+#: ../intl-scm/guile-strings.c:1986
+#: ../intl-scm/guile-strings.c:2188
+#: ../intl-scm/guile-strings.c:2610
+#: ../intl-scm/guile-strings.c:2812
+#: ../intl-scm/guile-strings.c:3518
+#: ../intl-scm/guile-strings.c:3580
+#: ../intl-scm/guile-strings.c:3772
+#: ../intl-scm/guile-strings.c:3892
+#: ../intl-scm/guile-strings.c:3928
+#: ../intl-scm/guile-strings.c:4672
+#: ../intl-scm/guile-strings.c:4734
+#: ../intl-scm/guile-strings.c:4926
+#: ../intl-scm/guile-strings.c:5046
+#: ../intl-scm/guile-strings.c:5082
 msgid "Num"
 msgstr "番号"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2392
-#, fuzzy
 msgid "Find Bill"
-msgstr "Billを検索"
+msgstr "納入業者請求書を検索"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2398
-#, fuzzy
 msgid "Find Expense Voucher"
-msgstr "Expense Voucherを検索"
+msgstr "立替払請求書を検索"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -1118,17 +1136,18 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/dialog-invoice.c:2399
-#: ../intl-scm/guile-strings.c:6100 ../intl-scm/guile-strings.c:6414
-#: ../intl-scm/guile-strings.c:6624 ../intl-scm/guile-strings.c:6938
-#: ../intl-scm/guile-strings.c:7168 ../intl-scm/guile-strings.c:7408
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6100
+#: ../intl-scm/guile-strings.c:6414
+#: ../intl-scm/guile-strings.c:6624
+#: ../intl-scm/guile-strings.c:6938
+#: ../intl-scm/guile-strings.c:7168
+#: ../intl-scm/guile-strings.c:7408
 msgid "Expense Voucher"
-msgstr "Expense Voucher"
+msgstr "立替払請求書"
 
 #: ../src/business/business-gnome/dialog-invoice.c:2404
-#, fuzzy
 msgid "Find Invoice"
-msgstr "Invoiceを検索"
+msgstr "顧客宛請求書を検索"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/general-journal.scm
@@ -1143,7 +1162,8 @@
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/business/business-gnome/dialog-invoice.c:2461
 #: ../src/business/business-gnome/glade/payment.glade.h:1
-#: ../src/gnome/glade/lots.glade.h:6 ../src/gnome/reconcile-list.c:215
+#: ../src/gnome/glade/lots.glade.h:6
+#: ../src/gnome/reconcile-list.c:215
 #: ../src/import-export/generic-import.glade.h:10
 #: ../src/import-export/hbci/glade/hbci.glade.h:8
 #: ../src/import-export/import-main-matcher.c:420
@@ -1151,15 +1171,24 @@
 #: ../src/import-export/import-match-picker.c:374
 #: ../src/import-export/qif-import/druid-qif-import.c:2172
 #: ../src/import-export/qif-import/druid-qif-import.c:2204
-#: ../intl-scm/guile-strings.c:1290 ../intl-scm/guile-strings.c:1996
-#: ../intl-scm/guile-strings.c:2210 ../intl-scm/guile-strings.c:2620
-#: ../intl-scm/guile-strings.c:2834 ../intl-scm/guile-strings.c:3542
-#: ../intl-scm/guile-strings.c:3594 ../intl-scm/guile-strings.c:3696
-#: ../intl-scm/guile-strings.c:3824 ../intl-scm/guile-strings.c:3958
-#: ../intl-scm/guile-strings.c:3996 ../intl-scm/guile-strings.c:4696
-#: ../intl-scm/guile-strings.c:4748 ../intl-scm/guile-strings.c:4850
-#: ../intl-scm/guile-strings.c:4978 ../intl-scm/guile-strings.c:5112
-#: ../intl-scm/guile-strings.c:5150 ../intl-scm/guile-strings.c:6140
+#: ../intl-scm/guile-strings.c:1290
+#: ../intl-scm/guile-strings.c:1996
+#: ../intl-scm/guile-strings.c:2210
+#: ../intl-scm/guile-strings.c:2620
+#: ../intl-scm/guile-strings.c:2834
+#: ../intl-scm/guile-strings.c:3542
+#: ../intl-scm/guile-strings.c:3594
+#: ../intl-scm/guile-strings.c:3696
+#: ../intl-scm/guile-strings.c:3824
+#: ../intl-scm/guile-strings.c:3958
+#: ../intl-scm/guile-strings.c:3996
+#: ../intl-scm/guile-strings.c:4696
+#: ../intl-scm/guile-strings.c:4748
+#: ../intl-scm/guile-strings.c:4850
+#: ../intl-scm/guile-strings.c:4978
+#: ../intl-scm/guile-strings.c:5112
+#: ../intl-scm/guile-strings.c:5150
+#: ../intl-scm/guile-strings.c:6140
 #: ../intl-scm/guile-strings.c:6664
 msgid "Amount"
 msgstr "金額"
@@ -1184,12 +1213,12 @@
 #: ../src/business/business-gnome/dialog-job.c:130
 #, fuzzy
 msgid "The Job must be given a name."
-msgstr "勘定には名前が必要です。"
+msgstr "Jobには名前が必要です。"
 
 #: ../src/business/business-gnome/dialog-job.c:139
 #, fuzzy
 msgid "You must choose an owner for this job."
-msgstr "証券を選択しなければなりません。"
+msgstr "このJobのオーナーを選択しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-job.c:237
 #, fuzzy
@@ -1207,9 +1236,8 @@
 msgstr "Jobを表示/編集する"
 
 #: ../src/business/business-gnome/dialog-job.c:515
-#, fuzzy
 msgid "View Invoices"
-msgstr "Invoicesを表示"
+msgstr "顧客宛請求書を表示"
 
 #: ../src/business/business-gnome/dialog-job.c:524
 #, fuzzy
@@ -1241,7 +1269,7 @@
 #: ../src/business/business-gnome/dialog-order.c:165
 #, fuzzy
 msgid "The Order must be given an ID."
-msgstr "勘定には名前が必要です。"
+msgstr "注文にはIDが必要です。"
 
 #: ../src/business/business-gnome/dialog-order.c:268
 msgid "The Order must have at least one Entry."
@@ -1251,16 +1279,14 @@
 #. * close this order!
 #.
 #: ../src/business/business-gnome/dialog-order.c:287
-msgid ""
-"This order contains entries that have not been invoiced. Are you sure you "
-"want to close it out before you invoice all the entries?"
+msgid "This order contains entries that have not been invoiced. Are you sure you want to close it out before you invoice all the entries?"
 msgstr ""
 
 #. Ok, we can close this.  Ask for verification and set the closed date
 #: ../src/business/business-gnome/dialog-order.c:296
 #, fuzzy
 msgid "Do you really want to close the order?"
-msgstr "本当にこの価格を削除してもよろしいですか?"
+msgstr "本当に注文を閉じてもよろしいですか?"
 
 #: ../src/business/business-gnome/dialog-order.c:297
 #, fuzzy
@@ -1274,7 +1300,7 @@
 #: ../src/business/business-gnome/dialog-order.c:808
 #, fuzzy
 msgid "Order Notes"
-msgstr "注釈"
+msgstr "Order備考"
 
 #: ../src/business/business-gnome/dialog-order.c:810
 #: ../src/business/business-gnome/glade/order.glade.h:5
@@ -1295,7 +1321,7 @@
 #: ../src/business/business-gnome/dialog-order.c:818
 #: ../src/business/business-gnome/glade/order.glade.h:12
 msgid "Order ID"
-msgstr ""
+msgstr "注文ID"
 
 #: ../src/business/business-gnome/dialog-order.c:829
 #: ../src/gnome/lot-viewer.c:616
@@ -1306,12 +1332,10 @@
 #: ../src/business/business-gnome/dialog-order.c:884
 #, fuzzy
 msgid "Find Order"
-msgstr "Orderを検索"
+msgstr "注文を検索"
 
 #: ../src/business/business-gnome/dialog-payment.c:228
-msgid ""
-"You must enter the amount of the payment.  The payment amount must be "
-"greater than zero."
+msgid "You must enter the amount of the payment.  The payment amount must be greater than zero."
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-payment.c:237
@@ -1322,9 +1346,7 @@
 #: ../src/business/business-gnome/dialog-payment.c:245
 #, fuzzy
 msgid "You must select a transfer account from the account tree."
-msgstr ""
-"転送する科目を選択するか、開始残高自己資本科目を\n"
-"選択しなければなりません。"
+msgstr "転送する勘定科目を選択しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-payment.c:253
 #, fuzzy
@@ -1338,16 +1360,11 @@
 
 #: ../src/business/business-gnome/dialog-payment.c:463
 #, c-format
-msgid ""
-"You have no valid \"Post To\" accounts.  Please create an account of type \"%"
-"s\" before you continue to process this payment.  Perhaps you want to create "
-"an Invoice or Bill first?"
+msgid "You have no valid \"Post To\" accounts.  Please create an account of type \"%s\" before you continue to process this payment.  Perhaps you want to create an Invoice or Bill first?"
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-vendor.c:205
-msgid ""
-"You must enter a company name. If this vendor is an individual (and not a "
-"company) you should set the \"company name\" and \"contact name\" the same."
+msgid "You must enter a company name. If this vendor is an individual (and not a company) you should set the \"company name\" and \"contact name\" the same."
 msgstr ""
 
 #: ../src/business/business-gnome/dialog-vendor.c:216
@@ -1356,63 +1373,56 @@
 msgstr "勘定科目の名前を入力しなければなりません。"
 
 #: ../src/business/business-gnome/dialog-vendor.c:294
-#, fuzzy
 msgid "Edit Vendor"
-msgstr "Vendorを編集"
+msgstr "納入御者を編集"
 
 #: ../src/business/business-gnome/dialog-vendor.c:296
 #: ../src/business/business-gnome/glade/vendor.glade.h:9
-#, fuzzy
 msgid "New Vendor"
-msgstr "Vendorを新規作成"
+msgstr "納入業者を新規作成"
 
 #: ../src/business/business-gnome/dialog-vendor.c:646
-#, fuzzy
 msgid "View/Edit Vendor"
-msgstr "Venderを表示/編集する"
+msgstr "納入業者を表示/編集する"
 
 #: ../src/business/business-gnome/dialog-vendor.c:647
 #, fuzzy
 msgid "Vendor's Jobs"
-msgstr "VendorのJob"
+msgstr "納入業者のJob"
 
 #. { N_("Vendor Orders"), order_vendor_cb},
 #: ../src/business/business-gnome/dialog-vendor.c:649
 msgid "Vendor's Bills"
-msgstr ""
+msgstr "納入業者の請求書"
 
 #: ../src/business/business-gnome/dialog-vendor.c:650
 #, fuzzy
 msgid "Pay Bill"
-msgstr "請求書"
+msgstr "納入業者請求書"
 
 #: ../src/business/business-gnome/dialog-vendor.c:661
 msgid "Vendor ID"
-msgstr ""
+msgstr "納入業者ID"
 
 #: ../src/business/business-gnome/dialog-vendor.c:694
-#, fuzzy
 msgid "Find Vendor"
-msgstr "Venderを検索"
+msgstr "納入業者を検索"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:1
-#, fuzzy
 msgid "<b>New Billing Term</b>"
-msgstr "調整"
+msgstr "<b>支払条件の新規作成</b>"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:2
-#, fuzzy
 msgid "<b>Term Definition</b>"
-msgstr "説明"
+msgstr "<b>支払条件の定義</b>"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:3
-#, fuzzy
 msgid "<b>Terms</b>"
-msgstr "番号"
+msgstr "<b>支払条件</b>"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:4
 msgid "Cancel your changes"
-msgstr ""
+msgstr "変更を取り消す"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:5
 msgid "Close this window"
@@ -1423,9 +1433,8 @@
 msgstr ""
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:7
-#, fuzzy
 msgid "Create a new Billing Term"
-msgstr "新しいファイルを作成する"
+msgstr "新しい支払条件を作成する"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:8
 msgid "Cutoff Day: "
@@ -1443,14 +1452,13 @@
 msgstr "説明(_S):"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:13
-#, fuzzy
 msgid "Delete the current Billing Term"
-msgstr "この取引を削除する"
+msgstr "現在の支払条件を削除する"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:15
 #, no-c-format
 msgid "Discount %: "
-msgstr ""
+msgstr "値引き %: "
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:16
 msgid "Discount Day: "
@@ -1469,12 +1477,10 @@
 msgstr ""
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:20
-#, fuzzy
 msgid "Edit the current Billing Term"
-msgstr "現在の価格を編集する"
+msgstr "現在の支払条件を編集する"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:22
-#, fuzzy
 msgid "Table"
 msgstr "表"
 
@@ -1486,18 +1492,17 @@
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/glade/billterms.glade.h:23
 #: ../src/business/business-gnome/glade/invoice.glade.h:23
-#: ../intl-scm/guile-strings.c:6114 ../intl-scm/guile-strings.c:6424
-#: ../intl-scm/guile-strings.c:6638 ../intl-scm/guile-strings.c:6948
-#: ../intl-scm/guile-strings.c:7180 ../intl-scm/guile-strings.c:7420
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6114
+#: ../intl-scm/guile-strings.c:6424
+#: ../intl-scm/guile-strings.c:6638
+#: ../intl-scm/guile-strings.c:6948
+#: ../intl-scm/guile-strings.c:7180
+#: ../intl-scm/guile-strings.c:7420
 msgid "Terms"
-msgstr "åž‹"
+msgstr "支払条件"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:24
-msgid ""
-"The cutoff day for applying bills to the next month.  After the cutoff, "
-"bills are applied to the following month.  Negative values count backwards "
-"from the end of the month."
+msgid "The cutoff day for applying bills to the next month.  After the cutoff, bills are applied to the following month.  Negative values count backwards from the end of the month."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:25
@@ -1522,9 +1527,7 @@
 msgstr ""
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:30
-msgid ""
-"The number of days after the post date during which a discount will be "
-"applied for early payment."
+msgid "The number of days after the post date during which a discount will be applied for early payment."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:31
@@ -1544,16 +1547,15 @@
 #: ../src/gnome/glade/price.glade.h:25
 #: ../src/gnome-utils/glade/commodity.glade.h:22
 msgid "_Type:"
-msgstr "åž‹(_T):"
+msgstr "タイプ(_T):"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:1
 msgid "<b>Bills</b>"
-msgstr ""
+msgstr "<b>納入業者請求書</b>"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:2
-#, fuzzy
 msgid "<b>Invoices</b>"
-msgstr "請求書"
+msgstr "<b>顧客宛請求書</b>"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:3
 #, fuzzy
@@ -1565,9 +1567,7 @@
 msgstr ""
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:5
-msgid ""
-"If checked, each invoice will be opened in its own top level window.  If "
-"clear, the invoice will be opened in the current window."
+msgid "If checked, each invoice will be opened in its own top level window.  If clear, the invoice will be opened in the current window."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:6
@@ -1589,22 +1589,15 @@
 msgstr "価値"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:9
-msgid ""
-"Whether multiple entries in an invoice which transfer to the same account "
-"should be accumulated into a single split by default. This setting can be "
-"changed in the Post dialog."
+msgid "Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default. This setting can be changed in the Post dialog."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:10
-msgid ""
-"Whether tax is included by default in entries on Bills. This setting is "
-"inherited by new customers and vendors."
+msgid "Whether tax is included by default in entries on Bills. This setting is inherited by new customers and vendors."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:11
-msgid ""
-"Whether tax is included by default in entries on Invoices. This setting is "
-"inherited by new customers and vendors."
+msgid "Whether tax is included by default in entries on Invoices. This setting is inherited by new customers and vendors."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:12
@@ -1663,7 +1656,8 @@
 #: ../src/business/business-gnome/glade/date-close.glade.h:1
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:75
 #: ../src/gnome/dialog-find-transactions.c:128
-#: ../src/gnome/dialog-tax-info.c:721 ../src/gnome/glade/lots.glade.h:10
+#: ../src/gnome/dialog-tax-info.c:721
+#: ../src/gnome/glade/lots.glade.h:10
 #: ../src/gnome/reconcile-list.c:219
 #: ../src/gnome-utils/gnc-tree-model-budget.c:102
 #: ../src/gnome-utils/gnc-tree-view-account.c:528
@@ -1674,22 +1668,38 @@
 #: ../src/import-export/qif-import/druid-qif-import.c:2165
 #: ../src/import-export/qif-import/druid-qif-import.c:2197
 #: ../src/register/ledger-core/split-register-model.c:138
-#: ../intl-scm/guile-strings.c:1988 ../intl-scm/guile-strings.c:2190
-#: ../intl-scm/guile-strings.c:2612 ../intl-scm/guile-strings.c:2814
-#: ../intl-scm/guile-strings.c:3282 ../intl-scm/guile-strings.c:3522
-#: ../intl-scm/guile-strings.c:3582 ../intl-scm/guile-strings.c:3700
-#: ../intl-scm/guile-strings.c:3776 ../intl-scm/guile-strings.c:3894
-#: ../intl-scm/guile-strings.c:3934 ../intl-scm/guile-strings.c:4436
-#: ../intl-scm/guile-strings.c:4676 ../intl-scm/guile-strings.c:4736
-#: ../intl-scm/guile-strings.c:4854 ../intl-scm/guile-strings.c:4930
-#: ../intl-scm/guile-strings.c:5048 ../intl-scm/guile-strings.c:5088
-#: ../intl-scm/guile-strings.c:5922 ../intl-scm/guile-strings.c:5950
-#: ../intl-scm/guile-strings.c:6138 ../intl-scm/guile-strings.c:6240
-#: ../intl-scm/guile-strings.c:6268 ../intl-scm/guile-strings.c:6446
-#: ../intl-scm/guile-strings.c:6474 ../intl-scm/guile-strings.c:6662
-#: ../intl-scm/guile-strings.c:6764 ../intl-scm/guile-strings.c:6792
-#: ../intl-scm/guile-strings.c:7024 ../intl-scm/guile-strings.c:7052
-#: ../intl-scm/guile-strings.c:7264 ../intl-scm/guile-strings.c:7292
+#: ../intl-scm/guile-strings.c:1988
+#: ../intl-scm/guile-strings.c:2190
+#: ../intl-scm/guile-strings.c:2612
+#: ../intl-scm/guile-strings.c:2814
+#: ../intl-scm/guile-strings.c:3282
+#: ../intl-scm/guile-strings.c:3522
+#: ../intl-scm/guile-strings.c:3582
+#: ../intl-scm/guile-strings.c:3700
+#: ../intl-scm/guile-strings.c:3776
+#: ../intl-scm/guile-strings.c:3894
+#: ../intl-scm/guile-strings.c:3934
+#: ../intl-scm/guile-strings.c:4436
+#: ../intl-scm/guile-strings.c:4676
+#: ../intl-scm/guile-strings.c:4736
+#: ../intl-scm/guile-strings.c:4854
+#: ../intl-scm/guile-strings.c:4930
+#: ../intl-scm/guile-strings.c:5048
+#: ../intl-scm/guile-strings.c:5088
+#: ../intl-scm/guile-strings.c:5922
+#: ../intl-scm/guile-strings.c:5950
+#: ../intl-scm/guile-strings.c:6138
+#: ../intl-scm/guile-strings.c:6240
+#: ../intl-scm/guile-strings.c:6268
+#: ../intl-scm/guile-strings.c:6446
+#: ../intl-scm/guile-strings.c:6474
+#: ../intl-scm/guile-strings.c:6662
+#: ../intl-scm/guile-strings.c:6764
+#: ../intl-scm/guile-strings.c:6792
+#: ../intl-scm/guile-strings.c:7024
+#: ../intl-scm/guile-strings.c:7052
+#: ../intl-scm/guile-strings.c:7264
+#: ../intl-scm/guile-strings.c:7292
 msgid "Description"
 msgstr "説明"
 
@@ -1699,16 +1709,14 @@
 #: ../src/business/business-gnome/glade/job.glade.h:1
 #: ../src/business/business-gnome/glade/order.glade.h:2
 #: ../src/business/business-gnome/glade/vendor.glade.h:1
-#, fuzzy
 msgid "Active"
-msgstr "取引内容"
+msgstr "アクティブ"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:2
 #: ../src/business/business-gnome/glade/employee.glade.h:4
 #: ../src/business/business-gnome/glade/vendor.glade.h:2
-#, fuzzy
 msgid "Address: "
-msgstr "ユーザの住所"
+msgstr "住所: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:3
 #, fuzzy
@@ -1724,9 +1732,8 @@
 
 #: ../src/business/business-gnome/glade/customer.glade.h:5
 #: ../src/business/business-gnome/glade/vendor.glade.h:3
-#, fuzzy
 msgid "Company Name: "
-msgstr "会社のロゴ画像"
+msgstr "会社名: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:6
 #, fuzzy
@@ -1745,8 +1752,8 @@
 #: ../src/business/business-gnome/glade/invoice.glade.h:6
 #: ../src/business/business-gnome/search-owner.c:236
 #: ../src/register/ledger-core/split-register-model.c:134
-#: ../intl-scm/guile-strings.c:6204 ../intl-scm/guile-strings.c:6728
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6204
+#: ../intl-scm/guile-strings.c:6728
 msgid "Customer"
 msgstr "顧客"
 
@@ -1756,13 +1763,13 @@
 
 #: ../src/business/business-gnome/glade/customer.glade.h:10
 msgid "Discount: "
-msgstr "割引: "
+msgstr "値引き: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:11
 #: ../src/business/business-gnome/glade/employee.glade.h:10
 #: ../src/business/business-gnome/glade/vendor.glade.h:5
 msgid "Email: "
-msgstr "Email: "
+msgstr "メール: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:12
 #: ../src/business/business-gnome/glade/employee.glade.h:13
@@ -1773,15 +1780,14 @@
 #: ../src/business/business-gnome/glade/customer.glade.h:13
 #: ../src/business/business-gnome/glade/employee.glade.h:14
 #: ../src/business/business-gnome/glade/vendor.glade.h:7
-#, fuzzy
 msgid "Identification"
-msgstr "国際"
+msgstr "識別情報"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:14
 #: ../src/business/business-gnome/glade/employee.glade.h:17
 #: ../src/business/business-gnome/glade/vendor.glade.h:8
 msgid "Name: "
-msgstr "名前:"
+msgstr "名前: "
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
@@ -1792,9 +1798,10 @@
 #: ../src/gnome/dialog-find-transactions.c:120
 #: ../src/gnome-utils/gnc-tree-view-account.c:630
 #: ../src/register/ledger-core/split-register-model.c:309
-#: ../intl-scm/guile-strings.c:3288 ../intl-scm/guile-strings.c:4442
+#: ../intl-scm/guile-strings.c:3288
+#: ../intl-scm/guile-strings.c:4442
 msgid "Notes"
-msgstr "注釈"
+msgstr "備考"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:17
 #: ../src/business/business-gnome/glade/vendor.glade.h:11
@@ -1804,19 +1811,16 @@
 #: ../src/business/business-gnome/glade/customer.glade.h:18
 #: ../src/business/business-gnome/glade/employee.glade.h:20
 #: ../src/business/business-gnome/glade/vendor.glade.h:14
-#, fuzzy
 msgid "Phone: "
-msgstr "電話"
+msgstr "Tel: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:19
-#, fuzzy
 msgid "Shipping Address"
-msgstr "顧客住所"
+msgstr "納品先住所"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:20
-#, fuzzy
 msgid "Shipping Information"
-msgstr "価格情報"
+msgstr "納品先情報"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:21
 msgid "Tax Included: "
@@ -1829,13 +1833,11 @@
 #: ../src/business/business-gnome/glade/customer.glade.h:23
 #: ../src/business/business-gnome/glade/vendor.glade.h:17
 msgid "Terms: "
-msgstr ""
+msgstr "支払条件: "
 
 #: ../src/business/business-gnome/glade/customer.glade.h:24
-msgid ""
-"The customer ID number.  If left blank a reasonable number will be chosen "
-"for you"
-msgstr ""
+msgid "The customer ID number.  If left blank a reasonable number will be chosen for you"
+msgstr "顧客のID番号。空白の場合は適当な番号が自動的に入ります"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:25
 msgid "What Tax Table should be applied to this customer?"
@@ -1867,11 +1869,11 @@
 
 #: ../src/business/business-gnome/glade/employee.glade.h:1
 msgid "Access Control"
-msgstr ""
+msgstr "アクセス権制御"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:2
 msgid "Access Control List"
-msgstr ""
+msgstr "アクセス権制御リスト"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:5
 #, fuzzy
@@ -1898,14 +1900,14 @@
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/business/business-gnome/glade/employee.glade.h:11
 #: ../src/business/business-gnome/search-owner.c:238
-#: ../intl-scm/guile-strings.c:6208 ../intl-scm/guile-strings.c:6732
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6208
+#: ../intl-scm/guile-strings.c:6732
 msgid "Employee"
-msgstr "完了"
+msgstr "従業員"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:12
 msgid "Employee Number: "
-msgstr ""
+msgstr "従業員番号: "
 
 #: ../src/business/business-gnome/glade/employee.glade.h:15
 #, fuzzy
@@ -1914,39 +1916,33 @@
 
 #: ../src/business/business-gnome/glade/employee.glade.h:16
 msgid "Language: "
-msgstr ""
+msgstr "言語: "
 
 #: ../src/business/business-gnome/glade/employee.glade.h:19
 #: ../src/business/business-gnome/glade/vendor.glade.h:12
-#, fuzzy
 msgid "Payment Address"
-msgstr "顧客住所"
+msgstr "支払先住所"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:21
-msgid ""
-"The employee ID number.  If left blank a reasonable number will be chosen "
-"for you"
-msgstr ""
+msgid "The employee ID number.  If left blank a reasonable number will be chosen for you"
+msgstr "従業員のID番号。空白の場合は適当な番号が自動的に入ります"
 
 #: ../src/business/business-gnome/glade/employee.glade.h:22
-#, fuzzy
 msgid "Username: "
-msgstr "ユーザ名:"
+msgstr "ユーザ名: "
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:1
 #: ../src/business/business-gnome/glade/order.glade.h:1
-#, fuzzy
 msgid "(owner)"
-msgstr "(なし)"
+msgstr "(オーナー)"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:3
 msgid "Additional to Card:"
 msgstr ""
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:7
-#, fuzzy
 msgid "Customer: "
-msgstr "カスタム"
+msgstr "顧客: "
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:10
 #, fuzzy
@@ -1956,17 +1952,15 @@
 #: ../src/business/business-gnome/glade/invoice.glade.h:11
 #, fuzzy
 msgid "Extra Payments"
-msgstr "支払額:"
+msgstr "超過支払"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:13
-#, fuzzy
 msgid "Invoice Entries"
-msgstr "請求書"
+msgstr "顧客宛請求書エントリ"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:15
-#, fuzzy
 msgid "Invoice Information"
-msgstr "価格情報"
+msgstr "顧客宛請求書情報"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:16
 #: ../src/business/business-gnome/search-owner.c:239
@@ -1982,18 +1976,15 @@
 msgstr ""
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:21
-#, fuzzy
 msgid "Posted Account"
-msgstr "損失科目"
+msgstr "転記済勘定科目"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:22
 msgid "Reset Tax Tables to present Values?"
 msgstr ""
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:24
-msgid ""
-"The invoice ID number.  If left blank a reasonable number will be chosen for "
-"you."
+msgid "The invoice ID number.  If left blank a reasonable number will be chosen for you."
 msgstr ""
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:25
@@ -2029,8 +2020,7 @@
 msgstr "一般情報"
 
 #: ../src/business/business-gnome/glade/job.glade.h:9
-msgid ""
-"The job ID number.  If left blank a reasonable number will be chosen for you"
+msgid "The job ID number.  If left blank a reasonable number will be chosen for you"
 msgstr ""
 
 #: ../src/business/business-gnome/glade/order.glade.h:4
@@ -2039,9 +2029,8 @@
 msgstr "並び替え(_O)"
 
 #: ../src/business/business-gnome/glade/order.glade.h:7
-#, fuzzy
 msgid "Invoices"
-msgstr "請求書"
+msgstr "顧客宛請求書"
 
 #: ../src/business/business-gnome/glade/order.glade.h:8
 #, fuzzy
@@ -2070,17 +2059,18 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/glade/order.glade.h:14
-#: ../intl-scm/guile-strings.c:6112 ../intl-scm/guile-strings.c:6134
-#: ../intl-scm/guile-strings.c:6636 ../intl-scm/guile-strings.c:6658
-#: ../intl-scm/guile-strings.c:7178 ../intl-scm/guile-strings.c:7418
+#: ../intl-scm/guile-strings.c:6112
+#: ../intl-scm/guile-strings.c:6134
+#: ../intl-scm/guile-strings.c:6636
+#: ../intl-scm/guile-strings.c:6658
+#: ../intl-scm/guile-strings.c:7178
+#: ../intl-scm/guile-strings.c:7418
 #, fuzzy
 msgid "Reference"
 msgstr "初期設定"
 
 #: ../src/business/business-gnome/glade/order.glade.h:15
-msgid ""
-"The order ID number.  If left blank a reasonable number will be chosen for "
-"you"
+msgid "The order ID number.  If left blank a reasonable number will be chosen for you"
 msgstr ""
 
 #. Add the columns
@@ -2108,8 +2098,10 @@
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/glade/payment.glade.h:2
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:70
-#: ../src/gnome/druid-loan.c:1786 ../src/gnome/glade/lots.glade.h:8
-#: ../src/gnome/glade/register.glade.h:14 ../src/gnome/reconcile-list.c:226
+#: ../src/gnome/druid-loan.c:1786
+#: ../src/gnome/glade/lots.glade.h:8
+#: ../src/gnome/glade/register.glade.h:14
+#: ../src/gnome/reconcile-list.c:226
 #: ../src/gnome-utils/gnc-tree-view-price.c:447
 #: ../src/import-export/generic-import.glade.h:15
 #: ../src/import-export/import-main-matcher.c:417
@@ -2118,25 +2110,44 @@
 #: ../src/import-export/qif-import/druid-qif-import.c:2159
 #: ../src/import-export/qif-import/druid-qif-import.c:2191
 #: ../src/register/ledger-core/split-register-model.c:101
-#: ../intl-scm/guile-strings.c:1984 ../intl-scm/guile-strings.c:2184
-#: ../intl-scm/guile-strings.c:2426 ../intl-scm/guile-strings.c:2608
-#: ../intl-scm/guile-strings.c:2808 ../intl-scm/guile-strings.c:3050
-#: ../intl-scm/guile-strings.c:3198 ../intl-scm/guile-strings.c:3312
-#: ../intl-scm/guile-strings.c:3510 ../intl-scm/guile-strings.c:3576
-#: ../intl-scm/guile-strings.c:3672 ../intl-scm/guile-strings.c:3764
-#: ../intl-scm/guile-strings.c:3890 ../intl-scm/guile-strings.c:3922
-#: ../intl-scm/guile-strings.c:3990 ../intl-scm/guile-strings.c:4352
-#: ../intl-scm/guile-strings.c:4466 ../intl-scm/guile-strings.c:4664
-#: ../intl-scm/guile-strings.c:4730 ../intl-scm/guile-strings.c:4826
-#: ../intl-scm/guile-strings.c:4918 ../intl-scm/guile-strings.c:5044
-#: ../intl-scm/guile-strings.c:5076 ../intl-scm/guile-strings.c:5144
-#: ../intl-scm/guile-strings.c:5920 ../intl-scm/guile-strings.c:5944
-#: ../intl-scm/guile-strings.c:6130 ../intl-scm/guile-strings.c:6238
-#: ../intl-scm/guile-strings.c:6262 ../intl-scm/guile-strings.c:6444
-#: ../intl-scm/guile-strings.c:6468 ../intl-scm/guile-strings.c:6654
-#: ../intl-scm/guile-strings.c:6762 ../intl-scm/guile-strings.c:6786
-#: ../intl-scm/guile-strings.c:7022 ../intl-scm/guile-strings.c:7046
-#: ../intl-scm/guile-strings.c:7262 ../intl-scm/guile-strings.c:7286
+#: ../intl-scm/guile-strings.c:1984
+#: ../intl-scm/guile-strings.c:2184
+#: ../intl-scm/guile-strings.c:2426
+#: ../intl-scm/guile-strings.c:2608
+#: ../intl-scm/guile-strings.c:2808
+#: ../intl-scm/guile-strings.c:3050
+#: ../intl-scm/guile-strings.c:3198
+#: ../intl-scm/guile-strings.c:3312
+#: ../intl-scm/guile-strings.c:3510
+#: ../intl-scm/guile-strings.c:3576
+#: ../intl-scm/guile-strings.c:3672
+#: ../intl-scm/guile-strings.c:3764
+#: ../intl-scm/guile-strings.c:3890
+#: ../intl-scm/guile-strings.c:3922
+#: ../intl-scm/guile-strings.c:3990
+#: ../intl-scm/guile-strings.c:4352
+#: ../intl-scm/guile-strings.c:4466
+#: ../intl-scm/guile-strings.c:4664
+#: ../intl-scm/guile-strings.c:4730
+#: ../intl-scm/guile-strings.c:4826
+#: ../intl-scm/guile-strings.c:4918
+#: ../intl-scm/guile-strings.c:5044
+#: ../intl-scm/guile-strings.c:5076
+#: ../intl-scm/guile-strings.c:5144
+#: ../intl-scm/guile-strings.c:5920
+#: ../intl-scm/guile-strings.c:5944
+#: ../intl-scm/guile-strings.c:6130
+#: ../intl-scm/guile-strings.c:6238
+#: ../intl-scm/guile-strings.c:6262
+#: ../intl-scm/guile-strings.c:6444
+#: ../intl-scm/guile-strings.c:6468
+#: ../intl-scm/guile-strings.c:6654
+#: ../intl-scm/guile-strings.c:6762
+#: ../intl-scm/guile-strings.c:6786
+#: ../intl-scm/guile-strings.c:7022
+#: ../intl-scm/guile-strings.c:7046
+#: ../intl-scm/guile-strings.c:7262
+#: ../intl-scm/guile-strings.c:7286
 msgid "Date"
 msgstr "日付"
 
@@ -2150,25 +2161,28 @@
 #: ../src/import-export/import-match-picker.c:336
 #: ../src/import-export/import-match-picker.c:376
 #: ../src/register/ledger-core/split-register-model.c:190
-#: ../intl-scm/guile-strings.c:2192 ../intl-scm/guile-strings.c:2816
-#: ../intl-scm/guile-strings.c:3554 ../intl-scm/guile-strings.c:3584
-#: ../intl-scm/guile-strings.c:3708 ../intl-scm/guile-strings.c:3780
-#: ../intl-scm/guile-strings.c:4708 ../intl-scm/guile-strings.c:4738
-#: ../intl-scm/guile-strings.c:4862 ../intl-scm/guile-strings.c:4934
+#: ../intl-scm/guile-strings.c:2192
+#: ../intl-scm/guile-strings.c:2816
+#: ../intl-scm/guile-strings.c:3554
+#: ../intl-scm/guile-strings.c:3584
+#: ../intl-scm/guile-strings.c:3708
+#: ../intl-scm/guile-strings.c:3780
+#: ../intl-scm/guile-strings.c:4708
+#: ../intl-scm/guile-strings.c:4738
+#: ../intl-scm/guile-strings.c:4862
+#: ../intl-scm/guile-strings.c:4934
 msgid "Memo"
 msgstr "摘要"
 
 #: ../src/business/business-gnome/glade/payment.glade.h:5
 #: ../src/business/business-gnome/glade/vendor.glade.h:13
 #: ../src/gnome/window-reconcile.c:443
-#, fuzzy
 msgid "Payment Information"
-msgstr "価格情報"
+msgstr "支払情報"
 
 #: ../src/business/business-gnome/glade/payment.glade.h:6
-#, fuzzy
 msgid "Post To"
-msgstr "延期(_P)"
+msgstr "転記先"
 
 #: ../src/business/business-gnome/glade/payment.glade.h:7
 msgid "Transfer Account"
@@ -2184,9 +2198,7 @@
 msgstr "表"
 
 #: ../src/business/business-gnome/glade/vendor.glade.h:18
-msgid ""
-"The vendor ID number.  If left blank a reasonable number will be chosen for "
-"you"
+msgid "The vendor ID number.  If left blank a reasonable number will be chosen for you"
 msgstr ""
 
 #. src/business/business-reports/owner-report.scm
@@ -2194,13 +2206,14 @@
 #: ../src/business/business-gnome/glade/vendor.glade.h:19
 #: ../src/business/business-gnome/search-owner.c:237
 #: ../src/register/ledger-core/split-register-model.c:136
-#: ../intl-scm/guile-strings.c:6206 ../intl-scm/guile-strings.c:6730
+#: ../intl-scm/guile-strings.c:6206
+#: ../intl-scm/guile-strings.c:6730
 msgid "Vendor"
-msgstr ""
+msgstr "納入業者"
 
 #: ../src/business/business-gnome/glade/vendor.glade.h:20
 msgid "Vendor Number: "
-msgstr ""
+msgstr "納入業者番号: "
 
 #: ../src/business/business-gnome/glade/vendor.glade.h:21
 msgid "What Tax Table should be applied to this vendor?"
@@ -2209,7 +2222,8 @@
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
 #: ../src/business/business-gnome/gncmod-business-gnome.c:135
-#: ../intl-scm/guile-strings.c:5874 ../intl-scm/guile-strings.c:5892
+#: ../intl-scm/guile-strings.c:5874
+#: ../intl-scm/guile-strings.c:5892
 msgid "Business"
 msgstr "ビジネス"
 
@@ -2219,7 +2233,8 @@
 #. src/business/business-reports/gnucash/report/business-reports.scm
 #: ../src/business/business-gnome/gnc-plugin-business.c:148
 #: ../src/business/business-gnome/gnc-plugin-business.c:241
-#: ../intl-scm/guile-strings.c:6124 ../intl-scm/guile-strings.c:6648
+#: ../intl-scm/guile-strings.c:6124
+#: ../intl-scm/guile-strings.c:6648
 msgid "_Business"
 msgstr "ビジネス(_B)"
 
@@ -2229,65 +2244,60 @@
 msgstr "顧客(_C)"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:152
-#, fuzzy
 msgid "_New Customer..."
-msgstr "新規顧客(_N)..."
+msgstr "顧客を新規作成(_N)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:153
 msgid "Open the New Customer dialog"
-msgstr "新規顧客ダイアログを開く"
+msgstr "顧客の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:155
 msgid "_Find Customer..."
-msgstr "顧客の検索(_F)..."
+msgstr "顧客を検索(_F)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:156
 msgid "Open the Find Customer dialog"
-msgstr "顧客検索ダイアログを開く"
+msgstr "顧客の検索ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:158
-#, fuzzy
 msgid "New _Invoice..."
-msgstr "新規請求書(_I)..."
+msgstr "顧客宛請求書を新規作成(_I)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:159
-#, fuzzy
 msgid "Open the New Invoice dialog"
-msgstr "全体の初期設定ダイアログを開く"
+msgstr "顧客宛請求書の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:161
-#, fuzzy
 msgid "Find In_voice..."
-msgstr "請求書の検索(_V)..."
+msgstr "顧客宛請求書を検索(_V)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:162
-#, fuzzy
 msgid "Open the Find Invoice dialog"
-msgstr "全体の初期設定ダイアログを開く"
+msgstr "顧客宛請求書の検索ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:164
 #: ../src/business/business-gnome/gnc-plugin-business.c:188
 #, fuzzy
 msgid "New _Job..."
-msgstr "新規"
+msgstr "Jobを新規作成(_J)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:165
 #: ../src/business/business-gnome/gnc-plugin-business.c:189
 #, fuzzy
 msgid "Open the New Job dialog"
-msgstr "新規ユーザチュートリアルを開く"
+msgstr "Jobの新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:167
 #: ../src/business/business-gnome/gnc-plugin-business.c:191
 #, fuzzy
 msgid "Find Jo_b..."
-msgstr "検索"
+msgstr "Jobを検索(_B)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:168
 #: ../src/business/business-gnome/gnc-plugin-business.c:192
 #, fuzzy
 msgid "Open the Find Job dialog"
-msgstr "期首残高"
+msgstr "Jobの検索ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:170
 #: ../src/business/business-gnome/gnc-plugin-business.c:194
@@ -2303,49 +2313,40 @@
 
 #. Vendor submenu
 #: ../src/business/business-gnome/gnc-plugin-business.c:175
-#, fuzzy
 msgid "_Vendor"
-msgstr "新しい値"
+msgstr "納入業者(_V)"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:176
-#, fuzzy
 msgid "_New Vendor..."
-msgstr "新しい値"
+msgstr "納入業者を新規作成(_N)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:177
-#, fuzzy
 msgid "Open the New Vendor dialog"
-msgstr "新規ユーザチュートリアルを開く"
+msgstr "納入業者の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:179
-#, fuzzy
 msgid "_Find Vendor..."
-msgstr "検索"
+msgstr "納入業者を検索(_F)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:180
-#, fuzzy
 msgid "Open the Find Vendor dialog"
-msgstr "新規ユーザチュートリアルを開く"
+msgstr "納入業者の検索ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:182
-#, fuzzy
 msgid "New _Bill..."
-msgstr "新規ファイル"
+msgstr "納入業者請求書を新規作成(_B)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:183
-#, fuzzy
 msgid "Open the New Bill dialog"
-msgstr "新規Billダイアログを開く"
+msgstr "納入業者請求書の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:185
-#, fuzzy
 msgid "Find Bi_ll..."
-msgstr "検索"
+msgstr "納入業者請求書を検索(_L)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:186
-#, fuzzy
 msgid "Open the Find Bill dialog"
-msgstr "期首残高"
+msgstr "納入業者請求書の検索ダイアログを開く"
 
 #. Employee submenu
 #: ../src/business/business-gnome/gnc-plugin-business.c:199
@@ -2354,41 +2355,35 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:200
 msgid "_New Employee..."
-msgstr "新規従業員(_N)"
+msgstr "従業員を新規作成(_N)"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:201
-#, fuzzy
 msgid "Open the New Employee dialog"
-msgstr "全体の初期設定ダイアログを開く"
+msgstr "従業員の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:203
 msgid "_Find Employee..."
-msgstr "従業員の検索(_F)..."
+msgstr "従業員を検索(_F)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:204
-#, fuzzy
 msgid "Open the Find Employee dialog"
-msgstr "全体の初期設定ダイアログを開く"
+msgstr "従業員の検索ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:206
-#, fuzzy
 msgid "New _Expense Voucher..."
-msgstr "Expense Voucherを新規作成(_E)..."
+msgstr "立替払請求書を新規作成(_E)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:207
-#, fuzzy
 msgid "Open the New Expense Voucher dialog"
-msgstr "Expense Voucherの新規作成ダイアログを開く"
+msgstr "立替払請求書の新規作成ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:209
-#, fuzzy
 msgid "Find Expense _Voucher..."
-msgstr "Expense Voucherを検索(_V)..."
+msgstr "立替払請求書を検索(_V)..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:210
-#, fuzzy
 msgid "Open the Find Expense Voucher dialog"
-msgstr "Expense Voucherの検索ダイアログを開く"
+msgstr "立替払請求書の検索ダイアログを開く"
 
 #. Other menu items
 #: ../src/business/business-gnome/gnc-plugin-business.c:217
@@ -2403,11 +2398,11 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:220
 msgid "_Billing Terms Editor"
-msgstr ""
+msgstr "支払条件エデイタ(_B)"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:221
 msgid "View and edit the list of Billing Terms"
-msgstr ""
+msgstr "支払条件の一覧を表示・編集する"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:223
 msgid "Bills _Due Reminder"
@@ -2419,9 +2414,8 @@
 msgstr "全体の初期設定ダイアログを開く"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:226
-#, fuzzy
 msgid "E_xport"
-msgstr "書き出し"
+msgstr "エクスポート(_X)"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:227
 #, fuzzy
@@ -2461,9 +2455,8 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:242
 #: ../src/business/business-gnome/gnc-plugin-business.c:243
-#, fuzzy
 msgid "Test Search Dialog"
-msgstr "進捗ダイアログをテストする"
+msgstr "検索ダイアログをテスト"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:245
 #, fuzzy
@@ -2494,26 +2487,24 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:254
 #: ../src/business/business-gnome/gnc-plugin-business.c:255
-#, fuzzy
 msgid "Initialize Test Data"
-msgstr "金利"
+msgstr "テストデータを初期化"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:724
 msgid "Export Invoices to XML"
-msgstr ""
+msgstr "顧客宛請求書をXMLにエクスポート"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:759
-#, fuzzy
 msgid "Export Customers to XML"
-msgstr "カスタム"
+msgstr "顧客をXMLにエクスポート"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:791
 msgid "Export Vendors to XML"
-msgstr ""
+msgstr "納入業者をXMLにエクスポート"
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:823
 msgid "Export Employees to XML"
-msgstr ""
+msgstr "従業員をXMLにエクスポート"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:95
 #: ../src/gnome/glade/register.glade.h:51
@@ -2522,69 +2513,59 @@
 
 #. File menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:98
-#, fuzzy
 msgid "New _Invoice"
-msgstr "請求書"
+msgstr "顧客宛請求書を新規作成(_I)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:99
-#, fuzzy
 msgid "Create a new invoice"
-msgstr "新しいファイルを作成する"
+msgstr "新しい顧客宛請求書を作成する"
 
 #. File menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:101
 #: ../src/gnome/gnc-plugin-page-account-tree.c:147
-#, fuzzy
 msgid "New _Account..."
-msgstr "勘定科目の新規作成(_N)..."
+msgstr "勘定科目を新規作成(_N)..."
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:102
 msgid "Create a new account"
 msgstr "新しい勘定科目を作成する"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:104
-#, fuzzy
 msgid "Print Invoice"
-msgstr "印刷プレビュー"
+msgstr "顧客宛請求書を印刷"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:105
-#, fuzzy
 msgid "Make a printable invoice"
-msgstr "請求書を作成"
+msgstr "印刷可能な顧客宛請求書を作成する"
 
 #. Edit menu
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:109
-#, fuzzy
 msgid "_Cut"
-msgstr "カスタム"
+msgstr "切り取り(_C)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:112
-#, fuzzy
 msgid "Copy"
-msgstr "列スパン:"
+msgstr "コピー"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:115
 #: ../src/gnome/gnc-plugin-page-register.c:178
 #: ../src/gnome-utils/gnc-main-window.c:257
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:962
-#, fuzzy
 msgid "_Paste"
-msgstr "日付"
+msgstr "貼り付け(_P)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:118
-#, fuzzy
 msgid "_Edit Invoice"
-msgstr "請求書"
+msgstr "顧客宛請求書を編集(_E)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:119
-#, fuzzy
 msgid "Edit this invoice"
-msgstr "現在の価格を編集する"
+msgstr "この顧客宛請求書を編集する"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:121
 #, fuzzy
 msgid "_Post Invoice"
-msgstr "請求書"
+msgstr "顧客宛請求書をPost"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:122
 msgid "Post this Invoice to your Chart of Accounts"
@@ -2593,7 +2574,7 @@
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:124
 #, fuzzy
 msgid "_Unpost Invoice"
-msgstr "請求書"
+msgstr "顧客宛請求書をUnpost"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:125
 msgid "Unpost this Invoice and make it editable"
@@ -2611,7 +2592,8 @@
 msgstr "現在の文書を再度読み込む"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:132
-#: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2010
+#: ../src/gnome/glade/register.glade.h:79
+#: ../src/gnome/window-reconcile.c:2010
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -2682,9 +2664,8 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:160
 #: ../src/gnome/glade/register.glade.h:80
-#, fuzzy
 msgid "_Date"
-msgstr "日付"
+msgstr "日付(_D)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:161
 #: ../src/gnome/glade/register.glade.h:15
@@ -2694,7 +2675,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:162
 msgid "_Quantity"
-msgstr ""
+msgstr "数量(_Q)"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:163
 #: ../src/register/ledger-core/split-register.c:1717
@@ -2742,9 +2723,8 @@
 msgstr "空白"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:198
-#, fuzzy
 msgid "Post"
-msgstr "延期(_P)"
+msgstr "転記"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:199
 #, fuzzy
@@ -2757,36 +2737,23 @@
 msgstr "株分割"
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:2
-msgid ""
-"If active, at startup GnuCash will check to see whether any bills will "
-"become due soon. If so, it will present the user with a reminder dialog. The "
-"definition of \"soon\" is controlled by the \"Days in Advance\" setting. "
-"Otherwise GnuCash does not check for due bills."
+msgid "If active, at startup GnuCash will check to see whether any bills will become due soon. If so, it will present the user with a reminder dialog. The definition of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash does not check for due bills."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:3
-msgid ""
-"If active, each new invoice will be opened in a new window. Otherwise a new "
-"invoice will be opened as a tab in the main window."
+msgid "If active, each new invoice will be opened in a new window. Otherwise a new invoice will be opened as a tab in the main window."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:4
-msgid ""
-"If active, only the 'active' items in the current class will be searched. "
-"Otherwise all items in the current class will be searched."
+msgid "If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:5
-msgid ""
-"If set to active then tax is included by default in entries of this type. "
-"This setting is inherited by new customers and vendors."
+msgid "If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:6
-msgid ""
-"If this field is active then multiple entries in an invoice that transfer to "
-"the same account will be accumulated into a single split. This field can be "
-"overridden per invoice in the Posting dialog."
+msgid "If this field is active then multiple entries in an invoice that transfer to the same account will be accumulated into a single split. This field can be overridden per invoice in the Posting dialog."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:7
@@ -2800,9 +2767,8 @@
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:9
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:8
-#, fuzzy
 msgid "Search only in active items"
-msgstr "第二編集行色"
+msgstr "アクティブな項目のみを検索"
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:10
 msgid "Show bills due reminder at startup"
@@ -2819,89 +2785,71 @@
 msgstr "表示するデフォルトの帳簿行番号"
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:13
-msgid ""
-"This field defines the number of days in advance that GnuCash will check for "
-"due bills. Its value is only used if the \"Notify when due\" setting is "
-"active."
+msgid "This field defines the number of days in advance that GnuCash will check for due bills. Its value is only used if the \"Notify when due\" setting is active."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:14
-msgid ""
-"This field sets the number of rows to show in an invoice. It does not "
-"actually affect the display of the contents of the window. It is only used "
-"to set the size of the window when first opened."
+msgid "This field sets the number of rows to show in an invoice. It does not actually affect the display of the contents of the window. It is only used to set the size of the window when first opened."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:15
-msgid ""
-"This setting contains the coordinates describing the last location of the "
-"window. The numbers are the X and Y coordinates of the top left corner of "
-"the window, and the width and height of the window."
+msgid "This setting contains the coordinates describing the last location of the window. The numbers are the X and Y coordinates of the top left corner of the window, and the width and height of the window."
 msgstr ""
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:16
 msgid "Window position and size"
-msgstr ""
+msgstr "ウィンドウの位置とサイズ"
 
 #: ../src/business/business-gnome/search-owner.c:163
-#, fuzzy
 msgid "You have not selected an owner"
-msgstr "勘定科目が一つも選択されていません"
+msgstr "オーナーを選択していません"
 
 #: ../src/business/business-gnome/search-owner.c:256
 #: ../src/gnome-search/search-boolean.c:177
 #: ../src/gnome-search/search-reconciled.c:185
 msgid "is"
-msgstr ""
+msgstr "が右の条件を満たす"
 
 #: ../src/business/business-gnome/search-owner.c:257
 #: ../src/gnome-search/search-boolean.c:178
 #: ../src/gnome-search/search-reconciled.c:186
 msgid "is not"
-msgstr ""
+msgstr "が右の条件を満たさない"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:81
 #: ../src/gnome-utils/dialog-transfer.c:1264
 #: ../src/register/ledger-core/split-register.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "The account %s does not allow transactions."
-msgstr ""
-"勘定科目 %s は存在しません。\n"
-"作成しますか?"
+msgstr "勘定科目 %s は取引の対象にできません。"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:82
 #: ../src/register/ledger-core/split-register.c:1499
-#, fuzzy, c-format
+#, c-format
 msgid "The account %s does not exist. Would you like to create it?"
-msgstr ""
-"勘定科目 %s は存在しません。\n"
-"作成しますか?"
+msgstr "勘定科目 %s は存在しません。作成しますか?"
 
 #. XXX: change this based on the ledger type
 #: ../src/business/business-ledger/gncEntryLedger.c:228
 msgid "Hours"
-msgstr ""
+msgstr "時間"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:229
-#, fuzzy
 msgid "Project"
-msgstr "利益"
+msgstr "プロジェクト"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:230
 msgid "Material"
-msgstr ""
+msgstr "材料"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:805
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:485
-#, fuzzy
 msgid "Save the current entry?"
-msgstr "この取引をキャンセルする"
+msgstr "現在のエントリを保存しますか?"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:807
 #, fuzzy
-msgid ""
-"The current transaction has been changed. Would you like to record the "
-"changes before duplicating this entry, or cancel the duplication?"
+msgid "The current transaction has been changed. Would you like to record the changes before duplicating this entry, or cancel the duplication?"
 msgstr ""
 "この取引の情報は変更されました。\n"
 "記録しますか?"
@@ -2910,21 +2858,19 @@
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:504
 #: ../src/gnome/gnc-split-reg.c:726
 #: ../src/register/ledger-core/split-register.c:423
-#, fuzzy
 msgid "_Record"
-msgstr "再ロード"
+msgstr "記録(_R)"
 
 #. Translators: %s is the string "an Account" i.e. its translation.
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:140
 #, c-format
 msgid "Invalid Entry:  You need to supply %s."
-msgstr ""
+msgstr "無効エントリ: %s を入力する必要があります。"
 
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:164
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:170
-#, fuzzy
 msgid "an Account"
-msgstr "親勘定科目"
+msgstr "勘定科目"
 
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:374
 #, fuzzy, c-format
@@ -2935,10 +2881,7 @@
 
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:487
 #, fuzzy
-msgid ""
-"The current entry has been changed.  However, this entry is part of an "
-"existing order. Would you like to record the change and effectively change "
-"your order?"
+msgid "The current entry has been changed.  However, this entry is part of an existing order. Would you like to record the change and effectively change your order?"
 msgstr ""
 "この取引の情報は変更されました。\n"
 "記録しますか?"
@@ -2947,7 +2890,7 @@
 #: ../src/gnome/gnc-split-reg.c:724
 #, fuzzy
 msgid "_Don't Record"
-msgstr "再ロード"
+msgstr "記録しない(_D)"
 
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:589
 #, fuzzy
@@ -2961,84 +2904,73 @@
 #. translate the portion after the ':' and leave the rest
 #. ("sample:") as is.
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:72
-#, fuzzy
 msgid "sample:X"
-msgstr "例:99999"
+msgstr "sample:X"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:74
 #: ../src/register/ledger-core/split-register-layout.c:510
 #: ../src/register/ledger-core/split-register-layout.c:518
-#, fuzzy
 msgid "sample:12/12/2000"
-msgstr "例: 12/12/2000"
+msgstr "sample:12/12/2000"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:77
-#, fuzzy
 msgid "sample:Description of an Entry"
-msgstr "例:取引の説明"
+msgstr "sample:エントリの説明"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:79
-#, fuzzy
 msgid "sample:Action"
-msgstr "取引内容"
+msgstr "sample:動作"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:81
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:85
-#, fuzzy
 msgid "sample:9,999.00"
-msgstr "例:999,999.000"
+msgstr "sample:9,999.00"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:83
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:105
-#, fuzzy
 msgid "sample:999,999.00"
-msgstr "例:999,999.000"
+msgstr "sample:999,999.00"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:88
 #, no-c-format
 msgid "sample(DT):+%"
-msgstr ""
+msgstr "sample(DT):+%"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:91
 #, no-c-format
 msgid "sample(DH):+%"
-msgstr ""
+msgstr "sample(DH):+%"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:94
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:97
 #: ../src/register/ledger-core/split-register-layout.c:579
 #: ../src/register/ledger-core/split-register-layout.c:587
 msgid "sample:Expenses:Automobile:Gasoline"
-msgstr ""
+msgstr "sample:費用:自動車:ガソリン"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:99
-#, fuzzy
 msgid "sample:T?"
-msgstr "例:99999"
+msgstr "sample:T?"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:101
-#, fuzzy
 msgid "sample:TI"
-msgstr "例:99999"
+msgstr "sample:TI"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:103
 msgid "sample:Tax Table 1"
-msgstr ""
+msgstr "sample:税金表1"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:107
-#, fuzzy
 msgid "sample:999.00"
-msgstr "例:999,999.000"
+msgstr "sample:999.00"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:109
-#, fuzzy
 msgid "sample:BI"
-msgstr "例:99999"
+msgstr "sample:BI"
 
 #: ../src/business/business-ledger/gncEntryLedgerLayout.c:111
-#, fuzzy
 msgid "sample:Payment"
-msgstr "支払"
+msgstr "sample:支払"
 
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:49
 msgid "$"
@@ -3051,31 +2983,35 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:50
-#: ../src/gnome/glade/sched-xact.glade.h:3 ../intl-scm/guile-strings.c:5938
-#: ../intl-scm/guile-strings.c:6256 ../intl-scm/guile-strings.c:6462
-#: ../intl-scm/guile-strings.c:6780 ../intl-scm/guile-strings.c:7040
+#: ../src/gnome/glade/sched-xact.glade.h:3
+#: ../intl-scm/guile-strings.c:5938
+#: ../intl-scm/guile-strings.c:6256
+#: ../intl-scm/guile-strings.c:6462
+#: ../intl-scm/guile-strings.c:6780
+#: ../intl-scm/guile-strings.c:7040
 #: ../intl-scm/guile-strings.c:7280
 #, no-c-format
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:59
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:60
 msgid "="
-msgstr ""
+msgstr "="
 
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:61
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. src/report/report-system/report-utilities.scm
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:119
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:510
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:1036
-#: ../src/engine/Account.c:3635 ../intl-scm/guile-strings.c:1366
+#: ../src/engine/Account.c:3635
+#: ../intl-scm/guile-strings.c:1366
 msgid "Cash"
 msgstr "現金"
 
@@ -3085,8 +3021,10 @@
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:122
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:512
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:1038
-#: ../intl-scm/guile-strings.c:124 ../intl-scm/guile-strings.c:140
-#: ../intl-scm/guile-strings.c:3994 ../intl-scm/guile-strings.c:5148
+#: ../intl-scm/guile-strings.c:124
+#: ../intl-scm/guile-strings.c:140
+#: ../intl-scm/guile-strings.c:3994
+#: ../intl-scm/guile-strings.c:5148
 msgid "Charge"
 msgstr "請求"
 
@@ -3095,7 +3033,6 @@
 msgstr "収益勘定科目"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:60
-#, fuzzy
 msgid "Expense Account"
 msgstr "費用勘定科目"
 
@@ -3108,9 +3045,12 @@
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:65
 #: ../src/gnome/dialog-find-transactions.c:122
 #: ../src/register/ledger-core/split-register-model.c:169
-#: ../intl-scm/guile-strings.c:5956 ../intl-scm/guile-strings.c:6274
-#: ../intl-scm/guile-strings.c:6480 ../intl-scm/guile-strings.c:6798
-#: ../intl-scm/guile-strings.c:7058 ../intl-scm/guile-strings.c:7298
+#: ../intl-scm/guile-strings.c:5956
+#: ../intl-scm/guile-strings.c:6274
+#: ../intl-scm/guile-strings.c:6480
+#: ../intl-scm/guile-strings.c:6798
+#: ../intl-scm/guile-strings.c:7058
+#: ../intl-scm/guile-strings.c:7298
 msgid "Action"
 msgstr "取引内容"
 
@@ -3121,25 +3061,28 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:80
-#: ../intl-scm/guile-strings.c:5930 ../intl-scm/guile-strings.c:5974
-#: ../intl-scm/guile-strings.c:6248 ../intl-scm/guile-strings.c:6292
-#: ../intl-scm/guile-strings.c:6454 ../intl-scm/guile-strings.c:6498
-#: ../intl-scm/guile-strings.c:6772 ../intl-scm/guile-strings.c:6816
-#: ../intl-scm/guile-strings.c:7032 ../intl-scm/guile-strings.c:7076
-#: ../intl-scm/guile-strings.c:7272 ../intl-scm/guile-strings.c:7316
-#, fuzzy
+#: ../intl-scm/guile-strings.c:5930
+#: ../intl-scm/guile-strings.c:5974
+#: ../intl-scm/guile-strings.c:6248
+#: ../intl-scm/guile-strings.c:6292
+#: ../intl-scm/guile-strings.c:6454
+#: ../intl-scm/guile-strings.c:6498
+#: ../intl-scm/guile-strings.c:6772
+#: ../intl-scm/guile-strings.c:6816
+#: ../intl-scm/guile-strings.c:7032
+#: ../intl-scm/guile-strings.c:7076
+#: ../intl-scm/guile-strings.c:7272
+#: ../intl-scm/guile-strings.c:7316
 msgid "Discount"
-msgstr "勘定科目"
+msgstr "値引き"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:85
-#, fuzzy
 msgid "Discount Type"
-msgstr "勘定科目型"
+msgstr "値引きタイプ"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:90
-#, fuzzy
 msgid "Discount How"
-msgstr "勘定科目ウィンドウ"
+msgstr "値引き方法"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -3148,12 +3091,14 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:95
-#: ../intl-scm/guile-strings.c:5928 ../intl-scm/guile-strings.c:6246
-#: ../intl-scm/guile-strings.c:6452 ../intl-scm/guile-strings.c:6770
-#: ../intl-scm/guile-strings.c:7030 ../intl-scm/guile-strings.c:7270
-#, fuzzy
+#: ../intl-scm/guile-strings.c:5928
+#: ../intl-scm/guile-strings.c:6246
+#: ../intl-scm/guile-strings.c:6452
+#: ../intl-scm/guile-strings.c:6770
+#: ../intl-scm/guile-strings.c:7030
+#: ../intl-scm/guile-strings.c:7270
 msgid "Unit Price"
-msgstr "価格"
+msgstr "単価"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -3162,19 +3107,25 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:100
-#: ../intl-scm/guile-strings.c:5926 ../intl-scm/guile-strings.c:5962
-#: ../intl-scm/guile-strings.c:6244 ../intl-scm/guile-strings.c:6280
-#: ../intl-scm/guile-strings.c:6450 ../intl-scm/guile-strings.c:6486
-#: ../intl-scm/guile-strings.c:6768 ../intl-scm/guile-strings.c:6804
-#: ../intl-scm/guile-strings.c:7028 ../intl-scm/guile-strings.c:7064
-#: ../intl-scm/guile-strings.c:7268 ../intl-scm/guile-strings.c:7304
+#: ../intl-scm/guile-strings.c:5926
+#: ../intl-scm/guile-strings.c:5962
+#: ../intl-scm/guile-strings.c:6244
+#: ../intl-scm/guile-strings.c:6280
+#: ../intl-scm/guile-strings.c:6450
+#: ../intl-scm/guile-strings.c:6486
+#: ../intl-scm/guile-strings.c:6768
+#: ../intl-scm/guile-strings.c:6804
+#: ../intl-scm/guile-strings.c:7028
+#: ../intl-scm/guile-strings.c:7064
+#: ../intl-scm/guile-strings.c:7268
+#: ../intl-scm/guile-strings.c:7304
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:105
 #, fuzzy
 msgid "Tax Table"
-msgstr "表"
+msgstr "税金表"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:110
 #, fuzzy
@@ -3183,12 +3134,12 @@
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:115
 msgid "Tax Included?"
-msgstr ""
+msgstr "税込み?"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:120
 #, fuzzy
 msgid "Invoiced?"
-msgstr "請求書"
+msgstr "請求済?"
 
 #. src/report/report-system/options-utilities.scm
 #. src/business/business-reports/fancy-invoice.scm
@@ -3198,14 +3149,17 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:125
-#: ../intl-scm/guile-strings.c:1300 ../intl-scm/guile-strings.c:6080
-#: ../intl-scm/guile-strings.c:6346 ../intl-scm/guile-strings.c:6402
-#: ../intl-scm/guile-strings.c:6604 ../intl-scm/guile-strings.c:6870
-#: ../intl-scm/guile-strings.c:6926 ../intl-scm/guile-strings.c:7156
+#: ../intl-scm/guile-strings.c:1300
+#: ../intl-scm/guile-strings.c:6080
+#: ../intl-scm/guile-strings.c:6346
+#: ../intl-scm/guile-strings.c:6402
+#: ../intl-scm/guile-strings.c:6604
+#: ../intl-scm/guile-strings.c:6870
+#: ../intl-scm/guile-strings.c:6926
+#: ../intl-scm/guile-strings.c:7156
 #: ../intl-scm/guile-strings.c:7396
-#, fuzzy
 msgid "Subtotal"
-msgstr "合計"
+msgstr "小計"
 
 #. src/tax/us/de_DE.scm
 #. src/tax/us/gnucash/tax/de_DE.scm
@@ -3216,13 +3170,17 @@
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:130
-#: ../intl-scm/guile-strings.c:96 ../intl-scm/guile-strings.c:100
-#: ../intl-scm/guile-strings.c:6082 ../intl-scm/guile-strings.c:6404
-#: ../intl-scm/guile-strings.c:6606 ../intl-scm/guile-strings.c:6928
-#: ../intl-scm/guile-strings.c:7158 ../intl-scm/guile-strings.c:7398
+#: ../intl-scm/guile-strings.c:96
+#: ../intl-scm/guile-strings.c:100
+#: ../intl-scm/guile-strings.c:6082
+#: ../intl-scm/guile-strings.c:6404
+#: ../intl-scm/guile-strings.c:6606
+#: ../intl-scm/guile-strings.c:6928
+#: ../intl-scm/guile-strings.c:7158
+#: ../intl-scm/guile-strings.c:7398
 #, fuzzy
 msgid "Tax"
-msgstr "税金(_T)"
+msgstr "税金"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:135
 #, fuzzy
@@ -3231,46 +3189,40 @@
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:528
 #, fuzzy
-msgid ""
-"Enter the income/expense account for the Entry, or choose one from the list"
+msgid "Enter the income/expense account for the Entry, or choose one from the list"
 msgstr "移動元の勘定科目を入力するか、リストから選択する"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:541
-#, fuzzy
 msgid "Enter the type of Entry"
-msgstr "入力日付順に並べ替え"
+msgstr "エントリのタイプを入力する"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:577
-#, fuzzy
 msgid "Enter the Entry Description"
-msgstr "説明順に並べる"
+msgstr "エントリの説明を入力する"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:592
-#, fuzzy
 msgid "Enter the Discount Amount"
-msgstr "今月の終了日"
+msgstr "値引き額を入力"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:595
-#, fuzzy
 msgid "Enter the Discount Percent"
-msgstr "株価を入力する"
+msgstr "値引きパーセントを入力"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:598
 msgid "Enter the Discount ... unknown type"
-msgstr ""
+msgstr "値引きを入力 ... 不明タイプ"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:615
 msgid "Discount Type: Monetary Value"
-msgstr ""
+msgstr "値引きタイプ: 金額"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:618
 msgid "Discount Type: Percent"
-msgstr ""
+msgstr "値引きタイプ: パーセント"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:621
-#, fuzzy
 msgid "Select the Discount Type"
-msgstr "勘定科目を選択"
+msgstr "値引きタイプを選択"
 
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:637
 msgid "Tax computed after discount is applied"
@@ -3347,15 +3299,12 @@
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:118
 #, fuzzy, c-format
-msgid ""
-"You must provide a unique name for this Tax Table. Your choice \"%s\" is "
-"already in use."
+msgid "You must provide a unique name for this Tax Table. Your choice \"%s\" is already in use."
 msgstr "金融商品の名前を入力しなければなりません。"
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:144
-#, fuzzy
 msgid "You must choose a Tax Account."
-msgstr "適正な親勘定科目を選択して下さい。"
+msgstr "税金勘定科目を選択して下さい。"
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:534
 #, c-format
@@ -3363,9 +3312,7 @@
 msgstr ""
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:580
-msgid ""
-"You cannot remove the last entry from the tax table. Try deleting the tax "
-"table if you want to do that."
+msgid "You cannot remove the last entry from the tax table. Try deleting the tax table if you want to do that."
 msgstr ""
 
 #: ../src/business/dialog-tax-table/dialog-tax-table.c:587
@@ -3404,41 +3351,38 @@
 "Value $\n"
 "Percent %"
 msgstr ""
+"金額 \\\n"
+"パーセント %"
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:9
-#, fuzzy
 msgid "_Account:"
-msgstr "勘定科目(_A)"
+msgstr "勘定科目(_A):"
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:10
-#, fuzzy
 msgid "_Name: "
-msgstr "名前:"
+msgstr "名前(_N): "
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:11
-#, fuzzy
 msgid "_Type: "
-msgstr "åž‹:"
+msgstr "タイプ(_T): "
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:12
-#, fuzzy
 msgid "_Value: "
-msgstr "価値"
+msgstr "値(_V)"
 
 #: ../src/core-utils/gnc-gkeyfile-utils.c:111
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
-msgstr ""
+msgstr "値 '%s' が小数付きの数値として解釈できません。"
 
 #: ../src/core-utils/gnc-gkeyfile-utils.c:154
 #, c-format
-msgid ""
-"Key file contains key '%s' in group '%s' which has a value that cannot be "
-"interpreted."
+msgid "Key file contains key '%s' in group '%s' which has a value that cannot be interpreted."
 msgstr ""
 
 #. src/report/report-system/report-utilities.scm
-#: ../src/engine/Account.c:3634 ../src/import-export/hbci/gnc-hbci-utils.c:900
+#: ../src/engine/Account.c:3634
+#: ../src/import-export/hbci/gnc-hbci-utils.c:900
 #: ../intl-scm/guile-strings.c:1364
 msgid "Bank"
 msgstr "銀行"
@@ -3463,7 +3407,8 @@
 msgid "Mutual Fund"
 msgstr "投資信託"
 
-#: ../src/engine/Account.c:3641 ../src/gnome-utils/dialog-commodity.c:756
+#: ../src/engine/Account.c:3641
+#: ../src/gnome-utils/dialog-commodity.c:756
 #: ../src/gnome-utils/gnc-tree-view-price.c:441
 msgid "Currency"
 msgstr "通貨"
@@ -3474,8 +3419,10 @@
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
 #: ../src/engine/Account.c:3642
 #: ../src/register/ledger-core/split-register.c:2069
-#: ../intl-scm/guile-strings.c:152 ../intl-scm/guile-strings.c:1380
-#: ../intl-scm/guile-strings.c:1950 ../intl-scm/guile-strings.c:2574
+#: ../intl-scm/guile-strings.c:152
+#: ../intl-scm/guile-strings.c:1380
+#: ../intl-scm/guile-strings.c:1950
+#: ../intl-scm/guile-strings.c:2574
 msgid "Income"
 msgstr "収益"
 
@@ -3492,16 +3439,16 @@
 msgid "Orphaned Gains"
 msgstr "内部留保"
 
-#: ../src/engine/cap-gains.c:250 ../src/engine/cap-gains.c:975
-#: ../src/engine/cap-gains.c:980 ../src/engine/cap-gains.c:981
+#: ../src/engine/cap-gains.c:250
+#: ../src/engine/cap-gains.c:975
+#: ../src/engine/cap-gains.c:980
+#: ../src/engine/cap-gains.c:981
 #, fuzzy
 msgid "Realized Gain/Loss"
 msgstr "内部留保"
 
 #: ../src/engine/cap-gains.c:252
-msgid ""
-"Realized Gains or Losses from Commodity or Trading Accounts that haven't "
-"been recorded elsewhere."
+msgid "Realized Gains or Losses from Commodity or Trading Accounts that haven't been recorded elsewhere."
 msgstr ""
 
 #: ../src/engine/cap-gains.c:585
@@ -3511,13 +3458,13 @@
 #. This is displayed instead of the number of the day of month.
 #: ../src/engine/FreqSpec.c:690
 msgid "last day"
-msgstr ""
+msgstr "最終日"
 
 #. %s is the strftime-string of the one-time date.
 #: ../src/engine/FreqSpec.c:738
 #, c-format
 msgid "Once: %s"
-msgstr ""
+msgstr "1回: %s"
 
 #. %u is the number of intervals
 #: ../src/engine/FreqSpec.c:747
@@ -3525,7 +3472,8 @@
 msgid "Daily (x%u)"
 msgstr "毎日(360)"
 
-#: ../src/engine/FreqSpec.c:752 ../src/engine/Recurrence.c:529
+#: ../src/engine/FreqSpec.c:752
+#: ../src/engine/Recurrence.c:529
 #: ../src/gnome/glade/sched-xact.glade.h:71
 #, fuzzy, c-format
 msgid "Daily"
@@ -3535,7 +3483,7 @@
 #: ../src/engine/FreqSpec.c:772
 #, c-format
 msgid "Weekdays: (x%u)"
-msgstr ""
+msgstr "平日: (x%u)"
 
 #: ../src/engine/FreqSpec.c:777
 #, fuzzy, c-format
@@ -3547,7 +3495,7 @@
 #: ../src/engine/FreqSpec.c:816
 #, c-format
 msgid "Weekly (x%d): %s"
-msgstr ""
+msgstr "毎週 (x%d): %s"
 
 #. Translators: %s is the name of the weekday
 #: ../src/engine/FreqSpec.c:822
@@ -3566,69 +3514,69 @@
 #. (or the string "last day"); %s is the day of
 #. month of the ending month
 #: ../src/engine/FreqSpec.c:852
-#, fuzzy, c-format
+#, c-format
 msgid "Semi-monthly (x%u): %s, %s"
-msgstr "ほぼ毎月"
+msgstr "月2回 (x%u): %s, %s"
 
 #. 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/engine/FreqSpec.c:863
-#, fuzzy, c-format
+#, c-format
 msgid "Semi-monthly: %s, %s"
-msgstr "ほぼ毎月"
+msgstr "月2回: %s, %s"
 
 #. %u is the number of intervals; %u is
 #. the day of month
 #: ../src/engine/FreqSpec.c:879
 #, c-format
 msgid "Monthly (x%u): %u"
-msgstr ""
+msgstr "毎月 (x%u): %u"
 
 #. %u is the day of month
 #: ../src/engine/FreqSpec.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Monthly: %u"
-msgstr "毎月"
+msgstr "毎月: %u"
 
 #. %u is the number of intervals; %u is
 #. the day of month
 #: ../src/engine/FreqSpec.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "Quarterly (x%u): %u"
-msgstr "四半期"
+msgstr "毎四半期 (x%u): %u"
 
 #. %u is the day of month
 #: ../src/engine/FreqSpec.c:905
-#, fuzzy, c-format
+#, c-format
 msgid "Quarterly: %u"
-msgstr "四半期"
+msgstr "毎四半期: %u"
 
 #. %u is the number of intervals; %u is
 #. the day of month
 #: ../src/engine/FreqSpec.c:916
 #, c-format
 msgid "Tri-Yearly (x%u): %u"
-msgstr ""
+msgstr "年3回 (x%u): %u"
 
 #. %u is the day of month
 #: ../src/engine/FreqSpec.c:924
-#, fuzzy, c-format
+#, c-format
 msgid "Tri-Yearly: %u"
-msgstr "毎年"
+msgstr "年3回: %u"
 
 #. %u is the number of intervals; %u
 #. is the day of month
 #: ../src/engine/FreqSpec.c:939
 #, c-format
 msgid "Semi-Yearly (x%u): %u"
-msgstr ""
+msgstr "年2回 (x%u): %u"
 
 #. %u is the day of month
 #: ../src/engine/FreqSpec.c:947
 #, c-format
 msgid "Semi-Yearly: %u"
-msgstr ""
+msgstr "年2回: %u"
 
 #. FIXME: This string *must* be translated for
 #. en_GB, en_AU and everywhere else with the
@@ -3642,16 +3590,17 @@
 #: ../src/engine/FreqSpec.c:970
 #, c-format
 msgid "Yearly (x%u): %s/%u"
-msgstr ""
+msgstr "毎年 (x%u): %s/%u"
 
 #. %s is the abbreviated name of the
 #. month; %u is the day of month
 #: ../src/engine/FreqSpec.c:980
-#, fuzzy, c-format
+#, c-format
 msgid "Yearly: %s/%u"
-msgstr "毎年"
+msgstr "毎年: %s/%u"
 
-#: ../src/engine/gnc-budget.c:132 ../src/gnome/gnc-plugin-page-budget.c:846
+#: ../src/engine/gnc-budget.c:132
+#: ../src/gnome/gnc-plugin-page-budget.c:846
 #, fuzzy
 msgid "Unnamed Budget"
 msgstr "予算"
@@ -3703,7 +3652,8 @@
 "They must be at least 'rwx' for the user.\n"
 msgstr ""
 
-#: ../src/engine/Recurrence.c:427 ../src/gnome/glade/fincalc.glade.h:45
+#: ../src/engine/Recurrence.c:427
+#: ../src/gnome/glade/fincalc.glade.h:45
 #: ../src/gnome/glade/sched-xact.glade.h:190
 msgid "Weekly"
 msgstr "毎週"
@@ -3713,22 +3663,25 @@
 #. translators: %u is the number of intervals
 #. translators: %u is the recurrence multipler.
 #. translators: %u is the recurrence multiplier.
-#: ../src/engine/Recurrence.c:431 ../src/engine/Recurrence.c:505
-#: ../src/engine/Recurrence.c:533 ../src/engine/Recurrence.c:546
+#: ../src/engine/Recurrence.c:431
+#: ../src/engine/Recurrence.c:505
+#: ../src/engine/Recurrence.c:533
+#: ../src/engine/Recurrence.c:546
 #: ../src/engine/Recurrence.c:560
-#, fuzzy, c-format
+#, c-format
 msgid " (x%u)"
-msgstr "毎日(360)"
+msgstr " (x%u)"
 
 #. translators: %s is an already-localized form of the day of the week.
 #: ../src/engine/Recurrence.c:463
-#, fuzzy, c-format
+#, c-format
 msgid "last %s"
-msgstr "合計 %s"
+msgstr "最終 %s"
 
-#: ../src/engine/Recurrence.c:500 ../src/gnome/glade/fincalc.glade.h:42
+#: ../src/engine/Recurrence.c:500
+#: ../src/gnome/glade/fincalc.glade.h:42
 msgid "Semi-monthly"
-msgstr "ほぼ毎月"
+msgstr "月2回"
 
 #. translators: %d is the number of Recurrences in the list.
 #: ../src/engine/Recurrence.c:515
@@ -3736,24 +3689,29 @@
 msgid "Unknown, %d-size list."
 msgstr ""
 
-#: ../src/engine/Recurrence.c:526 ../src/gnome/glade/sched-xact.glade.h:130
-#, fuzzy
+#: ../src/engine/Recurrence.c:526
+#: ../src/gnome/glade/sched-xact.glade.h:130
 msgid "Once"
-msgstr "オンライン"
+msgstr "1回"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Recurrence.c:542 ../src/gnome/glade/fincalc.glade.h:33
-#: ../src/gnome/glade/sched-xact.glade.h:111 ../intl-scm/guile-strings.c:3724
-#: ../intl-scm/guile-strings.c:3726 ../intl-scm/guile-strings.c:4878
+#: ../src/engine/Recurrence.c:542
+#: ../src/gnome/glade/fincalc.glade.h:33
+#: ../src/gnome/glade/sched-xact.glade.h:111
+#: ../intl-scm/guile-strings.c:3724
+#: ../intl-scm/guile-strings.c:3726
+#: ../intl-scm/guile-strings.c:4878
 #: ../intl-scm/guile-strings.c:4880
 msgid "Monthly"
 msgstr "毎月"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Recurrence.c:556 ../intl-scm/guile-strings.c:3732
-#: ../intl-scm/guile-strings.c:3734 ../intl-scm/guile-strings.c:4886
+#: ../src/engine/Recurrence.c:556
+#: ../intl-scm/guile-strings.c:3732
+#: ../intl-scm/guile-strings.c:3734
+#: ../intl-scm/guile-strings.c:4886
 #: ../intl-scm/guile-strings.c:4888
 msgid "Yearly"
 msgstr "毎年"
@@ -3770,19 +3728,24 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/engine/Split.c:1244 ../src/engine/Split.c:1261
-#: ../intl-scm/guile-strings.c:3884 ../intl-scm/guile-strings.c:3906
-#: ../intl-scm/guile-strings.c:5038 ../intl-scm/guile-strings.c:5060
+#: ../src/engine/Split.c:1244
+#: ../src/engine/Split.c:1261
+#: ../intl-scm/guile-strings.c:3884
+#: ../intl-scm/guile-strings.c:3906
+#: ../intl-scm/guile-strings.c:5038
+#: ../intl-scm/guile-strings.c:5060
 msgid "-- Split Transaction --"
-msgstr "-- 諸口の取引 --"
+msgstr "-- 複合取引 --"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Split.c:1277 ../src/gnome/druid-stock-split.c:454
+#: ../src/engine/Split.c:1277
+#: ../src/gnome/druid-stock-split.c:454
 #: ../src/gnome/glade/register.glade.h:67
 #: ../src/gnome/gnc-plugin-page-register.c:328
 #: ../src/register/ledger-core/split-register.c:2072
-#: ../intl-scm/guile-strings.c:3502 ../intl-scm/guile-strings.c:4656
+#: ../intl-scm/guile-strings.c:3502
+#: ../intl-scm/guile-strings.c:4656
 msgid "Split"
 msgstr "諸口"
 
@@ -3798,15 +3761,12 @@
 msgstr "取引出納帳"
 
 #: ../src/gnome/dialog-chart-export.c:233
-#, fuzzy
 msgid "Export Chart of Accounts to QSF XML"
-msgstr "新しい勘定科目セットを作成する"
+msgstr "勘定科目のグラフをQSF XMLにエクスポートする"
 
 #: ../src/gnome/dialog-commodities.c:135
 #, fuzzy
-msgid ""
-"That commodity is currently used by at least one of your accounts. You may "
-"not delete it."
+msgid "That commodity is currently used by at least one of your accounts. You may not delete it."
 msgstr ""
 "その金融商品は少なくとも1つ以上の\n"
 "勘定科目で使用されています。\n"
@@ -3814,9 +3774,7 @@
 
 #: ../src/gnome/dialog-commodities.c:149
 #, fuzzy
-msgid ""
-"This commodity has price quotes. Are you sure you want to delete the "
-"selected commodity and its price quotes?"
+msgid "This commodity has price quotes. Are you sure you want to delete the selected commodity and its price quotes?"
 msgstr "本当にこの金融商品を削除しますか?"
 
 #: ../src/gnome/dialog-commodities.c:154
@@ -3830,15 +3788,11 @@
 msgstr "金融商品"
 
 #: ../src/gnome/dialog-fincalc.c:308
-msgid ""
-"This program can only calculate one value at a time. You must enter values "
-"for all but one quantity."
+msgid "This program can only calculate one value at a time. You must enter values for all but one quantity."
 msgstr ""
 
 #: ../src/gnome/dialog-fincalc.c:310
-msgid ""
-"GnuCash cannot determine the value in one of the fields. You must enter a "
-"valid expression."
+msgid "GnuCash cannot determine the value in one of the fields. You must enter a valid expression."
 msgstr ""
 
 #: ../src/gnome/dialog-fincalc.c:349
@@ -3854,7 +3808,6 @@
 msgstr "支払回数に負の数は指定できません。"
 
 #: ../src/gnome/dialog-find-transactions.c:99
-#, fuzzy
 msgid "All Accounts"
 msgstr "全勘定科目"
 
@@ -3875,22 +3828,32 @@
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/gnome/dialog-find-transactions.c:103
-#: ../src/gnome/druid-stock-split.c:609 ../src/gnome-utils/gnc-icons.c:16
+#: ../src/gnome/druid-stock-split.c:609
+#: ../src/gnome-utils/gnc-icons.c:16
 #: ../src/import-export/hbci/gnc-hbci-utils.c:899
 #: ../src/import-export/import-main-matcher.c:418
 #: ../src/import-export/import-match-picker.c:332
 #: ../src/import-export/qif-import/dialog-account-picker.c:288
 #: ../src/import-export/qif-import/druid-qif-import.c:2131
 #: ../src/register/ledger-core/split-register-model.c:176
-#: ../intl-scm/guile-strings.c:1990 ../intl-scm/guile-strings.c:2012
-#: ../intl-scm/guile-strings.c:2438 ../intl-scm/guile-strings.c:2614
-#: ../intl-scm/guile-strings.c:2636 ../intl-scm/guile-strings.c:3062
-#: ../intl-scm/guile-strings.c:3364 ../intl-scm/guile-strings.c:3586
-#: ../intl-scm/guile-strings.c:3896 ../intl-scm/guile-strings.c:3940
-#: ../intl-scm/guile-strings.c:4006 ../intl-scm/guile-strings.c:4518
-#: ../intl-scm/guile-strings.c:4740 ../intl-scm/guile-strings.c:5050
-#: ../intl-scm/guile-strings.c:5094 ../intl-scm/guile-strings.c:5160
-#: ../intl-scm/guile-strings.c:6126 ../intl-scm/guile-strings.c:6650
+#: ../intl-scm/guile-strings.c:1990
+#: ../intl-scm/guile-strings.c:2012
+#: ../intl-scm/guile-strings.c:2438
+#: ../intl-scm/guile-strings.c:2614
+#: ../intl-scm/guile-strings.c:2636
+#: ../intl-scm/guile-strings.c:3062
+#: ../intl-scm/guile-strings.c:3364
+#: ../intl-scm/guile-strings.c:3586
+#: ../intl-scm/guile-strings.c:3896
+#: ../intl-scm/guile-strings.c:3940
+#: ../intl-scm/guile-strings.c:4006
+#: ../intl-scm/guile-strings.c:4518
+#: ../intl-scm/guile-strings.c:4740
+#: ../intl-scm/guile-strings.c:5050
+#: ../intl-scm/guile-strings.c:5094
+#: ../intl-scm/guile-strings.c:5160
+#: ../intl-scm/guile-strings.c:6126
+#: ../intl-scm/guile-strings.c:6650
 msgid "Account"
 msgstr "勘定科目"
 
@@ -3907,9 +3870,8 @@
 msgstr "照合"
 
 #: ../src/gnome/dialog-find-transactions.c:111
-#, fuzzy
 msgid "Share Price"
-msgstr "新規価格:"
+msgstr "株価"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
@@ -3924,14 +3886,22 @@
 #: ../src/gnome/dialog-find-transactions.c:113
 #: ../src/gnome/druid-stock-split.c:621
 #: ../src/register/ledger-core/split-register-model.c:239
-#: ../intl-scm/guile-strings.c:1992 ../intl-scm/guile-strings.c:2206
-#: ../intl-scm/guile-strings.c:2616 ../intl-scm/guile-strings.c:2830
-#: ../intl-scm/guile-strings.c:3372 ../intl-scm/guile-strings.c:3534
-#: ../intl-scm/guile-strings.c:3590 ../intl-scm/guile-strings.c:3808
-#: ../intl-scm/guile-strings.c:3900 ../intl-scm/guile-strings.c:3946
-#: ../intl-scm/guile-strings.c:4526 ../intl-scm/guile-strings.c:4688
-#: ../intl-scm/guile-strings.c:4744 ../intl-scm/guile-strings.c:4962
-#: ../intl-scm/guile-strings.c:5054 ../intl-scm/guile-strings.c:5100
+#: ../intl-scm/guile-strings.c:1992
+#: ../intl-scm/guile-strings.c:2206
+#: ../intl-scm/guile-strings.c:2616
+#: ../intl-scm/guile-strings.c:2830
+#: ../intl-scm/guile-strings.c:3372
+#: ../intl-scm/guile-strings.c:3534
+#: ../intl-scm/guile-strings.c:3590
+#: ../intl-scm/guile-strings.c:3808
+#: ../intl-scm/guile-strings.c:3900
+#: ../intl-scm/guile-strings.c:3946
+#: ../intl-scm/guile-strings.c:4526
+#: ../intl-scm/guile-strings.c:4688
+#: ../intl-scm/guile-strings.c:4744
+#: ../intl-scm/guile-strings.c:4962
+#: ../intl-scm/guile-strings.c:5054
+#: ../intl-scm/guile-strings.c:5100
 msgid "Shares"
 msgstr "株式"
 
@@ -3942,8 +3912,10 @@
 #: ../src/gnome/dialog-find-transactions.c:115
 #: ../src/gnome/dialog-sx-since-last-run.c:964
 #: ../src/gnome/glade/lots.glade.h:18
-#: ../src/gnome/glade/sched-xact.glade.h:185 ../intl-scm/guile-strings.c:2448
-#: ../intl-scm/guile-strings.c:3072 ../intl-scm/guile-strings.c:3378
+#: ../src/gnome/glade/sched-xact.glade.h:185
+#: ../intl-scm/guile-strings.c:2448
+#: ../intl-scm/guile-strings.c:3072
+#: ../intl-scm/guile-strings.c:3378
 #: ../intl-scm/guile-strings.c:4532
 msgid "Value"
 msgstr "価値"
@@ -3952,13 +3924,13 @@
 #. src/report/standard-reports/transaction.scm
 #: ../src/gnome/dialog-find-transactions.c:124
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:10
-#: ../intl-scm/guile-strings.c:3704 ../intl-scm/guile-strings.c:4858
+#: ../intl-scm/guile-strings.c:3704
+#: ../intl-scm/guile-strings.c:4858
 msgid "Number"
 msgstr "番号"
 
 #: ../src/gnome/dialog-find-transactions.c:169
 #: ../src/gnome-search/dialog-search.c:1089
-#, fuzzy
 msgid "Find Transaction"
 msgstr "取引を検索"
 
@@ -4005,26 +3977,22 @@
 #. * that other format.
 #: ../src/gnome/dialog-print-check.c:1091
 #, c-format
-msgid ""
-"The guids in the %s check format file '%s' and the %s check format file '%s' "
-"match."
+msgid "The guids in the %s check format file '%s' and the %s check format file '%s' match."
 msgstr ""
 
 #. Translators: This is a directory name. It may be presented to
 #. * the user to indicate that some data file was defined by the
 #. * gnucash application.
 #: ../src/gnome/dialog-print-check.c:1128
-#, fuzzy
 msgid "application"
-msgstr "取引の複製"
+msgstr "application"
 
 #. Translators: This is a directory name. It may be presented to
 #. * the user to indicate that some data file was defined by a
 #. * user herself.
 #: ../src/gnome/dialog-print-check.c:1136
-#, fuzzy
 msgid "user"
-msgstr "カスタム"
+msgstr "user"
 
 #: ../src/gnome/dialog-print-check.c:1159
 #: ../src/gnome/dialog-print-check.c:2078
@@ -4032,11 +4000,13 @@
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../src/gnome/dialog-progress.c:331 ../src/gnome/dialog-progress.c:334
+#: ../src/gnome/dialog-progress.c:331
+#: ../src/gnome/dialog-progress.c:334
 msgid "Complete"
 msgstr "完了"
 
-#: ../src/gnome/dialog-sx-editor.c:186 ../src/gnome/glade/price.glade.h:22
+#: ../src/gnome/dialog-sx-editor.c:186
+#: ../src/gnome/glade/price.glade.h:22
 #: ../src/gnome/glade/register.glade.h:85
 #: ../src/gnome/gnc-plugin-page-sx-list.c:122
 #: ../src/gnome-utils/gnc-main-window.c:221
@@ -4045,26 +4015,26 @@
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/gnome/dialog-sx-editor.c:187 ../src/gnome/window-reconcile.c:1995
+#: ../src/gnome/dialog-sx-editor.c:187
+#: ../src/gnome/window-reconcile.c:1995
 msgid "_Transaction"
 msgstr "取引(_T)"
 
-#: ../src/gnome/dialog-sx-editor.c:188 ../src/gnome/glade/register.glade.h:101
+#: ../src/gnome/dialog-sx-editor.c:188
+#: ../src/gnome/glade/register.glade.h:101
 #: ../src/gnome-utils/gnc-main-window.c:222
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/gnome/dialog-sx-editor.c:189 ../src/gnome/glade/register.glade.h:74
+#: ../src/gnome/dialog-sx-editor.c:189
+#: ../src/gnome/glade/register.glade.h:74
 #: ../src/gnome-utils/gnc-main-window.c:223
 msgid "_Actions"
 msgstr "アクション(_A)"
 
 #: ../src/gnome/dialog-sx-editor.c:219
-#, fuzzy
 msgid "This SX has changed; are you sure you want to cancel?"
-msgstr ""
-"勘定の貸借がが合いません。\n"
-"本当に終了してよろしいですか?"
+msgstr "この予定取引は変更されています。本当に取り消してよろしいですか?"
 
 #: ../src/gnome/dialog-sx-editor.c:636
 #, fuzzy, c-format
@@ -4076,37 +4046,27 @@
 msgid "Couldn't parse debit formula for split \"%s\"."
 msgstr ""
 
-#: ../src/gnome/dialog-sx-editor.c:696 ../src/gnome/dialog-sx-from-trans.c:270
-msgid ""
-"The Scheduled Transaction Editor cannot automatically balance this "
-"transaction. Should it still be entered?"
+#: ../src/gnome/dialog-sx-editor.c:696
+#: ../src/gnome/dialog-sx-from-trans.c:270
+msgid "The Scheduled Transaction Editor cannot automatically balance this transaction. Should it still be entered?"
 msgstr ""
 
 #: ../src/gnome/dialog-sx-editor.c:715
-#, fuzzy
 msgid "Please name the Scheduled Transaction."
-msgstr "取引全体を削除する"
+msgstr "予定取引に名前をつけてください"
 
 #: ../src/gnome/dialog-sx-editor.c:741
 #, fuzzy, c-format
-msgid ""
-"A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
-"you want to name this one the same?"
-msgstr ""
-"ファイル \n"
-"    %s\n"
-" はすで存在します。\n"
-" 本当に上書きしてよろしいですか?"
+msgid "A Scheduled Transaction with the name \"%s\" already exists. Are you sure you want to name this one the same?"
+msgstr "\"%s\" という名前の予定取引は既に存在します。本当に同じ名前をつけてよろしいですか?"
 
 #: ../src/gnome/dialog-sx-editor.c:770
 msgid "Scheduled Transactions with variables cannot be automatically created."
-msgstr ""
+msgstr "変数を含んだ予定取引は自動作成できません。"
 
 #: ../src/gnome/dialog-sx-editor.c:779
-msgid ""
-"Scheduled Transactions without a template transaction cannot be "
-"automatically created."
-msgstr ""
+msgid "Scheduled Transactions without a template transaction cannot be automatically created."
+msgstr "テンプレート取引のない予定取引は自動作成できません。"
 
 #: ../src/gnome/dialog-sx-editor.c:793
 msgid "Please provide a valid end selection."
@@ -4118,16 +4078,12 @@
 
 #: ../src/gnome/dialog-sx-editor.c:817
 #, c-format
-msgid ""
-"The number of remaining occurrences (%d) is greater than the number of total "
-"occurrences (%d)."
+msgid "The number of remaining occurrences (%d) is greater than the number of total occurrences (%d)."
 msgstr ""
 
 #: ../src/gnome/dialog-sx-editor.c:848
-msgid ""
-"You have attempted to create a Scheduled Transaction which will never run. "
-"Do you really want to do this?"
-msgstr ""
+msgid "You have attempted to create a Scheduled Transaction which will never run. Do you really want to do this?"
+msgstr "実行されることのない予定取引を作成しようとしています。本当に作成してよろしいですか?"
 
 #: ../src/gnome/dialog-sx-editor.c:1342
 #, fuzzy
@@ -4135,96 +4091,72 @@
 msgstr "(なし)"
 
 #: ../src/gnome/dialog-sx-editor.c:1493
-#, fuzzy
-msgid ""
-"The current template transaction has been changed. Would you like to record "
-"the changes?"
-msgstr ""
-"この取引の情報は変更されました。\n"
-"記録しますか?"
+msgid "The current template transaction has been changed. Would you like to record the changes?"
+msgstr "現在のテンプレート取引は変更されました。変更を記録しますか?"
 
 #: ../src/gnome/dialog-sx-editor.c:1726
 #: ../src/gnome/gnc-plugin-page-sx-list.c:197
-#, fuzzy
 msgid "Scheduled Transactions"
-msgstr "実際の取引"
+msgstr "予定取引"
 
 #: ../src/gnome/dialog-sx-from-trans.c:553
-msgid ""
-"The Scheduled Transaction is unbalanced. You are strongly encouraged to "
-"correct this situation."
+msgid "The Scheduled Transaction is unbalanced. You are strongly encouraged to correct this situation."
 msgstr ""
 
 #: ../src/gnome/dialog-sx-from-trans.c:771
-msgid ""
-"Cannot create a Scheduled Transaction from a Transaction currently being "
-"edited. Please Enter the Transaction before Scheduling."
+msgid "Cannot create a Scheduled Transaction from a Transaction currently being edited. Please Enter the Transaction before Scheduling."
 msgstr ""
 
 #: ../src/gnome/dialog-sx-since-last-run.c:374
-#, fuzzy
 msgid "Ignored"
-msgstr "所得"
+msgstr "無視"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:375
-#, fuzzy
 msgid "Postponed"
-msgstr "延期(_P)"
+msgstr "延期"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:376
-#, fuzzy
 msgid "To-Create"
-msgstr "リベート"
+msgstr "作成予定"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:377
-#, fuzzy
 msgid "Reminder"
-msgstr "帳簿"
+msgstr "リマインダ"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:378
-#, fuzzy
 msgid "Created"
-msgstr "リベート"
+msgstr "作成済"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:441
-#, fuzzy
 msgid "Never"
-msgstr "前年度の終了日"
+msgstr ""
 
 #: ../src/gnome/dialog-sx-since-last-run.c:511
-#, fuzzy
 msgid "(Need Value)"
-msgstr "新しい値"
+msgstr "(未入力)"
 
 #. Translators: %d is the number of transactions. This is a
 #. ngettext(3) message.
 #: ../src/gnome/dialog-sx-since-last-run.c:807
 #: ../src/gnome/gnc-plugin-basic-commands.c:480
 #, c-format
-msgid ""
-"There are no Scheduled Transactions to be entered at this time. (%d "
-"transaction automatically created)"
-msgid_plural ""
-"There are no Scheduled Transactions to be entered at this time. (%d "
-"transactions automatically created)"
+msgid "There are no Scheduled Transactions to be entered at this time. (%d transaction automatically created)"
+msgid_plural "There are no Scheduled Transactions to be entered at this time. (%d transactions automatically created)"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/gnome/dialog-sx-since-last-run.c:929
-#, fuzzy
 msgid "Transaction"
-msgstr "取引(_T)"
+msgstr "取引"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:945
 #: ../src/gnome/glade/register.glade.h:70
-#, fuzzy
 msgid "Status"
-msgstr "日付"
+msgstr "状態"
 
 #: ../src/gnome/dialog-sx-since-last-run.c:1003
-#, fuzzy
 msgid "Created Transactions"
-msgstr "取引の貼付け"
+msgstr "作成した取引"
 
 #: ../src/gnome/dialog-tax-info.c:717
 msgid "Form"
@@ -4236,31 +4168,22 @@
 
 #: ../src/gnome/druid-acct-period.c:243
 #, c-format
-msgid ""
-"The earliest transaction date found in this book is %s. Based on the "
-"selection made above, this book will be split into %d books.  Click on "
-"'Forward' to start closing the earliest book."
+msgid "The earliest transaction date found in this book is %s. Based on the selection made above, this book will be split into %d books.  Click on 'Forward' to start closing the earliest book."
 msgstr ""
 
 #: ../src/gnome/druid-acct-period.c:290
 #, c-format
-msgid ""
-"You have asked for a book to be created.  This book will contain all "
-"transactions up to midnight %s (for a total of %d transactions spread over %"
-"d accounts). Click on 'Forward' to create this book. Click on 'Back' to "
-"adjust the dates."
+msgid "You have asked for a book to be created.  This book will contain all transactions up to midnight %s (for a total of %d transactions spread over %d accounts). Click on 'Forward' to create this book. Click on 'Back' to adjust the dates."
 msgstr ""
 
 #: ../src/gnome/druid-acct-period.c:308
 #, fuzzy, c-format
 msgid "Period %s - %s"
-msgstr "期間 %s から %s まで"
+msgstr "期間 %s 〜 %s"
 
 #: ../src/gnome/druid-acct-period.c:361
 #, fuzzy
-msgid ""
-"You must select closing date that is greater than the closing date of the "
-"previous book."
+msgid "You must select closing date that is greater than the closing date of the previous book."
 msgstr "金融商品の種類を選択して下さい。"
 
 #: ../src/gnome/druid-acct-period.c:372
@@ -4290,39 +4213,36 @@
 msgstr "閉じる"
 
 #: ../src/gnome/druid-hierarchy.c:397
-#, fuzzy
 msgid "Selected"
-msgstr "選択..."
+msgstr "選択済"
 
 #: ../src/gnome/druid-hierarchy.c:409
 #: ../src/gnome-utils/gnc-tree-view-account.c:1859
 msgid "Account Types"
-msgstr "勘定科目型"
+msgstr "勘定科目のタイプ"
 
 #. Translators: '%s' is the name of the selected account hierarchy template.
 #: ../src/gnome/druid-hierarchy.c:486
-#, fuzzy, c-format
+#, c-format
 msgid "Accounts in '%s'"
-msgstr "勘定科目型"
+msgstr "'%s' 内の勘定科目"
 
 #: ../src/gnome/druid-hierarchy.c:505
-#, fuzzy
 msgid "Accounts in Category"
-msgstr "勘定科目型"
+msgstr "カテゴリ内の勘定科目"
 
 #: ../src/gnome/druid-hierarchy.c:711
 msgid "zero"
 msgstr ""
 
 #: ../src/gnome/druid-hierarchy.c:722
-#, fuzzy
 msgid "existing account"
-msgstr "勘定科目を編集"
+msgstr "既存の勘定科目"
 
 #: ../src/gnome/druid-hierarchy.c:905
 #: ../src/gnome-utils/gnc-tree-view-account.c:640
 msgid "Placeholder"
-msgstr ""
+msgstr "プレースホルダ"
 
 #: ../src/gnome/druid-hierarchy.c:936
 #, fuzzy
@@ -4331,44 +4251,37 @@
 
 #. { name, default txn memo, throughEscrowP, specSrcAcctP }
 #: ../src/gnome/druid-loan.c:161
-#, fuzzy
 msgid "Taxes"
-msgstr "税金(_T)"
+msgstr "税金"
 
 #: ../src/gnome/druid-loan.c:161
-#, fuzzy
 msgid "Tax Payment"
-msgstr "支払"
+msgstr "税金支払"
 
 #: ../src/gnome/druid-loan.c:162
-#, fuzzy
 msgid "Insurance"
-msgstr "金利"
+msgstr "保険"
 
 #: ../src/gnome/druid-loan.c:162
-#, fuzzy
 msgid "Insurance Payment"
-msgstr "金利"
+msgstr "保険支払"
 
 #. Translators: PMI stands for Private Mortgage Insurance.
 #: ../src/gnome/druid-loan.c:164
 msgid "PMI"
-msgstr ""
+msgstr "PMI"
 
 #: ../src/gnome/druid-loan.c:164
-#, fuzzy
 msgid "PMI Payment"
-msgstr "支払"
+msgstr "PMI支払"
 
 #: ../src/gnome/druid-loan.c:165
-#, fuzzy
 msgid "Other Expense"
-msgstr "費用"
+msgstr "その他の費用"
 
 #: ../src/gnome/druid-loan.c:165
-#, fuzzy
 msgid "Miscellaneous Payment"
-msgstr "定期支払額"
+msgstr "各種支払"
 
 #. Add payment checkbox.
 #. Translators: %s is "Taxes",
@@ -4389,9 +4302,8 @@
 msgstr "借入金"
 
 #: ../src/gnome/druid-loan.c:1041
-#, fuzzy
 msgid "Are you sure you want to cancel the Mortgage/Loan Setup Druid?"
-msgstr "本当にこの価格を削除してもよろしいですか?"
+msgstr "本当に借入/ローン設定ウィザードをキャンセルしてもよろしいですか?"
 
 #: ../src/gnome/druid-loan.c:1160
 #, fuzzy
@@ -4403,12 +4315,14 @@
 msgid "Please select a valid Escrow Account."
 msgstr "読み込むファイルを選択して下さい。\n"
 
-#: ../src/gnome/druid-loan.c:1313 ../src/gnome/druid-loan.c:1532
+#: ../src/gnome/druid-loan.c:1313
+#: ../src/gnome/druid-loan.c:1532
 #, fuzzy
 msgid "Please select a valid \"from\" account."
 msgstr "読み込むファイルを選択して下さい。\n"
 
-#: ../src/gnome/druid-loan.c:1320 ../src/gnome/druid-loan.c:1541
+#: ../src/gnome/druid-loan.c:1320
+#: ../src/gnome/druid-loan.c:1541
 #, fuzzy
 msgid "Please select a valid \"to\" account."
 msgstr "読み込むファイルを選択して下さい。\n"
@@ -4420,21 +4334,24 @@
 
 #. Translators: %s is "Taxes", or "Insurance", or similar
 #: ../src/gnome/druid-loan.c:1440
-#, fuzzy, c-format
+#, c-format
 msgid "Payment: \"%s\""
-msgstr "支払額:"
+msgstr "支払額: \"%s\""
 
-#: ../src/gnome/druid-loan.c:1798 ../src/gnome/druid-loan.c:2371
+#: ../src/gnome/druid-loan.c:1798
+#: ../src/gnome/druid-loan.c:2371
 msgid "Principal"
 msgstr ""
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-#: ../src/gnome/druid-loan.c:1804 ../src/gnome/druid-loan.c:2392
+#: ../src/gnome/druid-loan.c:1804
+#: ../src/gnome/druid-loan.c:2392
 #: ../src/import-export/qif/qif-defaults.c:130
 #: ../src/register/ledger-core/split-register.c:2034
-#: ../intl-scm/guile-strings.c:5746 ../intl-scm/guile-strings.c:5768
+#: ../intl-scm/guile-strings.c:5746
+#: ../intl-scm/guile-strings.c:5768
 #: ../intl-scm/guile-strings.c:5790
 msgid "Interest"
 msgstr "金利"
@@ -4444,15 +4361,16 @@
 msgid "Escrow "
 msgstr "ユーロ"
 
-#: ../src/gnome/druid-merge.c:101 ../src/gnome/druid-merge.c:129
-#: ../src/gnome/druid-merge.c:154 ../src/gnome/druid-merge.c:259
+#: ../src/gnome/druid-merge.c:101
+#: ../src/gnome/druid-merge.c:129
+#: ../src/gnome/druid-merge.c:154
+#: ../src/gnome/druid-merge.c:259
 msgid "No conflicts to be resolved."
 msgstr ""
 
 #: ../src/gnome/druid-merge.c:170
 #, c-format
-msgid ""
-"Error: Please resolve all %d conflicts before trying to commit the data."
+msgid "Error: Please resolve all %d conflicts before trying to commit the data."
 msgstr ""
 
 #: ../src/gnome/druid-merge.c:225
@@ -4488,14 +4406,14 @@
 msgstr ""
 
 #: ../src/gnome/druid-merge.c:359
-#, fuzzy, c-format
+#, c-format
 msgid "Import data : %s "
-msgstr "データをインポート"
+msgstr "インポートデータ : %s "
 
 #: ../src/gnome/druid-merge.c:362
 #, c-format
 msgid "Original data : %s\n"
-msgstr ""
+msgstr "オリジナルデータ : %s\n"
 
 #: ../src/gnome/druid-stock-split.c:274
 #: ../src/gnome-utils/dialog-transfer.c:535
@@ -4556,8 +4474,10 @@
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../src/gnome/druid-stock-split.c:615
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:399
-#: ../intl-scm/guile-strings.c:2440 ../intl-scm/guile-strings.c:3064
-#: ../intl-scm/guile-strings.c:3368 ../intl-scm/guile-strings.c:4522
+#: ../intl-scm/guile-strings.c:2440
+#: ../intl-scm/guile-strings.c:3064
+#: ../intl-scm/guile-strings.c:3368
+#: ../intl-scm/guile-strings.c:4522
 msgid "Symbol"
 msgstr "シンボル"
 
@@ -4566,24 +4486,20 @@
 msgstr "残高の存在する株勘定科目は一つもありません"
 
 #: ../src/gnome/glade/account.glade.h:1
-#, fuzzy
 msgid "<b>Acco_unt Type</b>"
-msgstr "勘定科目型"
+msgstr "<b>勘定科目のタイプ(_U)</b>"
 
 #: ../src/gnome/glade/account.glade.h:2
-#, fuzzy
 msgid "<b>Balance Information</b>"
-msgstr "貸借情報"
+msgstr "<b>残高情報</b>"
 
 #: ../src/gnome/glade/account.glade.h:3
-#, fuzzy
 msgid "<b>Categories</b>"
-msgstr "Vs. カテゴリ"
+msgstr "<b>カテゴリ</b>"
 
 #: ../src/gnome/glade/account.glade.h:4
-#, fuzzy
 msgid "<b>Category Description</b>"
-msgstr "説明"
+msgstr "<b>カテゴリの説明</b>"
 
 #: ../src/gnome/glade/account.glade.h:5
 #, fuzzy
@@ -4591,14 +4507,12 @@
 msgstr "損失科目"
 
 #: ../src/gnome/glade/account.glade.h:6
-#, fuzzy
 msgid "<b>Description</b>"
-msgstr "説明"
+msgstr "<b>説明</b>"
 
 #: ../src/gnome/glade/account.glade.h:7
-#, fuzzy
 msgid "<b>Identification</b>"
-msgstr "国際"
+msgstr "<b>識別情報</b>"
 
 #: ../src/gnome/glade/account.glade.h:8
 #, fuzzy
@@ -4606,47 +4520,41 @@
 msgstr "通貨の移動"
 
 #: ../src/gnome/glade/account.glade.h:9
-#, fuzzy
 msgid "<b>New Account Currency</b>"
-msgstr "デフォルトの通貨"
+msgstr "<b>新規勘定科目の通貨</b>"
 
 #: ../src/gnome/glade/account.glade.h:10
-#, fuzzy
 msgid "<b>Sub-account Transactions</b>"
-msgstr "取引の複製"
+msgstr "<b>子勘定科目取引</b>"
 
 #: ../src/gnome/glade/account.glade.h:11
-#, fuzzy
 msgid "<b>Sub-accounts</b>"
-msgstr "親勘定科目"
+msgstr "<b>子勘定科目</b>"
 
 #: ../src/gnome/glade/account.glade.h:12
 #: ../src/gnome/glade/sched-xact.glade.h:50
-#, fuzzy
 msgid "<b>Transactions</b>"
-msgstr "取引内容"
+msgstr "<b>取引</b>"
 
 #: ../src/gnome/glade/account.glade.h:13
-#, fuzzy
 msgid "<b>_Parent Account</b>"
-msgstr "親勘定科目"
+msgstr "<b>親勘定科目(_P)</b>"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../src/gnome/glade/account.glade.h:14 ../intl-scm/guile-strings.c:3240
+#: ../src/gnome/glade/account.glade.h:14
+#: ../intl-scm/guile-strings.c:3240
 #: ../intl-scm/guile-strings.c:4394
 msgid "Account Type"
-msgstr "勘定科目型"
+msgstr "勘定科目のタイプ"
 
 #: ../src/gnome/glade/account.glade.h:15
-#, fuzzy
 msgid "Account _name:"
-msgstr "勘定科目名:"
+msgstr "勘定科目名(_N):"
 
 #: ../src/gnome/glade/account.glade.h:16
-#, fuzzy
 msgid "C_lear All"
-msgstr "全て清算"
+msgstr "すべて選択解除"
 
 #: ../src/gnome/glade/account.glade.h:17
 msgid "Choose Currency"
@@ -4654,32 +4562,27 @@
 
 #: ../src/gnome/glade/account.glade.h:18
 msgid "Choose accounts to create"
-msgstr "作成する科目を選択してください"
+msgstr "作成する勘定科目を選択してください"
 
 #: ../src/gnome/glade/account.glade.h:19
-#, fuzzy
 msgid "Delete Account"
-msgstr "勘定科目の削除(_D)"
+msgstr "勘定科目を削除"
 
 #: ../src/gnome/glade/account.glade.h:20
-#, fuzzy
 msgid "Delete all _subaccounts"
-msgstr "子勘定科目を選択"
+msgstr "すべての子勘定科目を削除(_S)"
 
 #: ../src/gnome/glade/account.glade.h:21
-#, fuzzy
 msgid "Delete all _transactions"
-msgstr "取引削除"
+msgstr "すべての取引を削除(_T)"
 
 #: ../src/gnome/glade/account.glade.h:22
-#, fuzzy
 msgid "Examples:"
-msgstr "名前:"
+msgstr "例:"
 
 #: ../src/gnome/glade/account.glade.h:23
-#, fuzzy
 msgid "Filter By..."
-msgstr "プロット形式"
+msgstr "フィルタ..."
 
 #: ../src/gnome/glade/account.glade.h:24
 msgid "Finish Account Setup"
@@ -4702,32 +4605,58 @@
 #. src/report/standard-reports/register.scm
 #: ../src/gnome/glade/account.glade.h:25
 #: ../src/gnome-utils/glade/preferences.glade.h:74
-#: ../intl-scm/guile-strings.c:242 ../intl-scm/guile-strings.c:248
-#: ../intl-scm/guile-strings.c:254 ../intl-scm/guile-strings.c:260
-#: ../intl-scm/guile-strings.c:368 ../intl-scm/guile-strings.c:372
-#: ../intl-scm/guile-strings.c:376 ../intl-scm/guile-strings.c:380
-#: ../intl-scm/guile-strings.c:454 ../intl-scm/guile-strings.c:460
-#: ../intl-scm/guile-strings.c:466 ../intl-scm/guile-strings.c:472
-#: ../intl-scm/guile-strings.c:580 ../intl-scm/guile-strings.c:584
-#: ../intl-scm/guile-strings.c:588 ../intl-scm/guile-strings.c:592
-#: ../intl-scm/guile-strings.c:666 ../intl-scm/guile-strings.c:672
-#: ../intl-scm/guile-strings.c:678 ../intl-scm/guile-strings.c:684
-#: ../intl-scm/guile-strings.c:792 ../intl-scm/guile-strings.c:796
-#: ../intl-scm/guile-strings.c:800 ../intl-scm/guile-strings.c:804
-#: ../intl-scm/guile-strings.c:878 ../intl-scm/guile-strings.c:884
-#: ../intl-scm/guile-strings.c:890 ../intl-scm/guile-strings.c:896
-#: ../intl-scm/guile-strings.c:1004 ../intl-scm/guile-strings.c:1008
-#: ../intl-scm/guile-strings.c:1012 ../intl-scm/guile-strings.c:1016
-#: ../intl-scm/guile-strings.c:1090 ../intl-scm/guile-strings.c:1096
-#: ../intl-scm/guile-strings.c:1102 ../intl-scm/guile-strings.c:1130
-#: ../intl-scm/guile-strings.c:1136 ../intl-scm/guile-strings.c:1142
-#: ../intl-scm/guile-strings.c:1332 ../intl-scm/guile-strings.c:1452
-#: ../intl-scm/guile-strings.c:1458 ../intl-scm/guile-strings.c:1474
-#: ../intl-scm/guile-strings.c:1480 ../intl-scm/guile-strings.c:2128
-#: ../intl-scm/guile-strings.c:2130 ../intl-scm/guile-strings.c:2752
-#: ../intl-scm/guile-strings.c:2754 ../intl-scm/guile-strings.c:3446
-#: ../intl-scm/guile-strings.c:3448 ../intl-scm/guile-strings.c:3912
-#: ../intl-scm/guile-strings.c:4600 ../intl-scm/guile-strings.c:4602
+#: ../intl-scm/guile-strings.c:242
+#: ../intl-scm/guile-strings.c:248
+#: ../intl-scm/guile-strings.c:254
+#: ../intl-scm/guile-strings.c:260
+#: ../intl-scm/guile-strings.c:368
+#: ../intl-scm/guile-strings.c:372
+#: ../intl-scm/guile-strings.c:376
+#: ../intl-scm/guile-strings.c:380
+#: ../intl-scm/guile-strings.c:454
+#: ../intl-scm/guile-strings.c:460
+#: ../intl-scm/guile-strings.c:466
+#: ../intl-scm/guile-strings.c:472
+#: ../intl-scm/guile-strings.c:580
+#: ../intl-scm/guile-strings.c:584
+#: ../intl-scm/guile-strings.c:588
+#: ../intl-scm/guile-strings.c:592
+#: ../intl-scm/guile-strings.c:666
+#: ../intl-scm/guile-strings.c:672
+#: ../intl-scm/guile-strings.c:678
+#: ../intl-scm/guile-strings.c:684
+#: ../intl-scm/guile-strings.c:792
+#: ../intl-scm/guile-strings.c:796
+#: ../intl-scm/guile-strings.c:800
+#: ../intl-scm/guile-strings.c:804
+#: ../intl-scm/guile-strings.c:878
+#: ../intl-scm/guile-strings.c:884
+#: ../intl-scm/guile-strings.c:890
+#: ../intl-scm/guile-strings.c:896
+#: ../intl-scm/guile-strings.c:1004
+#: ../intl-scm/guile-strings.c:1008
+#: ../intl-scm/guile-strings.c:1012
+#: ../intl-scm/guile-strings.c:1016
+#: ../intl-scm/guile-strings.c:1090
+#: ../intl-scm/guile-strings.c:1096
+#: ../intl-scm/guile-strings.c:1102
+#: ../intl-scm/guile-strings.c:1130
+#: ../intl-scm/guile-strings.c:1136
+#: ../intl-scm/guile-strings.c:1142
+#: ../intl-scm/guile-strings.c:1332
+#: ../intl-scm/guile-strings.c:1452
+#: ../intl-scm/guile-strings.c:1458
+#: ../intl-scm/guile-strings.c:1474
+#: ../intl-scm/guile-strings.c:1480
+#: ../intl-scm/guile-strings.c:2128
+#: ../intl-scm/guile-strings.c:2130
+#: ../intl-scm/guile-strings.c:2752
+#: ../intl-scm/guile-strings.c:2754
+#: ../intl-scm/guile-strings.c:3446
+#: ../intl-scm/guile-strings.c:3448
+#: ../intl-scm/guile-strings.c:3912
+#: ../intl-scm/guile-strings.c:4600
+#: ../intl-scm/guile-strings.c:4602
 #: ../intl-scm/guile-strings.c:5066
 msgid "General"
 msgstr "全般"
@@ -4744,34 +4673,25 @@
 
 #: ../src/gnome/glade/account.glade.h:28
 #, fuzzy
-msgid ""
-"If you would like an account to have an opening balance, click on the "
-"account and enter the starting balance in the box on the right. All accounts "
-"except Equity and placeholder accounts may have an opening balance."
+msgid "If you would like an account to have an opening balance, click on the account and enter the starting balance in the box on the right. All accounts except Equity and placeholder accounts may have an opening balance."
 msgstr ""
-"新規勘定科目の残高を設定したい場合、勘定科目をクリックして右側のボックスに開"
-"始時の残高を入力してください。\n"
+"新規勘定科目の残高を設定したい場合、勘定科目をクリックして右側のボックスに開始時の残高を入力してください。\n"
 "株式以外の勘定科目は初期の残高を設定することができます。"
 
 #: ../src/gnome/glade/account.glade.h:29
-#, fuzzy
 msgid ""
-"If you would like an account to have an opening balance, click on the row "
-"containing the account, click again in the opening balances column, and then "
-"enter the starting balance. All accounts except Equity and placeholder "
-"accounts may have an opening balance.\n"
+"If you would like an account to have an opening balance, click on the row containing the account, click again in the opening balances column, and then enter the starting balance. All accounts except Equity and placeholder accounts may have an opening balance.\n"
 "\n"
-"If you would like an account to be a placeholder account, just click the "
-"checkbox for that account.\n"
+"If you would like an account to be a placeholder account, just click the checkbox for that account.\n"
 msgstr ""
-"新規勘定科目の残高を設定したい場合、勘定科目をクリックして右側のボックスに開"
-"始時の残高を入力してください。\n"
-"株式以外の勘定科目は初期の残高を設定することができます。"
+"勘定科目に開始残高を設定したい場合は、その勘定科目の行をクリックし、開始残高のカラムをもう一度クリックして、開始残高を入力してください。資本とプレースホルダ以外のどの勘定科目も期首残高を設定することができます。\n"
+"\n"
+"勘定科目をプレースホルダにしたい場合は、その勘定科目のチェックボックスをクリックしてください。\n"
 
 #: ../src/gnome/glade/account.glade.h:33
 #, fuzzy
 msgid "Interval:"
-msgstr "金利"
+msgstr "期間:"
 
 #: ../src/gnome/glade/account.glade.h:34
 #, fuzzy
@@ -4793,22 +4713,17 @@
 msgstr "新規勘定科目一覧"
 
 #: ../src/gnome/glade/account.glade.h:38
-#, fuzzy
 msgid "No_tes:"
-msgstr "注釈"
+msgstr "備考(_T)"
 
 #: ../src/gnome/glade/account.glade.h:39
 #, fuzzy
-msgid ""
-"One or more sub-accounts contain read-only transactions which may not be "
-"deleted."
+msgid "One or more sub-accounts contain read-only transactions which may not be deleted."
 msgstr "%sの勘定を本当に削除してもよろしいですか?"
 
 #: ../src/gnome/glade/account.glade.h:40
 #, fuzzy
-msgid ""
-"One or more sub-accounts contain transactions. What would you like to do "
-"with these transactions?"
+msgid "One or more sub-accounts contain transactions. What would you like to do with these transactions?"
 msgstr "%sの勘定を本当に削除してもよろしいですか?"
 
 #. src/report/standard-reports/category-barchart.scm
@@ -4816,27 +4731,27 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
 #: ../src/gnome/glade/account.glade.h:42
-#: ../src/gnome/glade/sched-xact.glade.h:132 ../intl-scm/guile-strings.c:2414
-#: ../intl-scm/guile-strings.c:3038 ../intl-scm/guile-strings.c:4222
+#: ../src/gnome/glade/sched-xact.glade.h:132
+#: ../intl-scm/guile-strings.c:2414
+#: ../intl-scm/guile-strings.c:3038
+#: ../intl-scm/guile-strings.c:4222
 #: ../intl-scm/guile-strings.c:5376
 msgid "Other"
 msgstr "その他"
 
 #: ../src/gnome/glade/account.glade.h:43
 msgid "Placeholde_r"
-msgstr ""
+msgstr "プレースホルダ(_R)"
 
 #: ../src/gnome/glade/account.glade.h:44
 msgid "Please choose the currency to use for new accounts."
 msgstr "新規科目に使用する通貨を選択してください。"
 
 #: ../src/gnome/glade/account.glade.h:45
-#, fuzzy
 msgid "Prefix:"
-msgstr "利益"
+msgstr "プレフィックス:"
 
 #: ../src/gnome/glade/account.glade.h:46
-#, fuzzy
 msgid ""
 "Press `Apply' to create your new accounts.\n"
 "\n"
@@ -4844,11 +4759,11 @@
 "\n"
 "Press `Cancel' to close this dialog without creating any new accounts."
 msgstr ""
-"新しい勘定科目を作成するには'終了'を押してください\n"
+"新しい勘定科目を作成するには `適用' を押してください。\n"
 "\n"
-"選択した項目を確認するためには'戻る'を押してください\n"
+"選択した項目を確認するには `戻る' を押してください。\n"
 "\n"
-"新しい勘定科目を作成せずにダイアログを閉じるには'キャンセル'を押してください"
+"新しい勘定科目を作成せずにダイアログを閉じるには `キャンセル' を押してください。"
 
 #: ../src/gnome/glade/account.glade.h:51
 #, fuzzy
@@ -4862,12 +4777,8 @@
 msgstr "勘定科目を選択"
 
 #: ../src/gnome/glade/account.glade.h:53
-msgid ""
-"Select categories that correspond to the ways that you will use GnuCash.  "
-"Each category you select will cause several accounts to be created.  Select "
-"the categories that are relevant to you.  You can always create additional "
-"accounts by hand later."
-msgstr ""
+msgid "Select categories that correspond to the ways that you will use GnuCash.  Each category you select will cause several accounts to be created.  Select the categories that are relevant to you.  You can always create additional accounts by hand later."
+msgstr "GnuCashを使おうとする方法に対応したカテゴリを選択してください。各カテゴリを選ぶといくつかの勘定科目が作成されます。あなたに関連したカテゴリを選択してください。勘定科目はあとからいつでも手動作成することができます。"
 
 #: ../src/gnome/glade/account.glade.h:54
 #: ../src/import-export/qif-import/qif.glade.h:65
@@ -4875,9 +4786,8 @@
 msgstr "Gnucashの勘定科目を選択あるいは追加"
 
 #: ../src/gnome/glade/account.glade.h:55
-#, fuzzy
 msgid "Setup new accounts"
-msgstr "新しい勘定科目を作成する"
+msgstr "新規勘定科目の設定"
 
 #: ../src/gnome/glade/account.glade.h:56
 #, fuzzy
@@ -4904,12 +4814,7 @@
 msgstr "税金関連科目"
 
 #: ../src/gnome/glade/account.glade.h:61
-msgid ""
-"This account (and any sub-accounts) will be hidden in the account tree and "
-"will not appear in the popup account list in the register.  To reset this "
-"option, you will first need to open the \"Filter By...\" dialog for the "
-"account tree and check the \"show hidden accounts\" option.  Doing so will "
-"allow you to select the account and reopen this dialog."
+msgid "This account (and any sub-accounts) will be hidden in the account tree and will not appear in the popup account list in the register.  To reset this option, you will first need to open the \"Filter By...\" dialog for the account tree and check the \"show hidden accounts\" option.  Doing so will allow you to select the account and reopen this dialog."
 msgstr ""
 
 #: ../src/gnome/glade/account.glade.h:62
@@ -4919,33 +4824,27 @@
 
 #: ../src/gnome/glade/account.glade.h:63
 #, fuzzy
-msgid ""
-"This account contains sub-accounts.  What would you like to do with these "
-"sub-accounts?"
+msgid "This account contains sub-accounts.  What would you like to do with these sub-accounts?"
 msgstr "%sの勘定を本当に削除してもよろしいですか?"
 
 #: ../src/gnome/glade/account.glade.h:64
 #, fuzzy
-msgid ""
-"This account contains transactions. What would you like to do with these "
-"transactions?"
+msgid "This account contains transactions. What would you like to do with these transactions?"
 msgstr "%sの勘定を本当に削除してもよろしいですか?"
 
 #: ../src/gnome/glade/account.glade.h:65
-msgid ""
-"This account is present solely as a placeholder in the hierarchy.  "
-"Transactions may not be posted to this account, only to sub-accounts of this "
-"account."
+msgid "This account is present solely as a placeholder in the hierarchy.  Transactions may not be posted to this account, only to sub-accounts of this account."
 msgstr ""
 
 #: ../src/gnome/glade/account.glade.h:66
 msgid ""
-"This druid will help you create a set of GnuCash accounts for your assets "
-"(such as investments, checking or savings accounts), liabilities (such as "
-"loans) and different kinds of income and expenses you might have. \n"
+"This druid will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have. \n"
 "\n"
 "Click 'Cancel'  if you do not wish to create any new accounts now."
 msgstr ""
+"このウィザードはGnuCashの勘定科目セットを作成するお手伝いをします。勘定科目には、資産(投資や預貯金など)、負債(ローンなど)、各種の収益や費用があります。\n"
+"\n"
+"すぐに新しい勘定科目を作らないのであれば、'キャンセル' をクリックしてください。"
 
 #: ../src/gnome/glade/account.glade.h:69
 msgid ""
@@ -4960,37 +4859,33 @@
 msgstr ""
 
 #: ../src/gnome/glade/account.glade.h:77
-#, fuzzy
 msgid "_Account code:"
-msgstr "勘定科目コード:"
+msgstr "勘定科目コード(_A):"
 
 #: ../src/gnome/glade/account.glade.h:78
-#, fuzzy
 msgid "_Balance:"
-msgstr "貸借/残高:"
+msgstr "残高(_B):"
 
-#: ../src/gnome/glade/account.glade.h:79 ../src/gnome/glade/price.glade.h:21
-#: ../src/gnome/glade/print.glade.h:27 ../src/gnome/glade/register.glade.h:81
+#: ../src/gnome/glade/account.glade.h:79
+#: ../src/gnome/glade/price.glade.h:21
+#: ../src/gnome/glade/print.glade.h:27
+#: ../src/gnome/glade/register.glade.h:81
 #: ../src/gnome/glade/stocks.glade.h:17
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:5
-#, fuzzy
 msgid "_Date:"
-msgstr "日付:"
+msgstr "日付(_D):"
 
 #: ../src/gnome/glade/account.glade.h:80
-#, fuzzy
 msgid "_Default"
-msgstr "デフォルト"
+msgstr "デフォルト(_D)"
 
 #: ../src/gnome/glade/account.glade.h:81
-#, fuzzy
 msgid "_Description:"
-msgstr "説明"
+msgstr "説明(_D)"
 
 #: ../src/gnome/glade/account.glade.h:82
-#, fuzzy
 msgid "_Move to:"
-msgstr "下へ移動"
+msgstr "移動先(_M):"
 
 #: ../src/gnome/glade/account.glade.h:83
 #, fuzzy
@@ -4999,15 +4894,13 @@
 
 #: ../src/gnome/glade/account.glade.h:84
 #: ../src/gnome-utils/dialog-commodity.c:270
-#, fuzzy
 msgid "_Security/currency:"
-msgstr "通貨/証券を選択 "
+msgstr "証券/通貨(_S):"
 
 #: ../src/gnome/glade/account.glade.h:85
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:6
-#, fuzzy
 msgid "_Select All"
-msgstr "全て選択"
+msgstr "すべて選択(_S)"
 
 #: ../src/gnome/glade/account.glade.h:86
 #, fuzzy
@@ -5015,9 +4908,8 @@
 msgstr "移動させる勘定科目を選択"
 
 #: ../src/gnome/glade/account.glade.h:87
-#, fuzzy
 msgid "_Use equity 'Opening Balances' account"
-msgstr "開始残高自己資本勘定科目を使用する"
+msgstr "開始残高の資本勘定科目を使用する(_U)"
 
 #: ../src/gnome/glade/acctperiod.glade.h:1
 #, fuzzy
@@ -5045,14 +4937,11 @@
 
 #: ../src/gnome/glade/acctperiod.glade.h:6
 #: ../src/gnome/glade/budget.glade.h:13
-#, fuzzy
 msgid "Notes:"
-msgstr "注釈"
+msgstr "備考:"
 
 #: ../src/gnome/glade/acctperiod.glade.h:7
-msgid ""
-"Select an accounting period and the closing date for the period.  Books will "
-"be closed on midnight of the selected date."
+msgid "Select an accounting period and the closing date for the period.  Books will be closed on midnight of the selected date."
 msgstr ""
 
 #: ../src/gnome/glade/acctperiod.glade.h:8
@@ -5064,59 +4953,53 @@
 msgid ""
 "This druid will help you setup and use accouting periods. \n"
 " \n"
-"Danger: this feature does not work correctly at this time; it is still under "
-"development.  It will probably damage your data in such a way that it cannot "
-"be repaired!"
+"Danger: this feature does not work correctly at this time; it is still under development.  It will probably damage your data in such a way that it cannot be repaired!"
 msgstr ""
+"このウィザードは会計期間を設定し利用するお手伝いをします。\n"
+" \n"
+"危険: この機能はまだ開発中であるため現時点では正しく動きません。あなたのデータに修復不可能なダメージを与える可能性があります!"
 
 #: ../src/gnome/glade/acctperiod.glade.h:12
-#, fuzzy
 msgid "Title:"
-msgstr "タイトル"
+msgstr "タイトル:"
 
 #: ../src/gnome/glade/acctperiod.glade.h:13
 msgid "xxx"
-msgstr ""
+msgstr "xxx"
 
 #: ../src/gnome/glade/budget.glade.h:1
 msgid "Always use the last day (or day of week) in the month?"
-msgstr ""
+msgstr "常に月の最終日(あるいは最終曜日)を使いますか?"
 
 #: ../src/gnome/glade/budget.glade.h:2
-#, fuzzy
 msgid "Budget List"
-msgstr "予算"
+msgstr "予算一覧"
 
 #: ../src/gnome/glade/budget.glade.h:3
-#, fuzzy
 msgid "Budget Name:"
-msgstr "予算"
+msgstr "予算名:"
 
 #: ../src/gnome/glade/budget.glade.h:4
 #: ../src/gnome/gnc-plugin-page-budget.c:139
 #: ../src/gnome/gnc-plugin-page-budget.c:825
-#, fuzzy
 msgid "Budget Options"
-msgstr "最初のオプション"
+msgstr "予算オプション"
 
 #: ../src/gnome/glade/budget.glade.h:5
-#, fuzzy
 msgid "Budget Period:"
-msgstr "支払期間"
+msgstr "予算期間:"
 
 #: ../src/gnome/glade/budget.glade.h:6
-#, fuzzy
 msgid "Close the Budget List"
-msgstr "予算"
+msgstr "予算一覧を閉じる"
 
 #: ../src/gnome/glade/budget.glade.h:7
 msgid "Create a New Budget"
 msgstr "新しい予算を作成する"
 
 #: ../src/gnome/glade/budget.glade.h:8
-#, fuzzy
 msgid "Delete the Selected Budget"
-msgstr "この取引を削除する"
+msgstr "選択した予算をを削除する"
 
 #: ../src/gnome/glade/budget.glade.h:9
 msgid "Estimate Budget Values"
@@ -5129,15 +5012,11 @@
 
 #: ../src/gnome/glade/budget.glade.h:11
 #, fuzzy
-msgid ""
-"GnuCash will estimate budget values for the selected accounts from past "
-"transactions."
+msgid "GnuCash will estimate budget values for the selected accounts from past transactions."
 msgstr "選択されたデータの表を表示する"
 
 #: ../src/gnome/glade/budget.glade.h:12
-msgid ""
-"Match the \"day of week\" and \"week of month\"?  (for example, the \"second "
-"Tuesday\" of every month)"
+msgid "Match the \"day of week\" and \"week of month\"?  (for example, the \"second Tuesday\" of every month)"
 msgstr ""
 
 #: ../src/gnome/glade/budget.glade.h:14
@@ -5146,9 +5025,7 @@
 msgstr "行数"
 
 #: ../src/gnome/glade/budget.glade.h:15
-msgid ""
-"Number of calendar units in the recurrence:  E.g. Biweekly = every 2 weeks; "
-"Quarterly = every 3 months"
+msgid "Number of calendar units in the recurrence:  E.g. Biweekly = every 2 weeks; Quarterly = every 3 months"
 msgstr ""
 
 #: ../src/gnome/glade/budget.glade.h:16
@@ -5156,7 +5033,8 @@
 msgid "Open the Selected Budget"
 msgstr "選択された勘定科目を開く"
 
-#: ../src/gnome/glade/budget.glade.h:17 ../src/gnome/glade/print.glade.h:12
+#: ../src/gnome/glade/budget.glade.h:17
+#: ../src/gnome/glade/print.glade.h:12
 #: ../src/gnome/glade/sched-xact.glade.h:131
 #: ../src/gnome/gnc-plugin-page-budget.c:166
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1000
@@ -5220,14 +5098,12 @@
 msgstr ""
 
 #: ../src/gnome/glade/chart-export.glade.h:1
-#, fuzzy
 msgid "Click to choose the filename and location."
-msgstr "情報を受け入れ、続けるには\"次\"をクリックしてください。"
+msgstr "クリックしてファイル名と場所を選んでください。"
 
 #: ../src/gnome/glade/chart-export.glade.h:2
-#, fuzzy
 msgid "Export Chart of Accounts"
-msgstr "新しい勘定科目セットを作成する"
+msgstr "勘定科目のグラフをエクスポート"
 
 #: ../src/gnome/glade/chart-export.glade.h:3
 msgid "Future dates are not supported"
@@ -5235,20 +5111,15 @@
 
 #: ../src/gnome/glade/chart-export.glade.h:4
 #, fuzzy
-msgid ""
-"Select the date to use and click Export to choose the filename and location."
+msgid "Select the date to use and click Export to choose the filename and location."
 msgstr "情報を受け入れ、続けるには\"次\"をクリックしてください。"
 
 #: ../src/gnome/glade/chart-export.glade.h:5
-msgid ""
-"The Chart of Accounts includes the balance for each account, on the date "
-"specified.  Note that future dates are not supported."
+msgid "The Chart of Accounts includes the balance for each account, on the date specified.  Note that future dates are not supported."
 msgstr ""
 
 #: ../src/gnome/glade/chart-export.glade.h:6
-msgid ""
-"You can export the Chart of Accounts to a QSF XML file that can be imported "
-"into another GnuCash file or used in other programs."
+msgid "You can export the Chart of Accounts to a QSF XML file that can be imported into another GnuCash file or used in other programs."
 msgstr ""
 
 #: ../src/gnome/glade/commodities.glade.h:1
@@ -5323,6 +5194,17 @@
 "Daily (360)\n"
 "Daily (365)"
 msgstr ""
+"毎年\n"
+"年2回\n"
+"年3回\n"
+"四半期ごと\n"
+"各月\n"
+"毎月\n"
+"月2回\n"
+"隔週\n"
+"毎週\n"
+"毎日(360)\n"
+"毎日(365)"
 
 #: ../src/gnome/glade/fincalc.glade.h:18
 #, fuzzy
@@ -5379,9 +5261,8 @@
 
 #: ../src/gnome/glade/fincalc.glade.h:30
 #: ../src/gnome/glade/sched-xact.glade.h:99
-#, fuzzy
 msgid "Frequency:"
-msgstr "通貨:"
+msgstr "頻度:"
 
 #: ../src/gnome/glade/fincalc.glade.h:31
 #, fuzzy
@@ -5389,16 +5270,14 @@
 msgstr "将来価値"
 
 #: ../src/gnome/glade/fincalc.glade.h:32
-#, fuzzy
 msgid "Interest rate"
-msgstr "金利"
+msgstr "利率"
 
 #: ../src/gnome/glade/fincalc.glade.h:34
 msgid "Payment Total:"
 msgstr "支払合計:"
 
 #: ../src/gnome/glade/fincalc.glade.h:35
-#, fuzzy
 msgid "Payment periods"
 msgstr "支払期間"
 
@@ -5414,11 +5293,13 @@
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/fincalc.glade.h:38 ../intl-scm/guile-strings.c:3728
-#: ../intl-scm/guile-strings.c:3730 ../intl-scm/guile-strings.c:4882
+#: ../src/gnome/glade/fincalc.glade.h:38
+#: ../intl-scm/guile-strings.c:3728
+#: ../intl-scm/guile-strings.c:3730
+#: ../intl-scm/guile-strings.c:4882
 #: ../intl-scm/guile-strings.c:4884
 msgid "Quarterly"
-msgstr "四半期"
+msgstr "毎四半期"
 
 #: ../src/gnome/glade/fincalc.glade.h:39
 msgid "Recalculate the (single) blank entry in the above fields."
@@ -5432,16 +5313,16 @@
 
 #: ../src/gnome/glade/fincalc.glade.h:41
 msgid "Semi-annual"
-msgstr "ほぼ毎年"
+msgstr "年2回"
 
 #: ../src/gnome/glade/fincalc.glade.h:43
 msgid "Tri-annual"
-msgstr "年に三回"
+msgstr "年3回"
 
 #: ../src/gnome/glade/fincalc.glade.h:44
 #: ../src/gnome/glade/sched-xact.glade.h:181
 msgid "Type:"
-msgstr "åž‹:"
+msgstr "タイプ:"
 
 #: ../src/gnome/glade/fincalc.glade.h:46
 msgid "When paid:"
@@ -5468,7 +5349,7 @@
 
 #: ../src/gnome/glade/lots.glade.h:1
 msgid "<b>_Lots in This Account</b>"
-msgstr ""
+msgstr "<b>この勘定科目内のLots(_L)</b>"
 
 #: ../src/gnome/glade/lots.glade.h:2
 msgid "<b>_Mini-Viewer</b>"
@@ -5476,11 +5357,11 @@
 
 #: ../src/gnome/glade/lots.glade.h:3
 msgid "<b>_Notes</b>"
-msgstr ""
+msgstr "<b>備考(_N)</b>"
 
 #: ../src/gnome/glade/lots.glade.h:4
 msgid "<b>_Title</b>"
-msgstr ""
+msgstr "<b>タイトル(_T)</b>"
 
 #: ../src/gnome/glade/lots.glade.h:5
 msgid "A summary of all of the transactions in the selected lot"
@@ -5495,14 +5376,19 @@
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../src/gnome/glade/lots.glade.h:7 ../src/gnome/lot-viewer.c:626
+#: ../src/gnome/glade/lots.glade.h:7
+#: ../src/gnome/lot-viewer.c:626
 #: ../src/gnome-utils/gnc-tree-view-account.c:551
 #: ../src/register/ledger-core/split-register-model.c:162
 #: ../src/register/ledger-core/split-register-model.c:302
-#: ../intl-scm/guile-strings.c:1406 ../intl-scm/guile-strings.c:3286
-#: ../intl-scm/guile-strings.c:3600 ../intl-scm/guile-strings.c:3904
-#: ../intl-scm/guile-strings.c:4440 ../intl-scm/guile-strings.c:4754
-#: ../intl-scm/guile-strings.c:5058 ../intl-scm/guile-strings.c:6154
+#: ../intl-scm/guile-strings.c:1406
+#: ../intl-scm/guile-strings.c:3286
+#: ../intl-scm/guile-strings.c:3600
+#: ../intl-scm/guile-strings.c:3904
+#: ../intl-scm/guile-strings.c:4440
+#: ../intl-scm/guile-strings.c:4754
+#: ../intl-scm/guile-strings.c:5058
+#: ../intl-scm/guile-strings.c:6154
 #: ../intl-scm/guile-strings.c:6678
 msgid "Balance"
 msgstr "貸借/残高"
@@ -5523,10 +5409,11 @@
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../src/gnome/glade/lots.glade.h:13 ../intl-scm/guile-strings.c:4066
+#: ../src/gnome/glade/lots.glade.h:13
+#: ../intl-scm/guile-strings.c:4066
 #: ../intl-scm/guile-strings.c:5220
 msgid "Gain/Loss"
-msgstr "所得/損失"
+msgstr "利益/損失"
 
 #: ../src/gnome/glade/lots.glade.h:14
 msgid "Lot Viewer"
@@ -5577,11 +5464,9 @@
 "\n"
 "Press `Back' to review your selections.\n"
 "\n"
-"Press `Cancel' to close this dialog without changing your current data "
-"file.\n"
+"Press `Cancel' to close this dialog without changing your current data file.\n"
 "\n"
-"REMEMBER: There is no way to undo this final operation! Make sure you have a "
-"backup before clicking 'Apply'."
+"REMEMBER: There is no way to undo this final operation! Make sure you have a backup before clicking 'Apply'."
 msgstr ""
 "新しい勘定科目を作成するには'終了'を押してください\n"
 "\n"
@@ -5601,17 +5486,11 @@
 msgid ""
 "This druid will merge your QSF data into the currently open GnuCash file.\n"
 "\n"
-"You will be asked how to proceed if some QSF data clashes with the your "
-"existing GnuCash data file.\n"
+"You will be asked how to proceed if some QSF data clashes with the your existing GnuCash data file.\n"
 "\n"
-"There is NO way to undo this operation! Please ensure you have a backup of "
-"your file BEFORE continuing! You will be given the option to cancel the "
-"merge at all stages until the final merge operation. Once you click Finish, "
-"the new QSF data will be committed to your current data file.\n"
+"There is NO way to undo this operation! Please ensure you have a backup of your file BEFORE continuing! You will be given the option to cancel the merge at all stages until the final merge operation. Once you click Finish, the new QSF data will be committed to your current data file.\n"
 "\n"
-"There is currently no currency or price support in the merge operation, the "
-"new data will inherit any default currency or you can change the currency "
-"after the merge is complete.\n"
+"There is currently no currency or price support in the merge operation, the new data will inherit any default currency or you can change the currency after the merge is complete.\n"
 "\n"
 "Your QSF data is ready to import\n"
 "\n"
@@ -5621,10 +5500,8 @@
 #: ../src/gnome/glade/merge.glade.h:27
 msgid ""
 "You have three choices for each collision: \n"
-"1. The import object can be allowed to overwrite the target - use this to "
-"update your existing book. \n"
-"2. The import object can be ignored - use this if the import is a duplicate "
-"of an object in the existing book. \n"
+"1. The import object can be allowed to overwrite the target - use this to update your existing book. \n"
+"2. The import object can be ignored - use this if the import is a duplicate of an object in the existing book. \n"
 "3. The import object can be created as a new object in the existing book."
 msgstr ""
 
@@ -5641,36 +5518,24 @@
 msgstr "<span size=\"larger\" weight=\"bold\">GnuCashへようこそ!</span>"
 
 #: ../src/gnome/glade/newuser.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">次もようこそダイアログを表示しますか?</span>"
+msgid "<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">次もようこそダイアログを表示しますか?</span>"
 
 #: ../src/gnome/glade/newuser.glade.h:3
 msgid "C_reate a new set of accounts"
 msgstr "新しい勘定科目セットを作成する(_R)"
 
 #: ../src/gnome/glade/newuser.glade.h:4
-msgid ""
-"If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog "
-"will be displayed again next time you start GnuCash. If you press the <i>No</"
-"i> button, it will not be displayed again."
-msgstr ""
+msgid "If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again."
+msgstr "<i>はい</i>のボタンを押すと、次回GnuCashを起動したときも<i>GnuCashへようこそ</i>のダイアログが表示されます。<i>いいえ</i>のボタンを押すと次回以降表示されなくなります。"
 
 #: ../src/gnome/glade/newuser.glade.h:5
-msgid ""
-"There are some predefined actions available that most new users prefer to "
-"get started with GnuCash. Select one of these actions from below and click "
-"the <i>OK</i> button or press the <i>Cancel</i> button if don't want to "
-"perform any of them."
-msgstr ""
-"ほとんどの新規ユーザーがGnuCashを使い始めるときに実行したいアクションを"
-"いくつか用意しました。以下からアクションを一つ選んで<i>OK</i>ボタンを押すか"
-"どれも実行したくなけば<i>キャンセル</i>ボタンドを押してください。"
+msgid "There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if don't want to perform any of them."
+msgstr "ほとんどの新規ユーザーがGnuCashを使い始めるときに実行したいと思われるアクションをいくつか用意しました。以下からアクションを一つ選んで<i>OK</i>ボタンを押すか、どれも実行したくなけば<i>キャンセル</i>ボタンを押してください。"
 
 #: ../src/gnome/glade/newuser.glade.h:6
 msgid "_Import my QIF files"
-msgstr "QIFファイルのインポート(_I)"
+msgstr "QIFファイルをインポートする(_I)"
 
 #: ../src/gnome/glade/newuser.glade.h:7
 msgid "_Open the new user tutorial"
@@ -5691,22 +5556,20 @@
 
 #: ../src/gnome/glade/price.glade.h:7
 #: ../src/gnome-utils/dialog-commodity.c:279
-#, fuzzy
 msgid "Cu_rrency:"
-msgstr "通貨:"
+msgstr "通貨(_R):"
 
 #: ../src/gnome/glade/price.glade.h:8
 msgid "Delete _last price for a stock"
-msgstr ""
+msgstr "株式の最終価格を削除(_L)"
 
 #: ../src/gnome/glade/price.glade.h:9
-#, fuzzy
 msgid "Delete _manually entered prices"
-msgstr "その他のすべての諸口を削除"
+msgstr "手で入力した価格を削除(_D)"
 
 #: ../src/gnome/glade/price.glade.h:10
 msgid "Delete all stock prices based upon the critera below:"
-msgstr ""
+msgstr "次の条件を満たす株価をすべて削除:"
 
 #: ../src/gnome/glade/price.glade.h:11
 msgid "Edit the current price."
@@ -5722,17 +5585,11 @@
 msgstr "株式科目に対して新しくオンラインで見積をもらう"
 
 #: ../src/gnome/glade/price.glade.h:14
-msgid ""
-"If activated, delete all prices before the specified date.  Otherwise the "
-"last stock price dated before the date will be kept and all earlier quotes "
-"deleted."
+msgid "If activated, delete all prices before the specified date.  Otherwise the last stock price dated before the date will be kept and all earlier quotes deleted."
 msgstr ""
 
 #: ../src/gnome/glade/price.glade.h:15
-msgid ""
-"If activated, delete manually entered stock prices dated earlier than the "
-"specified date.  Otherwise only stock prices added by Finance::Quote will be "
-"deleted."
+msgid "If activated, delete manually entered stock prices dated earlier than the specified date.  Otherwise only stock prices added by Finance::Quote will be deleted."
 msgstr ""
 
 #: ../src/gnome/glade/price.glade.h:16
@@ -5740,9 +5597,8 @@
 msgstr "価格エディタ"
 
 #: ../src/gnome/glade/price.glade.h:17
-#, fuzzy
 msgid "Remove _Old"
-msgstr "古いものを削除..."
+msgstr "古い項目を削除(_O)..."
 
 #: ../src/gnome/glade/price.glade.h:18
 msgid "Remove prices older than a user-entered date"
@@ -5798,10 +5654,7 @@
 msgstr "減少"
 
 #: ../src/gnome/glade/print.glade.h:7
-msgid ""
-"Enter a title for this custom format.  This title will appear in the \"Check "
-"format\" selector of the Print Check dialog.  Using the title of an exiting "
-"custom format will cause that format to be overwritten."
+msgid "Enter a title for this custom format.  This title will appear in the \"Check format\" selector of the Print Check dialog.  Using the title of an exiting custom format will cause that format to be overwritten."
 msgstr ""
 
 #: ../src/gnome/glade/print.glade.h:8
@@ -5856,9 +5709,8 @@
 msgstr "日付の書式:"
 
 #: ../src/gnome/glade/print.glade.h:28
-#, fuzzy
 msgid "_Notes:"
-msgstr "注釈"
+msgstr "備考(_N):"
 
 #: ../src/gnome/glade/print.glade.h:29
 #, fuzzy
@@ -5901,7 +5753,8 @@
 msgid "<b>Reconcile Information</b>"
 msgstr "照合情報"
 
-#: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:721
+#: ../src/gnome/glade/reconcile.glade.h:2
+#: ../src/gnome/window-reconcile.c:721
 #, fuzzy
 msgid "Enter _Interest Payment..."
 msgstr "金利"
@@ -5912,14 +5765,14 @@
 msgstr "子勘定科目を含める"
 
 #. starting balance title/value
-#: ../src/gnome/glade/reconcile.glade.h:4 ../src/gnome/window-reconcile.c:1672
+#: ../src/gnome/glade/reconcile.glade.h:4
+#: ../src/gnome/window-reconcile.c:1672
 msgid "Starting Balance:"
 msgstr "期首残高:"
 
 #: ../src/gnome/glade/reconcile.glade.h:5
-#, fuzzy
 msgid "Statement _Date:"
-msgstr "請求書の日付:"
+msgstr "ステートメントの日付(_D):"
 
 #: ../src/gnome/glade/reconcile.glade.h:6
 #, fuzzy
@@ -5966,8 +5819,7 @@
 
 #: ../src/gnome/glade/register.glade.h:11
 #: ../src/gnome/gnc-plugin-page-register.c:249
-msgid ""
-"Create a Scheduled Transaction with the current transaction as a template"
+msgid "Create a Scheduled Transaction with the current transaction as a template"
 msgstr ""
 
 #: ../src/gnome/glade/register.glade.h:12
@@ -6040,13 +5892,12 @@
 msgstr "帳簿の一番下の空白の取引に移動する"
 
 #: ../src/gnome/glade/register.glade.h:33
-#, fuzzy
 msgid "Num_ber"
-msgstr "番号"
+msgstr "番号(_B)"
 
 #: ../src/gnome/glade/register.glade.h:34
 msgid "Paste Transaction"
-msgstr "取引の貼付け"
+msgstr "取引を貼り付け"
 
 #: ../src/gnome/glade/register.glade.h:35
 #: ../src/gnome/gnc-plugin-page-register.c:194
@@ -6087,17 +5938,14 @@
 msgstr "スケジュール"
 
 #: ../src/gnome/glade/register.glade.h:43
-#, fuzzy
 msgid "Select Range:"
-msgstr "範囲設定(_R)..."
+msgstr "範囲設定:"
 
 #: ../src/gnome/glade/register.glade.h:44
-#, fuzzy
 msgid "Select _All"
-msgstr "全て選択"
+msgstr "全て選択(_A)"
 
 #: ../src/gnome/glade/register.glade.h:45
-#, fuzzy
 msgid "Show _All"
 msgstr "すべて表示(_A)"
 
@@ -6118,8 +5966,7 @@
 
 #: ../src/gnome/glade/register.glade.h:49
 #: ../src/gnome/gnc-plugin-page-register.c:285
-msgid ""
-"Show transactions on one or two lines and expand the current transaction"
+msgid "Show transactions on one or two lines and expand the current transaction"
 msgstr "取引を一行あるいは二行で表示し、編集中の取引を拡張する"
 
 #: ../src/gnome/glade/register.glade.h:50
@@ -6156,28 +6003,32 @@
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:58 ../intl-scm/guile-strings.c:3698
+#: ../src/gnome/glade/register.glade.h:58
+#: ../intl-scm/guile-strings.c:3698
 #: ../intl-scm/guile-strings.c:4852
 msgid "Sort by amount"
 msgstr "金額順にソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:59 ../intl-scm/guile-strings.c:3674
+#: ../src/gnome/glade/register.glade.h:59
+#: ../intl-scm/guile-strings.c:3674
 #: ../intl-scm/guile-strings.c:4828
 msgid "Sort by date"
 msgstr "日付順にソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:60 ../intl-scm/guile-strings.c:3702
+#: ../src/gnome/glade/register.glade.h:60
+#: ../intl-scm/guile-strings.c:3702
 #: ../intl-scm/guile-strings.c:4856
 msgid "Sort by description"
 msgstr "説明順にソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:61 ../intl-scm/guile-strings.c:3710
+#: ../src/gnome/glade/register.glade.h:61
+#: ../intl-scm/guile-strings.c:3710
 #: ../intl-scm/guile-strings.c:4864
 msgid "Sort by memo"
 msgstr "摘要順にソート"
@@ -6205,9 +6056,8 @@
 msgstr ""
 
 #: ../src/gnome/glade/register.glade.h:68
-#, fuzzy
 msgid "St_yle"
-msgstr "スタイル"
+msgstr "スタイル(_Y)"
 
 #: ../src/gnome/glade/register.glade.h:69
 #, fuzzy
@@ -6215,9 +6065,8 @@
 msgstr "日付"
 
 #: ../src/gnome/glade/register.glade.h:71
-#, fuzzy
 msgid "Toda_y"
-msgstr "本日"
+msgstr "本日(_Y)"
 
 #: ../src/gnome/glade/register.glade.h:72
 #, fuzzy
@@ -6230,9 +6079,8 @@
 msgstr "取引内容"
 
 #: ../src/gnome/glade/register.glade.h:75
-#, fuzzy
 msgid "_Amount"
-msgstr "合計"
+msgstr "金額(_A)"
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/glade/register.glade.h:76
@@ -6252,14 +6100,12 @@
 msgstr "二行(_D)"
 
 #: ../src/gnome/glade/register.glade.h:84
-#, fuzzy
 msgid "_Earliest"
-msgstr "最も古いものを表示する"
+msgstr ""
 
 #: ../src/gnome/glade/register.glade.h:87
-#, fuzzy
 msgid "_Frozen"
-msgstr "凍結済:f"
+msgstr "凍結済(_F)"
 
 #: ../src/gnome/glade/register.glade.h:88
 #: ../src/gnome/gnc-plugin-page-register.c:245
@@ -6268,29 +6114,24 @@
 msgstr "飛ぶ(_J)"
 
 #: ../src/gnome/glade/register.glade.h:89
-#, fuzzy
 msgid "_Latest"
-msgstr "最後"
+msgstr "最新(_L)"
 
 #: ../src/gnome/glade/register.glade.h:90
-#, fuzzy
 msgid "_Memo"
-msgstr "摘要"
+msgstr "摘要(_M)"
 
 #: ../src/gnome/glade/register.glade.h:91
-#, fuzzy
 msgid "_Notes"
-msgstr "注釈"
+msgstr "備考(_N)"
 
 #: ../src/gnome/glade/register.glade.h:92
-#, fuzzy
 msgid "_Number"
-msgstr "番号"
+msgstr "番号(_N)"
 
 #: ../src/gnome/glade/register.glade.h:93
-#, fuzzy
 msgid "_Number:"
-msgstr "番号"
+msgstr "番号(_N):"
 
 #: ../src/gnome/glade/register.glade.h:94
 #, fuzzy
@@ -6303,19 +6144,16 @@
 msgstr "標準の順番"
 
 #: ../src/gnome/glade/register.glade.h:97
-#, fuzzy
 msgid "_Statement Date"
-msgstr "請求書の日付:"
+msgstr "ステートメントの日付(_S)"
 
 #: ../src/gnome/glade/register.glade.h:98
-#, fuzzy
 msgid "_Today"
-msgstr "本日"
+msgstr "本日(_T)"
 
 #: ../src/gnome/glade/register.glade.h:99
-#, fuzzy
 msgid "_Transaction Journal"
-msgstr "取引出納帳"
+msgstr "取引仕訳帳(_T)"
 
 #: ../src/gnome/glade/register.glade.h:100
 #, fuzzy
@@ -6328,7 +6166,6 @@
 msgstr "コード"
 
 #: ../src/gnome/glade/sched-xact.glade.h:1
-#, fuzzy
 msgid " days"
 msgstr "æ—¥"
 
@@ -6378,6 +6215,45 @@
 "Last Saturday\n"
 "Last Sunday"
 msgstr ""
+"1æ—¥\n"
+"2æ—¥\n"
+"3æ—¥\n"
+"4æ—¥\n"
+"5æ—¥\n"
+"6æ—¥\n"
+"7æ—¥\n"
+"8æ—¥\n"
+"9æ—¥\n"
+"10æ—¥\n"
+"11æ—¥\n"
+"12æ—¥\n"
+"13æ—¥\n"
+"14æ—¥\n"
+"15æ—¥\n"
+"16æ—¥\n"
+"17æ—¥\n"
+"18æ—¥\n"
+"19æ—¥\n"
+"20æ—¥\n"
+"21æ—¥\n"
+"22æ—¥\n"
+"23æ—¥\n"
+"24æ—¥\n"
+"25æ—¥\n"
+"26æ—¥\n"
+"27æ—¥\n"
+"28æ—¥\n"
+"29æ—¥\n"
+"30æ—¥\n"
+"31æ—¥\n"
+"月末\n"
+"最終月曜日\n"
+"最終火曜日\n"
+"最終水曜日\n"
+"最終木曜日\n"
+"最終金曜日\n"
+"最終土曜日\n"
+"最終日曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:44
 #, fuzzy
@@ -6385,9 +6261,8 @@
 msgstr "終了日付"
 
 #: ../src/gnome/glade/sched-xact.glade.h:45
-#, fuzzy
 msgid "<b>Name</b>"
-msgstr "番号"
+msgstr "<b>名前</b>"
 
 #: ../src/gnome/glade/sched-xact.glade.h:46
 #, fuzzy
@@ -6395,18 +6270,16 @@
 msgstr "勘定科目型"
 
 #: ../src/gnome/glade/sched-xact.glade.h:47
-#, fuzzy
 msgid "<b>Options</b>"
-msgstr "取引内容"
+msgstr "<b>オプション</b>"
 
 #: ../src/gnome/glade/sched-xact.glade.h:48
 msgid "<b>Since Last Run Dialog</b>"
-msgstr ""
+msgstr "<b>前回起動時以降ダイアログ</b>"
 
 #: ../src/gnome/glade/sched-xact.glade.h:49
-#, fuzzy
 msgid "<b>Transaction Editor Defaults</b>"
-msgstr "取引出納帳"
+msgstr "<b>取引エディタデフォルト</b>"
 
 #: ../src/gnome/glade/sched-xact.glade.h:51
 #, fuzzy
@@ -6420,12 +6293,12 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:53
 msgid "Advanced..."
-msgstr ""
+msgstr "高度な設定..."
 
 #: ../src/gnome/glade/sched-xact.glade.h:54
 #: ../src/gnome-utils/glade/transfer.glade.h:5
 msgid "Amount:"
-msgstr "総額:"
+msgstr "金額:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:55
 #, fuzzy
@@ -6502,7 +6375,8 @@
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../src/gnome/glade/sched-xact.glade.h:78 ../intl-scm/guile-strings.c:6220
+#: ../src/gnome/glade/sched-xact.glade.h:78
+#: ../intl-scm/guile-strings.c:6220
 #: ../intl-scm/guile-strings.c:6744
 #, fuzzy
 msgid "Date Range"
@@ -6548,14 +6422,12 @@
 msgstr "新規勘定科目"
 
 #: ../src/gnome/glade/sched-xact.glade.h:88
-#, fuzzy
 msgid "Every"
-msgstr "入力"
+msgstr " "
 
 #: ../src/gnome/glade/sched-xact.glade.h:90
-#, fuzzy
 msgid "First on the:"
-msgstr "最初のオプション"
+msgstr "1回目:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:91
 msgid ""
@@ -6580,30 +6452,27 @@
 #: ../src/gnome-utils/gnc-dense-cal.c:328
 #: ../src/gnome-utils/gnc-tree-view-sx-list.c:181
 msgid "Frequency"
-msgstr ""
+msgstr "頻度"
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:100 ../intl-scm/guile-strings.c:4158
+#: ../src/gnome/glade/sched-xact.glade.h:100
+#: ../intl-scm/guile-strings.c:4158
 #: ../intl-scm/guile-strings.c:5312
-#, fuzzy
 msgid "Friday"
-msgstr "検索"
+msgstr "金曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:101
-#, fuzzy
 msgid "Ignore"
-msgstr "所得"
+msgstr "無視"
 
 #: ../src/gnome/glade/sched-xact.glade.h:102
-#, fuzzy
 msgid "Interest Rate Change Frequency"
-msgstr "金利"
+msgstr "利率変更頻度"
 
 #: ../src/gnome/glade/sched-xact.glade.h:103
-#, fuzzy
 msgid "Interest Rate:"
-msgstr "金利"
+msgstr "利率:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:104
 #, fuzzy
@@ -6612,56 +6481,51 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:105
 msgid "Last Occurred: "
-msgstr ""
+msgstr "前回: "
 
 #: ../src/gnome/glade/sched-xact.glade.h:106
 msgid "Length:"
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:107
-#, fuzzy
 msgid "Loan Account:"
-msgstr "損失科目"
+msgstr "ローン勘定科目:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:108
-#, fuzzy
 msgid "Loan Information"
-msgstr "税金情報"
+msgstr "ローン情報"
 
 #: ../src/gnome/glade/sched-xact.glade.h:109
-#, fuzzy
 msgid "Make Scheduled Transaction"
-msgstr "複製取引一致"
+msgstr "予定取引を作成"
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:110 ../intl-scm/guile-strings.c:4150
+#: ../src/gnome/glade/sched-xact.glade.h:110
+#: ../intl-scm/guile-strings.c:4150
 #: ../intl-scm/guile-strings.c:5304
-#, fuzzy
 msgid "Monday"
-msgstr "本日"
+msgstr "月曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:112
-#, fuzzy
 msgid "Months Remaining:"
-msgstr "期間の終了日"
+msgstr "残月数:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:113
 msgid "Mortgage/Loan Druid"
-msgstr ""
+msgstr "ローンウィザード"
 
 #: ../src/gnome/glade/sched-xact.glade.h:114
 msgid "Mortgage/Loan Repayment Setup"
-msgstr ""
+msgstr "ローン返済設定"
 
 #: ../src/gnome/glade/sched-xact.glade.h:116
 msgid "Name:"
 msgstr "名前:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:117
-#, fuzzy
 msgid "Never End"
-msgstr "前年度の終了日"
+msgstr "無期限"
 
 #: ../src/gnome/glade/sched-xact.glade.h:119
 msgid ""
@@ -6672,25 +6536,28 @@
 "Semi-Monthly\n"
 "Monthly"
 msgstr ""
+"なし\n"
+"1回\n"
+"毎日\n"
+"毎週\n"
+"月2回\n"
+"毎月"
 
 #: ../src/gnome/glade/sched-xact.glade.h:125
-#, fuzzy
 msgid "Not scheduled"
-msgstr "スケジュール"
+msgstr "予定なし"
 
 #: ../src/gnome/glade/sched-xact.glade.h:126
 msgid "Notify me when created"
-msgstr ""
+msgstr "作成されたら知らせる"
 
 #: ../src/gnome/glade/sched-xact.glade.h:127
-#, fuzzy
 msgid "Number of Occurrences:"
-msgstr "列数"
+msgstr "発生回数:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:128
-#, fuzzy
 msgid "Obsolete Scheduled Transactions"
-msgstr "取引全体を削除する"
+msgstr "以前の予定取引"
 
 #: ../src/gnome/glade/sched-xact.glade.h:129
 #, fuzzy
@@ -6709,7 +6576,7 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:135
 msgid "Payment Frequency"
-msgstr ""
+msgstr "支払頻度"
 
 #: ../src/gnome/glade/sched-xact.glade.h:136
 #, fuzzy
@@ -6734,7 +6601,7 @@
 #: ../src/gnome/glade/sched-xact.glade.h:140
 #, fuzzy
 msgid "Postpone"
-msgstr "延期(_P)"
+msgstr "延期"
 
 #: ../src/gnome/glade/sched-xact.glade.h:142
 #, fuzzy
@@ -6754,9 +6621,8 @@
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:146
-#, fuzzy
 msgid "Range: "
-msgstr "名前:"
+msgstr "範囲: "
 
 #: ../src/gnome/glade/sched-xact.glade.h:147
 #, fuzzy
@@ -6764,23 +6630,20 @@
 msgstr "期末残高:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:148
-#, fuzzy
 msgid "Repayment"
-msgstr "支払"
+msgstr "返済"
 
 #: ../src/gnome/glade/sched-xact.glade.h:149
 msgid "Repayment Frequency"
-msgstr ""
+msgstr "返済頻度"
 
 #: ../src/gnome/glade/sched-xact.glade.h:150
-#, fuzzy
 msgid "Repayment Type"
-msgstr "支払"
+msgstr "返済タイプ"
 
 #: ../src/gnome/glade/sched-xact.glade.h:151
-#, fuzzy
 msgid "Repeats:"
-msgstr "帳票"
+msgstr "繰返し:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:152
 #, fuzzy
@@ -6789,10 +6652,11 @@
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:153 ../intl-scm/guile-strings.c:4160
+#: ../src/gnome/glade/sched-xact.glade.h:153
+#: ../intl-scm/guile-strings.c:4160
 #: ../intl-scm/guile-strings.c:5314
 msgid "Saturday"
-msgstr ""
+msgstr "土曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:154
 #, fuzzy
@@ -6806,14 +6670,12 @@
 msgstr "全て選択"
 
 #: ../src/gnome/glade/sched-xact.glade.h:156
-#, fuzzy
 msgid "Select occurrence date above."
-msgstr "通貨/証券を選択 "
+msgstr "上で日付を選択してください。"
 
 #: ../src/gnome/glade/sched-xact.glade.h:157
-#, fuzzy
 msgid "Semi-Monthly"
-msgstr "ほぼ毎月"
+msgstr "月2回"
 
 #: ../src/gnome/glade/sched-xact.glade.h:158
 #, fuzzy
@@ -6831,11 +6693,11 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:161
 msgid "Since Last Run"
-msgstr ""
+msgstr "前回起動時以降"
 
 #: ../src/gnome/glade/sched-xact.glade.h:162
 msgid "Since Last Run..."
-msgstr ""
+msgstr "前回起動時以降..."
 
 #: ../src/gnome/glade/sched-xact.glade.h:163
 #, fuzzy
@@ -6843,21 +6705,20 @@
 msgstr "勘定科目を選択"
 
 #: ../src/gnome/glade/sched-xact.glade.h:165
-#, fuzzy
 msgid "Start Date: "
-msgstr "開始日付"
+msgstr "開始日: "
 
 #: ../src/gnome/glade/sched-xact.glade.h:166
-#, fuzzy
 msgid "State"
-msgstr "日付"
+msgstr "状態"
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:167 ../intl-scm/guile-strings.c:4148
+#: ../src/gnome/glade/sched-xact.glade.h:167
+#: ../intl-scm/guile-strings.c:4148
 #: ../intl-scm/guile-strings.c:5302
 msgid "Sunday"
-msgstr ""
+msgstr "日曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:168
 #, fuzzy
@@ -6870,47 +6731,35 @@
 msgstr "取引削除"
 
 #: ../src/gnome/glade/sched-xact.glade.h:170
-msgid ""
-"The following Scheduled Transactions reference the deleted account, and must "
-"now be corrected.  Press OK to edit them."
+msgid "The following Scheduled Transactions reference the deleted account, and must now be corrected.  Press OK to edit them."
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:171
-msgid ""
-"The following scheduled transactions have expired.  Select those you wish to "
-"delete."
+msgid "The following scheduled transactions have expired.  Select those you wish to delete."
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:172
-msgid ""
-"The listed Scheduled Transactions are to-be created soon.  Select any which "
-"you would like to create now, and click \"Forward\" to create them."
+msgid "The listed Scheduled Transactions are to-be created soon.  Select any which you would like to create now, and click \"Forward\" to create them."
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:173
-msgid ""
-"This druid will walk you through any scheduled transactions that should be "
-"created."
+msgid "This druid will walk you through any scheduled transactions that should be created."
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:174
 msgid ""
-"This is a step-by-step method of creating a loan repayment setup within "
-"GnuCash.  In this Druid, you can input the parameters of your loan and its "
-"repayment and give the details of its payback. Using that information, the "
-"appropriate Scheduled Transactions will be created.\n"
+"This is a step-by-step method of creating a loan repayment setup within GnuCash.  In this Druid, you can input the parameters of your loan and its repayment and give the details of its payback. Using that information, the appropriate Scheduled Transactions will be created.\n"
 "\n"
-"If you make a mistake or want to make changes later, you can edit the "
-"created Scheduled Transactions directly."
+"If you make a mistake or want to make changes later, you can edit the created Scheduled Transactions directly."
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:177 ../intl-scm/guile-strings.c:4156
+#: ../src/gnome/glade/sched-xact.glade.h:177
+#: ../intl-scm/guile-strings.c:4156
 #: ../intl-scm/guile-strings.c:5310
-#, fuzzy
 msgid "Thursday"
-msgstr "本日"
+msgstr "木曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:178
 #, fuzzy
@@ -6924,21 +6773,19 @@
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:180 ../intl-scm/guile-strings.c:4152
+#: ../src/gnome/glade/sched-xact.glade.h:180
+#: ../intl-scm/guile-strings.c:4152
 #: ../intl-scm/guile-strings.c:5306
-#, fuzzy
 msgid "Tuesday"
-msgstr "本日"
+msgstr "火曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:182
-#, fuzzy
 msgid "Unselect All"
-msgstr "全て選択"
+msgstr "選択解除"
 
 #: ../src/gnome/glade/sched-xact.glade.h:183
-#, fuzzy
 msgid "Until:"
-msgstr "単位:"
+msgstr "期限:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:184
 #, fuzzy
@@ -6953,38 +6800,37 @@
 #: ../src/gnome/glade/sched-xact.glade.h:187
 #, fuzzy
 msgid "Variable"
-msgstr "変数ではありません"
+msgstr "変数"
 
 #: ../src/gnome/glade/sched-xact.glade.h:188
 #, fuzzy
 msgid "Variables"
-msgstr "表"
+msgstr "変数"
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:189 ../intl-scm/guile-strings.c:4154
+#: ../src/gnome/glade/sched-xact.glade.h:189
+#: ../intl-scm/guile-strings.c:4154
 #: ../intl-scm/guile-strings.c:5308
 msgid "Wednesday"
-msgstr ""
+msgstr "水曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:191
 msgid "What to do, what to do?"
 msgstr ""
 
 #: ../src/gnome/glade/sched-xact.glade.h:192
-#, fuzzy
 msgid "_Auto-create new transactions"
-msgstr "一致している取引..."
+msgstr "取引を自動で新規作成(_A)"
 
 #: ../src/gnome/glade/sched-xact.glade.h:193
 #, fuzzy
 msgid "_Notify before transactions are created "
-msgstr "複製とともに読み込まれた取引"
+msgstr "取引が作成される前に通知(_N) "
 
 #: ../src/gnome/glade/sched-xact.glade.h:194
-#, fuzzy
 msgid "_Review created transactions"
-msgstr "選択されている取引を切り取る"
+msgstr "作成された取引を確認(_R)"
 
 #: ../src/gnome/glade/sched-xact.glade.h:195
 #, fuzzy
@@ -6993,26 +6839,24 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:196
 #: ../src/gnome-utils/glade/preferences.glade.h:168
-#, fuzzy
 msgid "days"
-msgstr "æ—¥"
+msgstr "曜日"
 
 #: ../src/gnome/glade/sched-xact.glade.h:197
-#, fuzzy
 msgid "days."
-msgstr "æ—¥"
+msgstr "日ごと。"
 
 #: ../src/gnome/glade/sched-xact.glade.h:198
-#, fuzzy
 msgid ""
 "months\n"
 "years"
-msgstr "月"
+msgstr ""
+"月\n"
+"å¹´"
 
 #: ../src/gnome/glade/sched-xact.glade.h:200
-#, fuzzy
 msgid "months."
-msgstr "月"
+msgstr "ヶ月ごと。"
 
 #: ../src/gnome/glade/sched-xact.glade.h:201
 #, fuzzy
@@ -7026,17 +6870,15 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:203
 msgid "then on the:"
-msgstr ""
+msgstr "その次:"
 
 #: ../src/gnome/glade/sched-xact.glade.h:204
-#, fuzzy
 msgid "weeks."
-msgstr "週"
+msgstr "週ごと。"
 
 #: ../src/gnome/glade/stocks.glade.h:1
-#, fuzzy
 msgid "<b>A_sset Account</b>"
-msgstr "親勘定科目"
+msgstr "<b>資産勘定科目</b>"
 
 #: ../src/gnome/glade/stocks.glade.h:2
 msgid "<b>_Income Account</b>"
@@ -7047,34 +6889,24 @@
 msgstr "現金の代わり"
 
 #: ../src/gnome/glade/stocks.glade.h:4
-#, fuzzy
 msgid "Currenc_y:"
-msgstr "通貨:"
+msgstr "通貨(_Y):"
 
 #: ../src/gnome/glade/stocks.glade.h:5
-#, fuzzy
 msgid "Desc_ription:"
-msgstr "説明:"
+msgstr "説明(_R):"
 
 #: ../src/gnome/glade/stocks.glade.h:6
 #, fuzzy
-msgid ""
-"Enter the date and the number of shares you gained or lost from the stock "
-"split or merger. For stock mergers (negative splits) use a negative value "
-"for the share distribution. You can also enter a description of the "
-"transaction, or accept the default one."
+msgid "Enter the date and the number of shares you gained or lost from the stock split or merger. For stock mergers (negative splits) use a negative value for the share distribution. You can also enter a description of the transaction, or accept the default one."
 msgstr ""
 "株式の分割/統合で利益または損失があった株式の日付と株数を入力してください\n"
 "株式統合の場合(分割の反対)株数の値に負の値を使用してください。\n"
-"取引の説明に関しては入力することもできますし、デフォルトのものをそのまま使用"
-"することもできます"
+"取引の説明に関しては入力することもできますし、デフォルトのものをそのまま使用することもできます"
 
 #: ../src/gnome/glade/stocks.glade.h:7
 #, fuzzy
-msgid ""
-"If you are finished creating the stock split or merger, press `Apply'. You "
-"may also press `Back' to review your choices, or `Cancel' to quit without "
-"making any changes."
+msgid "If you are finished creating the stock split or merger, press `Apply'. You may also press `Back' to review your choices, or `Cancel' to quit without making any changes."
 msgstr ""
 "株の分割または合併の記録が終了したら、'終了'をクリックしてください。\n"
 "'戻る'をクリックすると、今までの選択項目を確認できます。'キャンセル'を\n"
@@ -7082,18 +6914,14 @@
 
 #: ../src/gnome/glade/stocks.glade.h:8
 #, fuzzy
-msgid ""
-"If you received a cash disbursement as a result of the stock split, enter "
-"the details of that payment here. Otherwise, just click `Forward'."
+msgid "If you received a cash disbursement as a result of the stock split, enter the details of that payment here. Otherwise, just click `Forward'."
 msgstr ""
 "もし株式分割の結果として現金の支払を受け取ったならば、\n"
 "ここには支払の詳細を入力してください。そうでなければ'次'をクリック"
 
 #: ../src/gnome/glade/stocks.glade.h:9
 #, fuzzy
-msgid ""
-"If you want to record a stock price for the split, enter it below. You may "
-"safely leave it blank."
+msgid "If you want to record a stock price for the split, enter it below. You may safely leave it blank."
 msgstr ""
 "株式分割に対する株価を記録したい場合には下に入力してください。\n"
 "空白のままでも大丈夫です。"
@@ -7103,8 +6931,7 @@
 msgstr "新規価格(_P):"
 
 #: ../src/gnome/glade/stocks.glade.h:11
-msgid ""
-"Select the account for which you want to record a stock split or merger."
+msgid "Select the account for which you want to record a stock split or merger."
 msgstr "分割または合併に関して記録したい株の勘定科目を選択してください。"
 
 #: ../src/gnome/glade/stocks.glade.h:12
@@ -7113,11 +6940,11 @@
 
 #: ../src/gnome/glade/stocks.glade.h:13
 msgid "Stock Split"
-msgstr "株分割"
+msgstr "株式分割"
 
 #: ../src/gnome/glade/stocks.glade.h:14
 msgid "Stock Split Details"
-msgstr "株分割の詳細"
+msgstr "株式分割の詳細"
 
 #: ../src/gnome/glade/stocks.glade.h:15
 msgid "This druid will help you record a stock split or stock merger."
@@ -7129,9 +6956,8 @@
 msgstr "金額(_A)"
 
 #: ../src/gnome/glade/stocks.glade.h:18
-#, fuzzy
 msgid "_Memo:"
-msgstr "摘要(_M)"
+msgstr "摘要(_M):"
 
 #: ../src/gnome/glade/stocks.glade.h:19
 #, fuzzy
@@ -7145,14 +6971,13 @@
 #: ../src/gnome/glade/tax.glade.h:2
 #, fuzzy
 msgid "<b>Payer Name Source</b>"
-msgstr "支払者名の元"
+msgstr "<b>支払者名の元</b>"
 
 #: ../src/gnome/glade/tax.glade.h:3
 msgid "<b>Tax Information</b>"
 msgstr "<b>税金情報</b>"
 
 #: ../src/gnome/glade/tax.glade.h:4
-#, fuzzy
 msgid "<b>_Accounts</b>"
 msgstr "<b>勘定科目(_A)</b>"
 
@@ -7210,7 +7035,7 @@
 
 #: ../src/gnome/gnc-plugin-account-tree.c:57
 msgid "New Accounts _Page"
-msgstr "勘定科目ページの新規作成(_P)"
+msgstr "勘定科目ページを新規作成(_P)"
 
 #: ../src/gnome/gnc-plugin-account-tree.c:58
 msgid "Open a new Account Tree page"
@@ -7247,7 +7072,7 @@
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:108
 msgid "_QSF Import"
-msgstr "_QSFインポート"
+msgstr "_QSFをインポート"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:109
 msgid "Import a QSF object file"
@@ -7264,7 +7089,7 @@
 #: ../src/gnome/gnc-plugin-basic-commands.c:116
 #, fuzzy
 msgid "Export _Chart of Accounts to QSF"
-msgstr "新しい勘定科目セットを作成する"
+msgstr "勘定科目のグラフをQSFにエクスポート(_C)"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:117
 #, fuzzy
@@ -7290,36 +7115,32 @@
 
 #. Actions menu
 #: ../src/gnome/gnc-plugin-basic-commands.c:131
-#, fuzzy
 msgid "_Scheduled Transactions"
-msgstr "実際の取引"
+msgstr "予定取引(_S)"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:132
-#, fuzzy
 msgid "_Scheduled Transaction Editor"
-msgstr "取引削除"
+msgstr "予定取引エディタ(_S)"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:133
-#, fuzzy
 msgid "The list of Scheduled Transactions"
-msgstr "取引を再計算する"
+msgstr "予定取引の一覧"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:135
 msgid "Since _Last Run..."
-msgstr ""
+msgstr "前回起動時以降(_L)..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:136
-#, fuzzy
 msgid "Create Scheduled Transactions since the last time run"
-msgstr "取引全体を削除する"
+msgstr "前回起動時以降の予定取引を新規作成する"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:138
 msgid "_Mortgage & Loan Repayment..."
-msgstr ""
+msgstr "ローン返済(_M)..."
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:139
 msgid "Setup scheduled transactions for repayment of a loan"
-msgstr ""
+msgstr "ローン返済用の予定取引を設定"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:141
 msgid "Close _Books"
@@ -7340,18 +7161,16 @@
 msgstr "株式や投資信託などの価格を見るまたは編集する"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:150
-#, fuzzy
 msgid "_Security Editor"
-msgstr "証券"
+msgstr "証券エディタ(_S)"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:151
 msgid "View and edit the commodities for stocks and mutual funds"
 msgstr "株式や投資信託などの金融商品を見るまたは編集する"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:153
-#, fuzzy
 msgid "_Financial Calculator"
-msgstr "財務計算機"
+msgstr "財務計算機(_F)"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:154
 msgid "Use the financial calculator"
@@ -7379,7 +7198,7 @@
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:455
 msgid "There are no Scheduled Transactions to be entered at this time."
-msgstr ""
+msgstr "現時点では入力する予定取引はありません。"
 
 #: ../src/gnome/gnc-plugin-budget.c:55
 msgid "New Budget"
@@ -7483,7 +7302,8 @@
 #. Actions menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:179
 #: ../src/gnome/gnc-plugin-page-register.c:227
-#: ../src/gnome-utils/gnc-icons.c:21 ../src/gnome/window-reconcile.c:2022
+#: ../src/gnome-utils/gnc-icons.c:21
+#: ../src/gnome/window-reconcile.c:2022
 msgid "_Transfer..."
 msgstr "資金移動(_T)..."
 
@@ -7507,7 +7327,7 @@
 #: ../src/gnome/gnc-plugin-page-register.c:236
 #, fuzzy
 msgid "View _Lots..."
-msgstr "新規..."
+msgstr "Lotsを表示(_L)..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:186
 #: ../src/gnome/gnc-plugin-page-register.c:237
@@ -7520,9 +7340,7 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:189
 #: ../src/gnome/window-reconcile.c:2026
-msgid ""
-"Check for and repair unbalanced transactions and orphan splits in this "
-"account"
+msgid "Check for and repair unbalanced transactions and orphan splits in this account"
 msgstr ""
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:191
@@ -7531,9 +7349,7 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:192
 #, fuzzy
-msgid ""
-"Check for and repair unbalanced transactions and orphan splits in this "
-"account and its subaccounts"
+msgid "Check for and repair unbalanced transactions and orphan splits in this account and its subaccounts"
 msgstr "勘定科目とその子勘定科目の中の問題点を見つけ、修正する"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:195
@@ -7541,14 +7357,14 @@
 msgstr "すべて検査 & 修復(_L)"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:196
-msgid ""
-"Check for and repair unbalanced transactions and orphan splits in all "
-"accounts"
+msgid "Check for and repair unbalanced transactions and orphan splits in all accounts"
 msgstr ""
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:218
-#: ../src/gnome/gnc-plugin-page-budget.c:164 ../src/gnome/lot-viewer.c:434
-#: ../src/gnome-utils/gnc-file.c:96 ../src/gnome-utils/gnc-file.c:851
+#: ../src/gnome/gnc-plugin-page-budget.c:164
+#: ../src/gnome/lot-viewer.c:434
+#: ../src/gnome-utils/gnc-file.c:96
+#: ../src/gnome-utils/gnc-file.c:851
 #: ../src/gnome/window-reconcile.c:1572
 msgid "Open"
 msgstr "開く"
@@ -7574,14 +7390,22 @@
 #. src/report/standard-reports/account-piecharts.scm
 #: ../src/gnome/gnc-plugin-page-account-tree.c:309
 #: ../src/gnome-utils/glade/preferences.glade.h:34
-#: ../intl-scm/guile-strings.c:1334 ../intl-scm/guile-strings.c:1924
-#: ../intl-scm/guile-strings.c:2384 ../intl-scm/guile-strings.c:2432
-#: ../intl-scm/guile-strings.c:2548 ../intl-scm/guile-strings.c:3008
-#: ../intl-scm/guile-strings.c:3056 ../intl-scm/guile-strings.c:3358
-#: ../intl-scm/guile-strings.c:4042 ../intl-scm/guile-strings.c:4090
-#: ../intl-scm/guile-strings.c:4122 ../intl-scm/guile-strings.c:4196
-#: ../intl-scm/guile-strings.c:4512 ../intl-scm/guile-strings.c:5196
-#: ../intl-scm/guile-strings.c:5244 ../intl-scm/guile-strings.c:5276
+#: ../intl-scm/guile-strings.c:1334
+#: ../intl-scm/guile-strings.c:1924
+#: ../intl-scm/guile-strings.c:2384
+#: ../intl-scm/guile-strings.c:2432
+#: ../intl-scm/guile-strings.c:2548
+#: ../intl-scm/guile-strings.c:3008
+#: ../intl-scm/guile-strings.c:3056
+#: ../intl-scm/guile-strings.c:3358
+#: ../intl-scm/guile-strings.c:4042
+#: ../intl-scm/guile-strings.c:4090
+#: ../intl-scm/guile-strings.c:4122
+#: ../intl-scm/guile-strings.c:4196
+#: ../intl-scm/guile-strings.c:4512
+#: ../intl-scm/guile-strings.c:5196
+#: ../intl-scm/guile-strings.c:5244
+#: ../intl-scm/guile-strings.c:5276
 #: ../intl-scm/guile-strings.c:5350
 msgid "Accounts"
 msgstr "勘定科目"
@@ -7655,8 +7479,7 @@
 
 #: ../src/gnome/gnc-plugin-page-budget.c:144
 #, fuzzy
-msgid ""
-"Estimate a budget value for the selected accounts from past transactions"
+msgid "Estimate a budget value for the selected accounts from past transactions"
 msgstr "選択されたデータの表を表示する"
 
 #: ../src/gnome/gnc-plugin-page-budget.c:167
@@ -7666,8 +7489,10 @@
 
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../src/gnome/gnc-plugin-page-budget.c:275 ../intl-scm/guile-strings.c:4014
-#: ../intl-scm/guile-strings.c:4016 ../intl-scm/guile-strings.c:5168
+#: ../src/gnome/gnc-plugin-page-budget.c:275
+#: ../intl-scm/guile-strings.c:4014
+#: ../intl-scm/guile-strings.c:4016
+#: ../intl-scm/guile-strings.c:5168
 #: ../intl-scm/guile-strings.c:5170
 msgid "Budget"
 msgstr "予算"
@@ -7839,9 +7664,8 @@
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/gnc-plugin-page-register.c:287
-#, fuzzy
 msgid "Transaction _Journal"
-msgstr "取引出納帳"
+msgstr "取引仕訳帳(_J)"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
@@ -7849,7 +7673,8 @@
 #: ../src/register/ledger-core/split-register.c:2003
 #: ../src/register/ledger-core/split-register-layout.c:571
 #: ../src/register/ledger-core/split-register-model.c:183
-#: ../intl-scm/guile-strings.c:3898 ../intl-scm/guile-strings.c:5052
+#: ../intl-scm/guile-strings.c:3898
+#: ../intl-scm/guile-strings.c:5052
 msgid "Transfer"
 msgstr "移動"
 
@@ -7858,7 +7683,8 @@
 #: ../src/gnome/gnc-plugin-page-register.c:545
 #: ../src/gnome/gnc-plugin-page-register.c:1146
 #: ../src/gnome/gnc-plugin-page-register.c:1709
-#: ../intl-scm/guile-strings.c:2176 ../intl-scm/guile-strings.c:2800
+#: ../intl-scm/guile-strings.c:2176
+#: ../intl-scm/guile-strings.c:2800
 msgid "General Ledger"
 msgstr "総勘定元帳"
 
@@ -7871,10 +7697,7 @@
 
 #: ../src/gnome/gnc-plugin-page-register.c:1089
 #, fuzzy
-msgid ""
-"This register has pending changes to a transaction.  Would you like to save "
-"the changes to this transaction, discard the transaction, or cancel the "
-"operation?"
+msgid "This register has pending changes to a transaction.  Would you like to save the changes to this transaction, discard the transaction, or cancel the operation?"
 msgstr ""
 "この取引の情報は変更されました。\n"
 "記録しますか?"
@@ -7924,15 +7747,18 @@
 #. src/report/standard-reports/register.scm
 #: ../src/gnome/gnc-plugin-page-register.c:1727
 #: ../src/gnome-utils/glade/preferences.glade.h:100
-#: ../intl-scm/guile-strings.c:1976 ../intl-scm/guile-strings.c:2600
-#: ../intl-scm/guile-strings.c:3998 ../intl-scm/guile-strings.c:5152
+#: ../intl-scm/guile-strings.c:1976
+#: ../intl-scm/guile-strings.c:2600
+#: ../intl-scm/guile-strings.c:3998
+#: ../intl-scm/guile-strings.c:5152
 msgid "Register"
 msgstr "帳簿"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
 #: ../src/gnome/gnc-plugin-page-register.c:1729
-#: ../intl-scm/guile-strings.c:3918 ../intl-scm/guile-strings.c:5072
+#: ../intl-scm/guile-strings.c:3918
+#: ../intl-scm/guile-strings.c:5072
 msgid "Register Report"
 msgstr "帳票"
 
@@ -7966,9 +7792,8 @@
 msgstr "%s をフィルタ..."
 
 #: ../src/gnome/gnc-plugin-page-sx-list.c:119
-#, fuzzy
 msgid "_Scheduled"
-msgstr "スケジュール"
+msgstr "予定(_S)"
 
 #. File menu
 #. Transaction menu
@@ -7979,28 +7804,24 @@
 msgstr "新規(_N)"
 
 #: ../src/gnome/gnc-plugin-page-sx-list.c:121
-#, fuzzy
 msgid "Create a new scheduled transaction"
-msgstr "取引全体を削除する"
+msgstr "予定取引を新規作成する"
 
 #: ../src/gnome/gnc-plugin-page-sx-list.c:123
-#, fuzzy
 msgid "Edit the selected scheduled transaction"
-msgstr "取引全体を削除する"
+msgstr "選択した予定取引を編集する"
 
 #: ../src/gnome/gnc-plugin-page-sx-list.c:125
-#, fuzzy
 msgid "Delete the selected scheduled transaction"
-msgstr "取引全体を削除する"
+msgstr "選択した予定取引を削除する"
 
 #. FIXME: Does this always refer to only one transaction? Or could
 #. multiple SXs be deleted as well? Ideally, the number of
 #. to-be-deleted SXs should be mentioned here; see
 #. dialog-sx-since-last-run.c:807
 #: ../src/gnome/gnc-plugin-page-sx-list.c:581
-#, fuzzy
 msgid "Do you really want to delete this scheduled transaction?"
-msgstr "本当にこの取引を削除してもよろしいですか?"
+msgstr "本当にこの予定取引を削除してもよろしいですか?"
 
 #: ../src/gnome/gnc-plugin-register.c:48
 msgid "_General Ledger"
@@ -8021,10 +7842,7 @@
 
 #: ../src/gnome/gnc-split-reg.c:707
 #, fuzzy
-msgid ""
-"The current transaction has been changed.  Would you like to record the "
-"changes before closing this page, close the page without recording the "
-"changes, or cancel the close?"
+msgid "The current transaction has been changed.  Would you like to record the changes before closing this page, close the page without recording the changes, or cancel the close?"
 msgstr ""
 "この取引の情報は変更されました。\n"
 "記録しますか?"
@@ -8046,9 +7864,7 @@
 
 #: ../src/gnome/gnc-split-reg.c:969
 #, fuzzy
-msgid ""
-"This transaction contains reconciled splits. Modifying it is not a good idea "
-"because that will cause your reconciled balance to be off."
+msgid "This transaction contains reconciled splits. Modifying it is not a good idea because that will cause your reconciled balance to be off."
 msgstr "調整済の諸口を含めて取引を削除しようとしています。"
 
 #: ../src/gnome/gnc-split-reg.c:993
@@ -8063,9 +7879,7 @@
 
 #: ../src/gnome/gnc-split-reg.c:1069
 #, fuzzy
-msgid ""
-"You would be deleting a reconciled split! This is not a good idea as it will "
-"cause your reconciled balance to be off."
+msgid "You would be deleting a reconciled split! This is not a good idea as it will cause your reconciled balance to be off."
 msgstr "調整済の諸口を含めて取引を削除しようとしています。"
 
 #: ../src/gnome/gnc-split-reg.c:1072
@@ -8074,11 +7888,7 @@
 msgstr "そのファイルには保存できません"
 
 #: ../src/gnome/gnc-split-reg.c:1073
-msgid ""
-"This is the split anchoring this transaction to the register. You may not "
-"delete it from this register window.  You may delete the entire transaction "
-"from this window, or you may navigate to a register that shows another side "
-"of this same transaction and delete the split from that register."
+msgid "This is the split anchoring this transaction to the register. You may not delete it from this register window.  You may delete the entire transaction from this window, or you may navigate to a register that shows another side of this same transaction and delete the split from that register."
 msgstr ""
 
 #: ../src/gnome/gnc-split-reg.c:1100
@@ -8095,15 +7905,12 @@
 msgstr "削除(_D)"
 
 #: ../src/gnome/gnc-split-reg.c:1142
-#, fuzzy
 msgid "Delete the current transaction?"
-msgstr "この取引を削除する"
+msgstr "現在の取引を削除しますか?"
 
 #: ../src/gnome/gnc-split-reg.c:1143
 #, fuzzy
-msgid ""
-"You would be deleting a transaction with reconciled splits! This is not a "
-"good idea as it will cause your reconciled balance to be off."
+msgid "You would be deleting a transaction with reconciled splits! This is not a good idea as it will cause your reconciled balance to be off."
 msgstr "調整済の諸口を含めて取引を削除しようとしています。"
 
 #: ../src/gnome/gnc-split-reg.c:1793
@@ -8140,35 +7947,29 @@
 msgstr "この帳簿のウィンドウを閉じる"
 
 #: ../src/gnome/gnc-split-reg.c:1908
-msgid ""
-"This account may not be edited.  If you want to edit transactions in this "
-"register, please open the account options and turn off the placeholder "
-"checkbox."
+msgid "This account may not be edited.  If you want to edit transactions in this register, please open the account options and turn off the placeholder checkbox."
 msgstr ""
 
 #: ../src/gnome/gnc-split-reg.c:1915
-msgid ""
-"One of the sub-accounts selected may not be edited.  If you want to edit "
-"transactions in this register, please open the sub-account options and turn "
-"off the placeholder checkbox. You may also open an individual account "
-"instead of a set of accounts."
+msgid "One of the sub-accounts selected may not be edited.  If you want to edit transactions in this register, please open the sub-account options and turn off the placeholder checkbox. You may also open an individual account instead of a set of accounts."
 msgstr ""
 
 #: ../src/gnome/gnucash.desktop.in.h:1
-#, fuzzy
 msgid "GnuCash Finance Management"
-msgstr "Gnucash の勘定科目名"
+msgstr "Gnucash財務管理"
 
 #: ../src/gnome/gnucash.desktop.in.h:2
 msgid "Manage your finances, accounts, and investments"
-msgstr ""
+msgstr "あなたの財務・口座・投資を管理"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/gnucash/report/general-journal.scm
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../src/gnome/lot-viewer.c:621 ../intl-scm/guile-strings.c:1982
-#: ../intl-scm/guile-strings.c:2606 ../intl-scm/guile-strings.c:3914
+#: ../src/gnome/lot-viewer.c:621
+#: ../intl-scm/guile-strings.c:1982
+#: ../intl-scm/guile-strings.c:2606
+#: ../intl-scm/guile-strings.c:3914
 #: ../intl-scm/guile-strings.c:5068
 msgid "Title"
 msgstr "タイトル"
@@ -8181,7 +7982,7 @@
 #: ../src/gnome/lot-viewer.c:653
 #, fuzzy, c-format
 msgid "Lots in Account %s"
-msgstr "損失科目"
+msgstr "勘定科目 %s 内のLots"
 
 #: ../src/gnome/reconcile-list.c:210
 #: ../src/register/ledger-core/split-register-layout.c:555
@@ -8246,10 +8047,7 @@
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_commodities.schemas.in.h:14
 #: ../src/gnome/schemas/apps_gnucash_dialog_prices.schemas.in.h:8
-msgid ""
-"This setting contains a list of name which control the order in which the "
-"columns are listed in the dialog. Names may be reordered or removed from "
-"this list to control which columns appear in the dialog and in what order."
+msgid "This setting contains a list of name which control the order in which the columns are listed in the dialog. Names may be reordered or removed from this list to control which columns appear in the dialog and in what order."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:1
@@ -8266,14 +8064,11 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:4
-msgid ""
-"If active, the new hierarchy dialog will be shown whenever the \"New File\" "
-"menu item is chosen. Otherwise it will not be shown."
+msgid "If active, the new hierarchy dialog will be shown whenever the \"New File\" menu item is chosen. Otherwise it will not be shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:5
-msgid ""
-"If active, the new user dialog will be shown. Otherwise it will not be shown."
+msgid "If active, the new user dialog will be shown. Otherwise it will not be shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:6
@@ -8295,9 +8090,7 @@
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:11
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:10
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:10
-msgid ""
-"The X,Y coordinates of the top left corner of the dialog when it was last "
-"closed."
+msgid "The X,Y coordinates of the top left corner of the dialog when it was last closed."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:12
@@ -8307,28 +8100,19 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:13
-msgid ""
-"This field contains the last pathname used by this dialog. It will be used "
-"as the initial filename/pathname the next time this dialog is opened."
+msgid "This field contains the last pathname used by this dialog. It will be used as the initial filename/pathname the next time this dialog is opened."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:14
-msgid ""
-"This setting indicates how the key column is sorted. Possible values for "
-"this setting are 'ascending' and 'descending'."
+msgid "This setting indicates how the key column is sorted. Possible values for this setting are 'ascending' and 'descending'."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:15
-msgid ""
-"This setting indicates whether to search in all items in the current class, "
-"or only in 'active' items in the current class."
+msgid "This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:16
-msgid ""
-"This setting indicates which column in the tree is used for sorting. "
-"Possible values for this setting are the name of any column in this dialog "
-"(see the column_order key) or the keyword 'none'."
+msgid "This setting indicates which column in the tree is used for sorting. Possible values for this setting are the name of any column in this dialog (see the column_order key) or the keyword 'none'."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:17
@@ -8403,17 +8187,11 @@
 msgstr "使用する日付書式"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:3
-msgid ""
-"Each time the date is printed, print the date format immediately below in 8 "
-"point type using the characters Y, M, and D."
+msgid "Each time the date is printed, print the date format immediately below in 8 point type using the characters Y, M, and D."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:4
-msgid ""
-"If the 'date_format' is set to indicate a custom date format, this value is "
-"used as an argument to strftime to produce the date to be printed. It may be "
-"any valid strftime string; for more information about this format, read the "
-"manual page of strftime by \"man 3 strftime\"."
+msgid "If the 'date_format' is set to indicate a custom date format, this value is used as an argument to strftime to produce the date to be printed. It may be any valid strftime string; for more information about this format, read the manual page of strftime by \"man 3 strftime\"."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:5
@@ -8421,10 +8199,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:6
-msgid ""
-"On preprinted checks containing multiple checks per page, this setting "
-"specifies which check position to print. The possible values are 0, 1 and 2, "
-"corresponding to the top, middle and bottom checks on the page."
+msgid "On preprinted checks containing multiple checks per page, this setting specifies which check position to print. The possible values are 0, 1 and 2, corresponding to the top, middle and bottom checks on the page."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:7
@@ -8465,9 +8240,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:16
-msgid ""
-"The default font to use when printing checks. This value will be overridden "
-"by any font specified in a check description file."
+msgid "The default font to use when printing checks. This value will be overridden by any font specified in a check description file."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:17
@@ -8475,49 +8248,31 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:18
-msgid ""
-"This value contains the X,Y coordinates for the start of the date line on "
-"the check. Coordinates are from the lower left corner of the specified check "
-"position."
+msgid "This value contains the X,Y coordinates for the start of the date line on the check. Coordinates are from the lower left corner of the specified check position."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:19
-msgid ""
-"This value contains the X,Y coordinates for the start of the memo line on "
-"the check. Coordinates are from the lower left corner of the specified check "
-"position."
+msgid "This value contains the X,Y coordinates for the start of the memo line on the check. Coordinates are from the lower left corner of the specified check position."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:20
-msgid ""
-"This value contains the X,Y coordinates for the start of the numerical "
-"amount line on the check. Coordinates are from the lower left corner of the "
-"specified check position."
+msgid "This value contains the X,Y coordinates for the start of the numerical amount line on the check. Coordinates are from the lower left corner of the specified check position."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:21
-msgid ""
-"This value contains the X,Y coordinates for the start of the payee line on "
-"the check."
+msgid "This value contains the X,Y coordinates for the start of the payee line on the check."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:22
-msgid ""
-"This value contains the X,Y coordinates for the start of the written amount "
-"line on the check. Coordinates are from the lower left corner of the "
-"specified check position."
+msgid "This value contains the X,Y coordinates for the start of the written amount line on the check. Coordinates are from the lower left corner of the specified check position."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:23
-msgid ""
-"This value contains the Y coordinate for the bottom edge of the check. This "
-"coordinate is from the bottom edge of the sheet of paper."
+msgid "This value contains the Y coordinate for the bottom edge of the check. This coordinate is from the bottom edge of the sheet of paper."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:24
-msgid ""
-"This value specifies the predefined check format to use. The number is the 0-"
-"based index into the list of known check formats."
+msgid "This value specifies the predefined check format to use. The number is the 0-based index into the list of known check formats."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:25
@@ -8526,16 +8281,11 @@
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:1
 #, fuzzy
-msgid ""
-"If active, after reconciling a credit card account, prompt the user to enter "
-"a credit card payment. Otherwise do not prompt the user for this."
+msgid "If active, after reconciling a credit card account, prompt the user to enter a credit card payment. Otherwise do not prompt the user for this."
 msgstr "クレジットカード明細の照合の後で、クレジットカードの支払を入力させる"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:2
-msgid ""
-"If active, all transactions marked as cleared in the register will appear "
-"already selected in the reconcile dialog. Otherwise no transactions will be "
-"initially selected."
+msgid "If active, all transactions marked as cleared in the register will appear already selected in the reconcile dialog. Otherwise no transactions will be initially selected."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:3
@@ -8545,11 +8295,7 @@
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:4
 #: ../src/gnome-utils/glade/preferences.glade.h:97
-msgid ""
-"Prior to reconciling an account which charges or pays interest, prompt the "
-"user to enter a transaction for the interest charge or payment. Currently "
-"only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and "
-"Liability accounts."
+msgid "Prior to reconciling an account which charges or pays interest, prompt the user to enter a transaction for the interest charge or payment. Currently only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:5
@@ -8571,19 +8317,11 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:3
-msgid ""
-"If active, any newly created scheduled transaction will have its 'auto "
-"create' flag set active by default. The user can change this flag during "
-"transaction creation, or at any later time by editing the scheduled "
-"transaction."
+msgid "If active, any newly created scheduled transaction will have its 'auto create' flag set active by default. The user can change this flag during transaction creation, or at any later time by editing the scheduled transaction."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:4
-msgid ""
-"If active, any newly created scheduled transaction will have its 'notify' "
-"flag set by default. The user can change this flag during transaction "
-"creation, or at any later time by editing the scheduled transaction. This "
-"setting only has meaning if the create_auto setting is active."
+msgid "If active, any newly created scheduled transaction will have its 'notify' flag set by default. The user can change this flag during transaction creation, or at any later time by editing the scheduled transaction. This setting only has meaning if the create_auto setting is active."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:5
@@ -8596,20 +8334,14 @@
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:7
 msgid "Show \"since last run\" dialog when a file is opened."
-msgstr ""
+msgstr "ファイルを開くときに「前回起動時以降」ダイアログを表示する。"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:8
-msgid ""
-"This setting controls whether the scheduled transactions \"since last run\" "
-"dialog is shown automatically when a data file is opened. This includes the "
-"initial opening of the data file when GnuCash starts. If this setting is "
-"active, show the dialog, otherwise it is not shown."
+msgid "This setting controls whether the scheduled transactions \"since last run\" dialog is shown automatically when a data file is opened. This includes the initial opening of the data file when GnuCash starts. If this setting is active, show the dialog, otherwise it is not shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in.h:1
-msgid ""
-"Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog "
-"will be shown. Otherwise it will not be shown."
+msgid "Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog will be shown. Otherwise it will not be shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in.h:2
@@ -8724,101 +8456,62 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:23
-msgid ""
-"If active all lines that make up a single transaction will use the same "
-"color for their background. Otherwise the background colors are alternated "
-"on each line."
+msgid "If active all lines that make up a single transaction will use the same color for their background. Otherwise the background colors are alternated on each line."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:24
-msgid ""
-"If active, GnuCash shows an explanation of the auto-save feature the first "
-"time that feature is started. Otherwise no extra explanation is shown."
+msgid "If active, GnuCash shows an explanation of the auto-save feature the first time that feature is started. Otherwise no extra explanation is shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:25
 #, fuzzy
-msgid ""
-"If active, GnuCash will automatically insert a decimal point into values "
-"that are entered without one. Otherwise GnuCash will not modify entered "
-"numbers."
+msgid "If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers."
 msgstr "入力された数字に自動的に小数点を挿入する"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:26
-msgid ""
-"If active, a \"close\" button will be displayed on any notebook tab that may "
-"be closed. Otherwise, no such button will be shown on the tab. Regardless of "
-"this setting, pages can always be closed via the \"close\" menu item or the "
-"\"close\" button on toolbar."
+msgid "If active, a \"close\" button will be displayed on any notebook tab that may be closed. Otherwise, no such button will be shown on the tab. Regardless of this setting, pages can always be closed via the \"close\" menu item or the \"close\" button on toolbar."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:27
-msgid ""
-"If active, a splash screen will be shown at startup. Otherwise no splash "
-"screen will be shown."
+msgid "If active, a splash screen will be shown at startup. Otherwise no splash screen will be shown."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:28
-msgid ""
-"If active, closing a tab moves to the most recently visited tab. Otherwise "
-"closing a tab moves one tab to the left."
+msgid "If active, closing a tab moves to the most recently visited tab. Otherwise closing a tab moves one tab to the left."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:29
-msgid ""
-"If active, each new register will be opened in a new window. Otherwise each "
-"new register will be opened as a tab in the main window."
+msgid "If active, each new register will be opened in a new window. Otherwise each new register will be opened as a tab in the main window."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:30
-msgid ""
-"If active, each new report will be opened in its own window. Otherwise new "
-"reports will be opened as tabs in the main window."
+msgid "If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:31
-msgid ""
-"If active, formal accounting labels \"Credit\" and \"Debit\" will be used "
-"when designating fields on screen. Otherwise, informal labels such as "
-"Increase/Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
+msgid "If active, formal accounting labels \"Credit\" and \"Debit\" will be used when designating fields on screen. Otherwise, informal labels such as Increase/Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:32
-msgid ""
-"If active, gnucash will be allowed to intentionally break file compatibility "
-"with older versions, so that a data file saved in this version cannot be "
-"read by an older version again. Otherwise gnucash will write data files only "
-"in formats that can be read by older versions as well."
+msgid "If active, gnucash will be allowed to intentionally break file compatibility with older versions, so that a data file saved in this version cannot be read by an older version again. Otherwise gnucash will write data files only in formats that can be read by older versions as well."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:33
 #, fuzzy
-msgid ""
-"If active, pressing the enter key will move to the bottom of the register. "
-"Otherwise pressing the enter key will move to the next transaction line."
-msgstr ""
-"これを選択すると、'Enter'を押した際に空白の取引行へ移動します。選択しない場"
-"合、一行下へ移動します。"
+msgid "If active, pressing the enter key will move to the bottom of the register. Otherwise pressing the enter key will move to the next transaction line."
+msgstr "これを選択すると、'Enter'を押した際に空白の取引行へ移動します。選択しない場合、一行下へ移動します。"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:34
-msgid ""
-"If active, the register will be colored as specified by the system theme. "
-"This can be overridden to provide custom colors by editing the gtkrc file in "
-"the users home directory. Otherwise the standard register colors will be "
-"used that GnuCash has always used."
+msgid "If active, the register will be colored as specified by the system theme. This can be overridden to provide custom colors by editing the gtkrc file in the users home directory. Otherwise the standard register colors will be used that GnuCash has always used."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:35
-msgid ""
-"If active, the size and location of each dialog window will be saved when it "
-"is closed. The sizes and locations of content windows will be remembered "
-"when you quit GnuCash. Otherwise the sizes will not be saved."
+msgid "If active, the size and location of each dialog window will be saved when it is closed. The sizes and locations of content windows will be remembered when you quit GnuCash. Otherwise the sizes will not be saved."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
 #, fuzzy
-msgid ""
-"If active, use a 24 hour time format. Otherwise use a 12 hour time format."
+msgid "If active, use a 24 hour time format. Otherwise use a 12 hour time format."
 msgstr "12時間形式ではなく、24時間形式で時刻を表示する。"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:37
@@ -8850,10 +8543,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:43
-msgid ""
-"Show horizontal borders between rows in a register. If active the border "
-"between cells will be indicated with a heavy line. Otherwise the border "
-"between cells will not be marked."
+msgid "Show horizontal borders between rows in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:44
@@ -8866,17 +8556,11 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:47
-msgid ""
-"Show two lines of information for each transaction in a register. This is "
-"the default setting for when a register is first opened. The setting can be "
-"changed at any time via the \"View->Double Line\" menu item."
+msgid "Show two lines of information for each transaction in a register. This is the default setting for when a register is first opened. The setting can be changed at any time via the \"View->Double Line\" menu item."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:48
-msgid ""
-"Show vertical borders between columns in a register. If active the border "
-"between cells will be indicated with a heavy line. Otherwise the border "
-"between cells will not be marked."
+msgid "Show vertical borders between columns in a register. If active the border between cells will be indicated with a heavy line. Otherwise the border between cells will not be marked."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:49
@@ -8896,130 +8580,73 @@
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:52
 #: ../src/gnome-utils/glade/preferences.glade.h:121
-msgid ""
-"The number of minutes until saving of the data file to harddisk will be "
-"started automatically. If zero, no saving will be started automatically."
+msgid "The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:54
-msgid ""
-"This field sets the number of rows to show in a register. It does not "
-"actually affect the display of the contents of the window. It is only used "
-"to set the size of the window when first opened."
+msgid "This field sets the number of rows to show in a register. It does not actually affect the display of the contents of the window. It is only used to set the size of the window when first opened."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:55
-msgid ""
-"This field specifies the default view style when opening a new register "
-"window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The "
-"\"ledger\" setting says to show each transaction on one or two lines. The "
-"\"auto-ledger\" setting does the same, but also expands only the current "
-"transaction to show all splits. The \"journal\" setting shows all "
-"transactions in expanded form."
+msgid "This field specifies the default view style when opening a new register window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The \"ledger\" setting says to show each transaction on one or two lines. The \"auto-ledger\" setting does the same, but also expands only the current transaction to show all splits. The \"journal\" setting shows all transactions in expanded form."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:56
 #, fuzzy
-msgid ""
-"This field specifies the number of automatic decimal places that will be "
-"filled in."
+msgid "This field specifies the number of automatic decimal places that will be filled in."
 msgstr "小数点以下に自動で挿入される桁数"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:57
-msgid ""
-"This key specifies the maximum width of notebook tabs. If the text in the "
-"tab is longer than this value (the test is approximate) then the tab label "
-"will have the middle cut and replaced with an ellipsis."
+msgid "This key specifies the maximum width of notebook tabs. If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:58
-msgid ""
-"This setting allows certain accounts to have their balances reversed in sign "
-"from positive to negative, or vice versa. The setting \"income_expense\" is "
-"for users who like to see negative expenses and positive income. The setting "
-"of \"credit\" is for users who want to see balances reflect the debit/credit "
-"status of the account. The setting \"none\" doesn't reverse the sign on any "
-"balances."
+msgid "This setting allows certain accounts to have their balances reversed in sign from positive to negative, or vice versa. The setting \"income_expense\" is for users who like to see negative expenses and positive income. The setting of \"credit\" is for users who want to see balances reflect the debit/credit status of the account. The setting \"none\" doesn't reverse the sign on any balances."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:59
-msgid ""
-"This setting chooses the way dates are displayed in GnuCash. Possible values "
-"for this setting are \"locale\" to use the system locale setting, \"ce\" for "
-"Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" "
-"for United Kingdom style dates, and \"us\" for United States style dates."
+msgid "This setting chooses the way dates are displayed in GnuCash. Possible values for this setting are \"locale\" to use the system locale setting, \"ce\" for Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United States style dates."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:60
-msgid ""
-"This setting controls how the labels on toolbar buttons are shown. If set to "
-"\"system\" then GnuCash will use the desktop setting for how to draw toolbar "
-"buttons. If set to \"icon\" then only icons will be show on toolbar "
-"buttons.. If set to \"text\" only the labels will be shown. If set to \"both"
-"\" then both icons and labels will be shown. If set to \"both-horiz\" then "
-"icons will be shown for all buttons with labels added on important buttons."
+msgid "This setting controls how the labels on toolbar buttons are shown. If set to \"system\" then GnuCash will use the desktop setting for how to draw toolbar buttons. If set to \"icon\" then only icons will be show on toolbar buttons.. If set to \"text\" only the labels will be shown. If set to \"both\" then both icons and labels will be shown. If set to \"both-horiz\" then icons will be shown for all buttons with labels added on important buttons."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:61
-msgid ""
-"This setting controls the default currency used for reports. If set to "
-"\"locale\" then GnuCash will retrieve the default currency from the user's "
-"locale setting. If set to \"other\", GnuCash will use the setting specified "
-"by the currency_other key."
+msgid "This setting controls the default currency used for reports. If set to \"locale\" then GnuCash will retrieve the default currency from the user's locale setting. If set to \"other\", GnuCash will use the setting specified by the currency_other key."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:62
-msgid ""
-"This setting controls the source of the default currency for new accounts. "
-"If set to \"locale\" then GnuCash will retrieve the default currency from "
-"the user's locale setting. If set to \"other\", GnuCash will use the setting "
-"specified by the currency_other key."
+msgid "This setting controls the source of the default currency for new accounts. If set to \"locale\" then GnuCash will retrieve the default currency from the user's locale setting. If set to \"other\", GnuCash will use the setting specified by the currency_other key."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:63
-msgid ""
-"This setting determines the character that will be used between components "
-"of an account name. Possible values are any single non-alphanumeric unicode "
-"character, or any of the following strings: \"colon\" \"slash\", \"backslash"
-"\", \"dash\" and \"period\"."
+msgid "This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and \"period\"."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:64
-msgid ""
-"This setting determines the edge at which the tabs for switching pages in "
-"notebooks are drawn. Possible values are \"top\", \"left\", \"bottom\" and "
-"\"right\". It defaults to \"top\"."
+msgid "This setting determines the edge at which the tabs for switching pages in notebooks are drawn. Possible values are \"top\", \"left\", \"bottom\" and \"right\". It defaults to \"top\"."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:65
-msgid ""
-"This setting specifies the default currency used for new accounts if the "
-"currency_choice setting is set to \"other\". This field must contain the "
-"three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
+msgid "This setting specifies the default currency used for new accounts if the currency_choice setting is set to \"other\". This field must contain the three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:66
-msgid ""
-"This setting specifies the default currency used for reports if the "
-"currency_choice setting is set to \"other\". This field must contain the "
-"three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
+msgid "This setting specifies the default currency used for reports if the currency_choice setting is set to \"other\". This field must contain the three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:67
-msgid ""
-"This setting specifies the number of days after which old log/backup files "
-"will be deleted (0 = never)."
+msgid "This setting specifies the number of days after which old log/backup files will be deleted (0 = never)."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:68
-#, fuzzy
 msgid "Use 24 hour time format"
-msgstr "12時間形式ではなく、24時間形式で時刻を表示する。"
+msgstr "24時間形式を使う"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:69
-#, fuzzy
 msgid "Use formal account labels"
-msgstr "勘定ラベルを使う"
+msgstr "正式な勘定ラベルを使う"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:70
 msgid "Width of notebook tabs"
@@ -9051,9 +8678,8 @@
 msgstr "その他のすべての諸口を削除"
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:6
-#, fuzzy
 msgid "Delete a transaction"
-msgstr "取引削除"
+msgstr "取引を削除する"
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:7
 #, fuzzy
@@ -9091,16 +8717,11 @@
 msgstr "この取引の諸口をすべて表示する"
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:14
-msgid ""
-"This dialog is presented before allowing you to change the contents of a "
-"reconciled split. Allowing these changes can make it hard to perform future "
-"reconciliations."
+msgid "This dialog is presented before allowing you to change the contents of a reconciled split. Allowing these changes can make it hard to perform future reconciliations."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:15
-msgid ""
-"This dialog is presented before allowing you to delete a commodity that has "
-"price quotes attached. Deleting the commodity will delete the quotes as well."
+msgid "This dialog is presented before allowing you to delete a commodity that has price quotes attached. Deleting the commodity will delete the quotes as well."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:16
@@ -9108,10 +8729,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:17
-msgid ""
-"This dialog is presented before allowing you to delete a transaction that "
-"contains reconciled splits. Doing so will throw off the reconciled value of "
-"the register and can make it hard to perform future reconciliations."
+msgid "This dialog is presented before allowing you to delete a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:18
@@ -9119,43 +8737,27 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:19
-msgid ""
-"This dialog is presented before allowing you to delete multiple price quotes "
-"at one time."
+msgid "This dialog is presented before allowing you to delete multiple price quotes at one time."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:20
-msgid ""
-"This dialog is presented before allowing you to mark a transaction split as "
-"unreconciled. Doing so will throw off the reconciled value of the register "
-"and can make it hard to perform future reconciliations."
+msgid "This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:21
-msgid ""
-"This dialog is presented before allowing you to remove a reconciled split "
-"from a transaction. Doing so will throw off the reconciled value of the "
-"register and can make it hard to perform future reconciliations."
+msgid "This dialog is presented before allowing you to remove a reconciled split from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:22
-msgid ""
-"This dialog is presented before allowing you to remove a splits from a "
-"transaction."
+msgid "This dialog is presented before allowing you to remove a splits from a transaction."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:23
-msgid ""
-"This dialog is presented before allowing you to remove all splits (including "
-"some reconciled splits) from a transaction. Doing so will throw off the "
-"reconciled value of the register and can make it hard to perform future "
-"reconciliations."
+msgid "This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:24
-msgid ""
-"This dialog is presented before allowing you to remove all splits from a "
-"transaction."
+msgid "This dialog is presented before allowing you to remove all splits from a transaction."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:25
@@ -9163,27 +8765,19 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:26
-msgid ""
-"This dialog is presented when you attempt to duplicate a modified invoice "
-"entry. The changed data must be saved or the duplication canceled."
+msgid "This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:27
-msgid ""
-"This dialog is presented when you attempt to duplicate a modified "
-"transaction. The changed data must be saved or the duplication canceled."
+msgid "This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:28
-msgid ""
-"This dialog is presented when you attempt to move out of a modified invoice "
-"entry. The changed data must be either saved or discarded."
+msgid "This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:29
-msgid ""
-"This dialog is presented when you attempt to move out of a modified "
-"transaction. The changed data must be either saved or discarded."
+msgid "This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:1
@@ -9195,9 +8789,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:3
-msgid ""
-"If active, non currency commodities (stocks) will be shown. Otherwise they "
-"will be hidden."
+msgid "If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:4
@@ -9209,8 +8801,7 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:6
-msgid ""
-"Show a grand total of all accounts converted to the default report currency"
+msgid "Show a grand total of all accounts converted to the default report currency"
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:7
@@ -9227,54 +8818,31 @@
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:10
-msgid ""
-"This setting controls the ending date set in profit/loss calculations if the "
-"end_choice setting is set to \"absolute\". This field should contain a date "
-"as represented in seconds from January 1st, 1970."
+msgid "This setting controls the ending date set in profit/loss calculations if the end_choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:11
-msgid ""
-"This setting controls the ending date set in profit/loss calculations if the "
-"end_choice setting is set to anything other than \"absolute\". This field "
-"should contain a value between 0 and 8."
+msgid "This setting controls the ending date set in profit/loss calculations if the end_choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:12
-msgid ""
-"This setting controls the starting date set in profit/loss calculations if "
-"the start_choice setting is set to \"absolute\". This field should contain a "
-"date as represented in seconds from January 1st, 1970."
+msgid "This setting controls the starting date set in profit/loss calculations if the start_choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:13
-msgid ""
-"This setting controls the starting date set in profit/loss calculations if "
-"the start_choice setting is set to anything other than \"absolute\". This "
-"field should contain a value between 0 and 8."
+msgid "This setting controls the starting date set in profit/loss calculations if the start_choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:14
-msgid ""
-"This setting controls the type of ending date used in profit/loss "
-"calculations. If set to \"absolute\" then GnuCash will retrieve the ending "
-"date specified by the end_date key. If set to anything else, GnuCash will "
-"retrieve the ending date specified by the end_period key."
+msgid "This setting controls the type of ending date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the ending date specified by the end_date key. If set to anything else, GnuCash will retrieve the ending date specified by the end_period key."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas.in.h:15
-msgid ""
-"This setting controls the type of starting date used in profit/loss "
-"calculations. If set to \"absolute\" then GnuCash will retrieve the starting "
-"date specified by the start_date key. If set to anything else, GnuCash will "
-"retrieve the starting date specified by the start_period key."
+msgid "This setting controls the type of starting date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the starting date specified by the start_date key. If set to anything else, GnuCash will retrieve the starting date specified by the start_period key."
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_register.schemas.in.h:1
-msgid ""
-"This setting contains the width of the named column in the most recently "
-"closed register window. Changing these values will change the sizes of the "
-"columns in the next opened register"
+msgid "This setting contains the width of the named column in the most recently closed register window. Changing these values will change the sizes of the columns in the next opened register"
 msgstr ""
 
 #: ../src/gnome/schemas/apps_gnucash_window_pages_register.schemas.in.h:2
@@ -9287,146 +8855,133 @@
 msgstr "金融商品の種類を選択して下さい。"
 
 #: ../src/gnome-search/dialog-search.c:272
-#, fuzzy
 msgid "Select"
-msgstr "選択..."
+msgstr "選択"
 
 #: ../src/gnome-search/dialog-search.c:806
 msgid "all criteria are met"
-msgstr ""
+msgstr "すべての条件を満たす"
 
 #: ../src/gnome-search/dialog-search.c:807
 msgid "any criteria are met"
-msgstr ""
+msgstr "いずれかの条件を満たす"
 
 #. Translators: %s is either "item" or the name of some other
 #. * item, e.g. "Customer" or "Invoice".
 #: ../src/gnome-search/dialog-search.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "New %s"
-msgstr "新規"
+msgstr "%sを新規作成"
 
 #: ../src/gnome-search/dialog-search.c:842
-#, fuzzy
 msgid "item"
-msgstr "タイトル"
+msgstr "é …ç›®"
 
 #: ../src/gnome-search/search-account.c:170
-#, fuzzy
 msgid "You have not selected any accounts"
 msgstr "勘定科目が一つも選択されていません"
 
 #: ../src/gnome-search/search-account.c:190
-#, fuzzy
 msgid "matches all accounts"
-msgstr "科目一致検索"
+msgstr "が右のすべての勘定科目と一致する"
 
 #: ../src/gnome-search/search-account.c:193
-#, fuzzy
 msgid "matches any account"
-msgstr "新しい勘定科目を作成する"
+msgstr "が右のどれかの勘定科目と一致する"
 
 #: ../src/gnome-search/search-account.c:194
-#, fuzzy
 msgid "matches no accounts"
-msgstr "科目一致検索"
+msgstr "が右のどの勘定科目とも一致しない"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../src/gnome-search/search-account.c:211 ../intl-scm/guile-strings.c:2032
+#: ../src/gnome-search/search-account.c:211
+#: ../intl-scm/guile-strings.c:2032
 #: ../intl-scm/guile-strings.c:2656
-#, fuzzy
 msgid "Selected Accounts"
-msgstr "勘定科目を選択"
+msgstr "選択した勘定科目"
 
 #: ../src/gnome-search/search-account.c:212
-#, fuzzy
 msgid "Choose Accounts"
-msgstr "損失科目"
+msgstr "勘定科目を選択"
 
 #. Create the label
 #: ../src/gnome-search/search-account.c:246
-#, fuzzy
 msgid "Select Accounts to Match"
-msgstr "勘定科目を選択"
+msgstr "一致すべき勘定科目を選択"
 
 #: ../src/gnome-search/search-account.c:250
-#, fuzzy
 msgid "Select the Accounts to Compare"
-msgstr "勘定科目を選択(なし=すべて)"
+msgstr "比較する勘定科目を選択"
 
 #. Build and connect the toggle
 #: ../src/gnome-search/search-boolean.c:201
-#, fuzzy
 msgid "set true"
-msgstr "真"
+msgstr "真である"
 
 #: ../src/gnome-search/search-date.c:191
 msgid "is before"
-msgstr ""
+msgstr "が右の日付より前"
 
 #: ../src/gnome-search/search-date.c:192
 msgid "is before or on"
-msgstr ""
+msgstr "が右の日付かその前"
 
 #: ../src/gnome-search/search-date.c:193
 msgid "is on"
-msgstr ""
+msgstr "が右の日付"
 
 #: ../src/gnome-search/search-date.c:194
-#, fuzzy
 msgid "is not on"
-msgstr "一覧のオプション"
+msgstr "が右の日付でない"
 
 #: ../src/gnome-search/search-date.c:195
-#, fuzzy
 msgid "is after"
-msgstr "帳簿"
+msgstr "が右の日付より後"
 
 #: ../src/gnome-search/search-date.c:196
 msgid "is on or after"
-msgstr ""
+msgstr "が右の日付かその後"
 
 #: ../src/gnome-search/search-double.c:183
 #: ../src/gnome-search/search-int64.c:185
 #: ../src/gnome-search/search-numeric.c:216
 msgid "is less than"
-msgstr ""
+msgstr "<"
 
 #: ../src/gnome-search/search-double.c:184
 #: ../src/gnome-search/search-int64.c:186
 #: ../src/gnome-search/search-numeric.c:220
 msgid "is less than or equal to"
-msgstr ""
+msgstr "≦"
 
 #: ../src/gnome-search/search-double.c:185
 #: ../src/gnome-search/search-int64.c:187
 #: ../src/gnome-search/search-numeric.c:223
 msgid "equals"
-msgstr ""
+msgstr "="
 
 #: ../src/gnome-search/search-double.c:186
 #: ../src/gnome-search/search-int64.c:188
 #: ../src/gnome-search/search-numeric.c:226
 msgid "does not equal"
-msgstr ""
+msgstr "≠"
 
 #: ../src/gnome-search/search-double.c:187
 #: ../src/gnome-search/search-int64.c:189
 #: ../src/gnome-search/search-numeric.c:229
 msgid "is greater than"
-msgstr ""
+msgstr ">"
 
 #: ../src/gnome-search/search-double.c:188
 #: ../src/gnome-search/search-int64.c:190
 #: ../src/gnome-search/search-numeric.c:233
 msgid "is greater than or equal to"
-msgstr ""
+msgstr "≧"
 
 #: ../src/gnome-search/search.glade.h:1
-#, fuzzy
 msgid " Search "
-msgstr "検索"
+msgstr "検索 "
 
 #: ../src/gnome-search/search.glade.h:2
 msgid "()"
@@ -9437,9 +8992,8 @@
 msgstr "現在の検索に結果を追加する"
 
 #: ../src/gnome-search/search.glade.h:4
-msgid ""
-"Choose whether to search all your data or only that marked as \"active\""
-msgstr ""
+msgid "Choose whether to search all your data or only that marked as \"active\""
+msgstr "すべてのデータを検索するか、\"アクティブ\"の印をつけたデータだけ検索するか選択してください"
 
 #: ../src/gnome-search/search.glade.h:5
 msgid "Delete results from current search"
@@ -9454,72 +9008,66 @@
 msgstr "現在の検索を絞り込む"
 
 #: ../src/gnome-search/search.glade.h:8
-#, fuzzy
 msgid "Search Criteria"
-msgstr "検索文字:"
+msgstr "検索条件"
 
 #: ../src/gnome-search/search.glade.h:9
 msgid "Search for items where"
-msgstr ""
+msgstr "検索方法: "
 
 #: ../src/gnome-search/search.glade.h:10
-#, fuzzy
 msgid "Search only active data"
-msgstr "第二編集行色"
+msgstr "アクティブなデータのみを検索"
 
 #: ../src/gnome-search/search.glade.h:11
 msgid "Type of search"
-msgstr "検索の型"
+msgstr "検索タイプ"
 
 #: ../src/gnome-search/search.glade.h:12
-#, fuzzy
 msgid "_New item..."
-msgstr "新規..."
+msgstr "項目を新規作成(_N)..."
 
 #: ../src/gnome-search/search-numeric.c:216
 msgid "less than"
-msgstr ""
+msgstr "<"
 
 #: ../src/gnome-search/search-numeric.c:219
 msgid "less than or equal to"
-msgstr ""
+msgstr "≦"
 
 #: ../src/gnome-search/search-numeric.c:223
 msgid "equal to"
-msgstr ""
+msgstr "="
 
 #: ../src/gnome-search/search-numeric.c:226
 msgid "not equal to"
-msgstr ""
+msgstr "≠"
 
 #: ../src/gnome-search/search-numeric.c:229
 msgid "greater than"
-msgstr ""
+msgstr ">"
 
 #: ../src/gnome-search/search-numeric.c:232
 msgid "greater than or equal to"
-msgstr ""
+msgstr "≧"
 
 #: ../src/gnome-search/search-numeric.c:249
-#, fuzzy
 msgid "has credits or debits"
-msgstr "貸方または借方"
+msgstr "がもつ貸方または借方"
 
 #: ../src/gnome-search/search-numeric.c:250
-#, fuzzy
 msgid "has debits"
-msgstr "借方"
+msgstr "がもつ借方"
 
 #: ../src/gnome-search/search-numeric.c:251
-#, fuzzy
 msgid "has credits"
-msgstr "貸方"
+msgstr "がもつ貸方"
 
 #. Build and connect the toggles
 #: ../src/gnome-search/search-reconciled.c:222
 #, fuzzy
 msgid "Not Cleared"
-msgstr "清算済"
+msgstr "未清算"
 
 #: ../src/gnome-search/search-reconciled.c:225
 #: ../src/gnome-utils/gnc-tree-view-account.c:571
@@ -9535,7 +9083,7 @@
 #: ../src/gnome-search/search-reconciled.c:231
 #, fuzzy
 msgid "Frozen"
-msgstr "凍結済:f"
+msgstr "凍結済"
 
 #: ../src/gnome-search/search-reconciled.c:234
 #, fuzzy
@@ -9543,35 +9091,34 @@
 msgstr "コード"
 
 #: ../src/gnome-search/search-string.c:186
-#, fuzzy
 msgid "You need to enter a string value"
-msgstr "配当額を入力してください"
+msgstr "文字列値を入力する必要があります"
 
 #: ../src/gnome-search/search-string.c:213
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
-msgstr "正規表現"
+msgstr ""
+"正規表現 '%s' にエラーがあります:\n"
+"%s"
 
 #: ../src/gnome-search/search-string.c:257
-#, fuzzy
 msgid "contains"
-msgstr "内容"
+msgstr "が右の文字列を含む"
 
 #: ../src/gnome-search/search-string.c:258
 msgid "matches regex"
-msgstr ""
+msgstr "が右の正規表現にマッチする"
 
 #: ../src/gnome-search/search-string.c:260
 msgid "does not match regex"
-msgstr ""
+msgstr "が右の正規表現にマッチしない"
 
 #. Build and connect the toggle button
 #: ../src/gnome-search/search-string.c:322
-#, fuzzy
 msgid "Case Insensitive?"
-msgstr "大文字/小文字を区別"
+msgstr "大文字/小文字を区別しない?"
 
 #: ../src/gnome/top-level.c:96
 #, c-format
@@ -9579,9 +9126,9 @@
 msgstr ""
 
 #: ../src/gnome/top-level.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction with no Accounts: %s"
-msgstr "処理内容が一致する取引を検索:"
+msgstr "勘定科目のない取引: %s"
 
 #: ../src/gnome/top-level.c:155
 #, c-format
@@ -9602,7 +9149,7 @@
 
 #: ../src/gnome-utils/dialog-account.c:416
 msgid "Could not create opening balance."
-msgstr "期首残高を作成できませんでした"
+msgstr "開始残高を作成できませんでした"
 
 #. primary label
 #: ../src/gnome-utils/dialog-account.c:607
@@ -9613,16 +9160,13 @@
 #. secondary label
 #: ../src/gnome-utils/dialog-account.c:625
 #, c-format
-msgid ""
-"The children of the edited account have to be changed to type \"%s\" to make "
-"them compatible."
+msgid "The children of the edited account have to be changed to type \"%s\" to make them compatible."
 msgstr ""
 
 #. children
 #: ../src/gnome-utils/dialog-account.c:636
-#, fuzzy
 msgid "_Show children accounts"
-msgstr "長い勘定科目名を表示する"
+msgstr "子勘定科目を表示する(_S)"
 
 #: ../src/gnome-utils/dialog-account.c:708
 msgid "The account must be given a name."
@@ -9641,9 +9185,7 @@
 msgstr "勘定の種類を選択して下さい。"
 
 #: ../src/gnome-utils/dialog-account.c:754
-msgid ""
-"The selected account type is incompatible with the one of the selected "
-"parent."
+msgid "The selected account type is incompatible with the one of the selected parent."
 msgstr ""
 
 #: ../src/gnome-utils/dialog-account.c:765
@@ -9653,16 +9195,11 @@
 
 #: ../src/gnome-utils/dialog-account.c:817
 msgid "You must enter a valid opening balance or leave it blank."
-msgstr "適正な期首残高を入力するか、空白のままにしてください。"
+msgstr "適正な開始残高を入力するか、空白のままにしてください。"
 
 #: ../src/gnome-utils/dialog-account.c:841
-#, fuzzy
-msgid ""
-"You must select a transfer account or choose the opening balances equity "
-"account."
-msgstr ""
-"転送する科目を選択するか、開始残高自己資本科目を\n"
-"選択しなければなりません。"
+msgid "You must select a transfer account or choose the opening balances equity account."
+msgstr "転送する科目を選択するか、開始残高の資本勘定科目を選択しなければなりません。"
 
 #: ../src/gnome-utils/dialog-account.c:1324
 msgid "Edit Account"
@@ -9675,9 +9212,7 @@
 
 #: ../src/gnome-utils/dialog-account.c:1830
 #, c-format
-msgid ""
-"Renumber the immediate sub-accounts of %s?  This will replace the account "
-"code field of each child account with a newly generated code."
+msgid "Renumber the immediate sub-accounts of %s?  This will replace the account code field of each child account with a newly generated code."
 msgstr ""
 
 #: ../src/gnome-utils/dialog-commodity.c:166
@@ -9707,19 +9242,16 @@
 msgstr ""
 
 #: ../src/gnome-utils/dialog-commodity.c:269
-#, fuzzy
 msgid "Select security/currency"
-msgstr "通貨/証券を選択 "
+msgstr "証券/通貨を選択"
 
 #: ../src/gnome-utils/dialog-commodity.c:273
-#, fuzzy
 msgid "Select security"
-msgstr "通貨/証券を選択 "
+msgstr "証券を選択"
 
 #: ../src/gnome-utils/dialog-commodity.c:278
-#, fuzzy
 msgid "Select currency"
-msgstr "通貨/証券を選択 "
+msgstr "通貨を選択"
 
 #: ../src/gnome-utils/dialog-commodity.c:510
 #, fuzzy
@@ -9733,33 +9265,28 @@
 msgstr "ローカル時間を使用する"
 
 #: ../src/gnome-utils/dialog-commodity.c:955
-#, fuzzy
 msgid "Edit currency"
-msgstr "通貨/証券を選択 "
+msgstr "通貨を編集"
 
 #: ../src/gnome-utils/dialog-commodity.c:956
-#, fuzzy
 msgid "Currency Information"
-msgstr "価格情報"
+msgstr "通貨情報"
 
 #: ../src/gnome-utils/dialog-commodity.c:959
-#, fuzzy
 msgid "Edit security"
-msgstr "通貨/証券を選択 "
+msgstr "証券を編集"
 
 #: ../src/gnome-utils/dialog-commodity.c:959
-#, fuzzy
 msgid "New security"
-msgstr "通貨/証券を選択 "
+msgstr "証券を新規作成"
 
 #: ../src/gnome-utils/dialog-commodity.c:960
-#, fuzzy
 msgid "Security Information"
-msgstr "価格情報"
+msgstr "証券情報"
 
 #: ../src/gnome-utils/dialog-commodity.c:1206
 msgid "You may not create a new national currency."
-msgstr "通貨を指定して下さい。"
+msgstr "新しい通貨は作成できません。"
 
 #: ../src/gnome-utils/dialog-commodity.c:1218
 msgid "That commodity already exists."
@@ -9767,27 +9294,23 @@
 
 #: ../src/gnome-utils/dialog-commodity.c:1261
 #, fuzzy
-msgid ""
-"You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type"
-"\" for the commodity."
+msgid "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type\" for the commodity."
 msgstr ""
 "金融商品科目の場合、空ではない\"フルネーム\"、\"シンボル/略語\"、\n"
 "および\"タイプ\"を入力しなければなりません。"
 
 #: ../src/gnome-utils/dialog-options.c:880
-#, fuzzy
 msgid "Select all accounts."
-msgstr "勘定科目を選択"
+msgstr "すべての勘定科目を選択する。"
 
 #: ../src/gnome-utils/dialog-options.c:885
 #: ../src/gnome-utils/dialog-options.c:1003
 msgid "Clear All"
-msgstr "全て清算"
+msgstr "選択解除"
 
 #: ../src/gnome-utils/dialog-options.c:887
-#, fuzzy
 msgid "Clear the selection and unselect all accounts."
-msgstr "選択された勘定科目とその子勘定科目を全部開く"
+msgstr "選択をクリアしてすべての勘定科目を非選択にする。"
 
 #: ../src/gnome-utils/dialog-options.c:893
 #: ../src/gnome-utils/dialog-options.c:1010
@@ -9795,47 +9318,41 @@
 msgstr "デフォルトを選択"
 
 #: ../src/gnome-utils/dialog-options.c:895
-#, fuzzy
 msgid "Select the default account selection."
-msgstr "デフォルトの QIF 勘定科目名に設定"
+msgstr "デフォルトの勘定科目選択を選択する。"
 
 #: ../src/gnome-utils/dialog-options.c:998
-#, fuzzy
 msgid "Select all entries."
-msgstr "勘定科目を選択"
+msgstr "すべてのエントリを選択する。"
 
 #: ../src/gnome-utils/dialog-options.c:1005
 msgid "Clear the selection and unselect all entries."
-msgstr ""
+msgstr "選択をクリアしてすべてのエントリを非選択にする。"
 
 #: ../src/gnome-utils/dialog-options.c:1012
-#, fuzzy
 msgid "Select the default selection."
-msgstr "この取引をキャンセルする"
+msgstr "デフォルトの選択を選択する。"
 
 #. The reset button on each option page
 #: ../src/gnome-utils/dialog-options.c:1164
-#, fuzzy
 msgid "Defaults"
 msgstr "デフォルト"
 
 #: ../src/gnome-utils/dialog-options.c:1166
-#, fuzzy
 msgid "Reset all values to their defaults."
-msgstr "その他のすべての諸口を削除"
+msgstr "すべての値をデフォルトにリセットする。"
 
 #: ../src/gnome-utils/dialog-options.c:2030
 msgid "Clear"
-msgstr "クリア"
+msgstr "解除"
 
 #: ../src/gnome-utils/dialog-options.c:2031
-#, fuzzy
 msgid "Clear any selected image file."
-msgstr "選択されたファイルを読み込まない"
+msgstr "選択された画像ファイルを選択解除する。"
 
 #: ../src/gnome-utils/dialog-options.c:2033
 msgid "Select image"
-msgstr "画像の選択"
+msgstr "画像を選択"
 
 #: ../src/gnome-utils/dialog-options.c:2035
 msgid "Select an image file."
@@ -9858,9 +9375,7 @@
 
 #: ../src/gnome-utils/dialog-transfer.c:1243
 #, fuzzy
-msgid ""
-"You must specify an account to transfer from, or to, or both, for this "
-"transaction. Otherwise, it will not be recorded."
+msgid "You must specify an account to transfer from, or to, or both, for this transaction. Otherwise, it will not be recorded."
 msgstr ""
 "この取引には移動元と移動先の\n"
 "勘定を指定しなければいけません。\n"
@@ -9871,9 +9386,7 @@
 msgstr "同一の勘定への資金の移動は出来ません。"
 
 #: ../src/gnome-utils/dialog-transfer.c:1279
-msgid ""
-"You can't transfer from a non-currency account.  Try reversing the \"from\" "
-"and \"to\" accounts and making the \"amount\" negative."
+msgid "You can't transfer from a non-currency account.  Try reversing the \"from\" and \"to\" accounts and making the \"amount\" negative."
 msgstr ""
 
 #: ../src/gnome-utils/dialog-transfer.c:1304
@@ -9889,9 +9402,8 @@
 msgstr "適正な金額を'転送先'に入力してください"
 
 #: ../src/gnome-utils/dialog-transfer.c:1631
-#, fuzzy
 msgid "Debit Account"
-msgstr "勘定科目を編集"
+msgstr "貸方勘定科目"
 
 #: ../src/gnome-utils/dialog-transfer.c:1648
 msgid "Transfer From"
@@ -9902,9 +9414,8 @@
 msgstr "転送先"
 
 #: ../src/gnome-utils/dialog-transfer.c:1713
-#, fuzzy
 msgid "Debit Amount:"
-msgstr "貸方勘定科目"
+msgstr "貸方金額"
 
 #: ../src/gnome-utils/dialog-transfer.c:1717
 #: ../src/gnome-utils/glade/transfer.glade.h:13
@@ -9913,78 +9424,49 @@
 
 #: ../src/gnome-utils/dialog-utils.c:958
 msgid "Remember and don't _ask me again."
-msgstr ""
+msgstr "今後確認しない(_A)。"
 
 #: ../src/gnome-utils/dialog-utils.c:959
 msgid "Don't _tell me again."
-msgstr ""
+msgstr "今後報告しない(_T)。"
 
 #: ../src/gnome-utils/dialog-utils.c:962
 msgid "Remember and don't ask me again this _session."
-msgstr ""
+msgstr "このセッションでは今後確認しない(_S)。"
 
 #: ../src/gnome-utils/dialog-utils.c:963
 msgid "Don't tell me again this _session."
-msgstr ""
+msgstr "このセッションでは今後報告しない(_S)。"
 
 #: ../src/gnome-utils/druid-gconf-setup.c:409
-msgid ""
-"When you click Apply, GnuCash will modify your ~/.gconf.path file and "
-"restart the gconf backend."
+msgid "When you click Apply, GnuCash will modify your ~/.gconf.path file and restart the gconf backend."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gconf-setup.c:412
 #, c-format
-msgid ""
-"When you click Apply, GnuCash will install the gconf data into your local ~/."
-"gconf file and restart the gconf backend.  The %s script must be found in "
-"your search path for this to work correctly."
+msgid "When you click Apply, GnuCash will install the gconf data into your local ~/.gconf file and restart the gconf backend.  The %s script must be found in your search path for this to work correctly."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gconf-setup.c:416
-msgid ""
-"You have chosen to correct the problem by yourself.  When you click Apply, "
-"GnuCash will exit.  Please correct the problem and restart the gconf backend "
-"with the command 'gconftool-2 --shutdown' before restarting GnuCash.  If you "
-"have not already done so, you can click the Back button and copy the "
-"necessary text from the dialog."
+msgid "You have chosen to correct the problem by yourself.  When you click Apply, GnuCash will exit.  Please correct the problem and restart the gconf backend with the command 'gconftool-2 --shutdown' before restarting GnuCash.  If you have not already done so, you can click the Back button and copy the necessary text from the dialog."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gconf-setup.c:422
 #, c-format
-msgid ""
-"You have chosen to correct the problem by yourself.  When you click Apply, "
-"GnuCash will exit.  Please run the %s script which will install the "
-"configuration data and restart the gconf backend."
+msgid "You have chosen to correct the problem by yourself.  When you click Apply, GnuCash will exit.  Please run the %s script which will install the configuration data and restart the gconf backend."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gconf-setup.c:426
-msgid ""
-"You have already corrected the problem and restarted the gconf backend with "
-"the command 'gconftool-2 --shutdown'.  When you click Apply, GnuCash will "
-"continue loading."
+msgid "You have already corrected the problem and restarted the gconf backend with the command 'gconftool-2 --shutdown'.  When you click Apply, GnuCash will continue loading."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:189
 msgid ""
-"The file you are trying to load is from an older version of GnuCash. The "
-"file format in the older versions was missing the detailed specification of "
-"the character encoding being used. This means the text in your data file "
-"could be read in multiple ambiguous ways. This ambiguity cannot be resolved "
-"automatically, but the new GnuCash 2.0.0 file format will include all "
-"necessary specifications so that you do not have to go through this step "
-"again.\n"
+"The file you are trying to load is from an older version of GnuCash. The file format in the older versions was missing the detailed specification of the character encoding being used. This means the text in your data file could be read in multiple ambiguous ways. This ambiguity cannot be resolved automatically, but the new GnuCash 2.0.0 file format will include all necessary specifications so that you do not have to go through this step again.\n"
 "\n"
-"GnuCash will try to guess the correct character encoding for your data file. "
-"On the next page GnuCash will show the resulting texts when using this "
-"guess. You have to check whether the words look as expected. Either "
-"everything looks fine and you can simply press 'Forward'. Or the words "
-"contain unexpected characters, in which case you should select different "
-"character encodings to see different results. You may have to edit the list "
-"of character encodings by clicking on the respective button.\n"
+"GnuCash will try to guess the correct character encoding for your data file. On the next page GnuCash will show the resulting texts when using this guess. You have to check whether the words look as expected. Either everything looks fine and you can simply press 'Forward'. Or the words contain unexpected characters, in which case you should select different character encodings to see different results. You may have to edit the list of character encodings by clicking on the respective button.\n"
 "\n"
-"Press 'Forward' now to select the correct character encoding for your data "
-"file."
+"Press 'Forward' now to select the correct character encoding for your data file."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:209
@@ -9993,134 +9475,123 @@
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:212
 msgid ""
-"The file has been loaded successfully. If you click 'Apply' it will be saved "
-"and reloaded into the main application. That way you will have a working "
-"file as backup in the same directory.\n"
+"The file has been loaded successfully. If you click 'Apply' it will be saved and reloaded into the main application. That way you will have a working file as backup in the same directory.\n"
 "\n"
 "You can also go back and verify your selections by clicking on 'Back'."
 msgstr ""
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:234
-#, fuzzy
 msgid "Unicode"
-msgstr "所得"
+msgstr "Unicode"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:236
-#, fuzzy
 msgid "European"
 msgstr "ヨーロッパ"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:237
 msgid "ISO-8859-1 (West European)"
-msgstr ""
+msgstr "ISO-8859-1 (西欧)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:238
 msgid "ISO-8859-2 (East European)"
-msgstr ""
+msgstr "ISO-8859-2 (東欧)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:239
 msgid "ISO-8859-3 (South European)"
-msgstr ""
+msgstr "ISO-8859-3 (南欧)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:240
 msgid "ISO-8859-4 (North European)"
-msgstr ""
+msgstr "ISO-8859-4 (北欧)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:241
 msgid "ISO-8859-5 (Cyrillic)"
-msgstr ""
+msgstr "ISO-8859-5 (キリル文字)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:242
 msgid "ISO-8859-6 (Arabic)"
-msgstr ""
+msgstr "ISO-8859-6 (アラビア語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:243
 msgid "ISO-8859-7 (Greek)"
-msgstr ""
+msgstr "ISO-8859-7 (ギリシャ語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:244
 msgid "ISO-8859-8 (Hebrew)"
-msgstr ""
+msgstr "ISO-8859-8 (ヘブライ語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:245
 msgid "ISO-8859-9 (Turkish)"
-msgstr ""
+msgstr "ISO-8859-9 (トルコ語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:246
 msgid "ISO-8859-10 (Nordic)"
-msgstr ""
+msgstr "ISO-8859-10 (ノルウェー語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:247
 msgid "ISO-8859-11 (Thai)"
-msgstr ""
+msgstr "ISO-8859-11 (タイ語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:248
 msgid "ISO-8859-13 (Baltic)"
-msgstr ""
+msgstr "ISO-8859-13 (バルト語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:249
 msgid "ISO-8859-14 (Celtic)"
-msgstr ""
+msgstr "ISO-8859-14 (ケルト語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:250
 msgid "ISO-8859-15 (West European, Euro sign)"
-msgstr ""
+msgstr "ISO-8859-15 (西欧, ユーロ記号)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:251
 msgid "ISO-8859-16 (South-East European)"
-msgstr ""
+msgstr "ISO-8859-16 (南東ヨーロッパ)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:252
 msgid "Cyrillic"
-msgstr ""
+msgstr "キリル文字"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:253
 msgid "KOI8-R (Russian)"
-msgstr ""
+msgstr "KOI8-R (ロシア語)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:254
 msgid "KOI8-U (Ukrainian)"
-msgstr ""
+msgstr "KOI8-U (ウクライナ語)"
 
 #. Translators: Please insert encodings here that are typically used in your
 #. * locale, separated by spaces. No need for ASCII or UTF-8, check `locale -m`
 #. * for assistance with spelling.
 #: ../src/gnome-utils/druid-gnc-xml-import.c:577
 msgid "ISO-8859-1 KOI8-U"
-msgstr ""
+msgstr "ISO-8859-1"
 
 #. another error, cannot handle this here
 #: ../src/gnome-utils/druid-gnc-xml-import.c:698
 #: ../src/gnome-utils/druid-gnc-xml-import.c:717
-#, fuzzy
 msgid "The file could not be reopened."
-msgstr ""
-"ファイル \n"
-"    %s\n"
-" は見つかりませんでした。"
+msgstr "そのファイルは再オープンできませんでした。"
 
 #. try to load once again
 #: ../src/gnome-utils/druid-gnc-xml-import.c:705
-#: ../src/gnome-utils/gnc-file.c:755 ../src/gnome-utils/gnc-file.c:767
-#, fuzzy
+#: ../src/gnome-utils/gnc-file.c:755
+#: ../src/gnome-utils/gnc-file.c:767
 msgid "Reading file..."
-msgstr "照合(_R)..."
+msgstr "ファイル読込み中..."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:725
-#, fuzzy
 msgid "Parsing file..."
-msgstr "照合(_R)..."
+msgstr "ファイル解析中..."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:732
-#, fuzzy
 msgid "There was an error parsing the file."
-msgstr "ファイル保存中にエラー"
+msgstr "ファイル解析中にエラーがあしました。"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:755
 #: ../src/gnome-utils/gnc-file.c:982
-#, fuzzy
 msgid "Writing file..."
-msgstr "処理中..."
+msgstr "ファイル書込み中..."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:833
 #, c-format
@@ -10172,33 +9643,20 @@
 msgstr "CUSIPまたはその他のコード:"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:4
-msgid ""
-"Enter a unique code used to identify the commodity. Or, you may safely leave "
-"this field blank."
-msgstr ""
-"金融商品を識別するユニークなコードを入力してください。または、空白のままにし"
-"ておいてください"
+msgid "Enter a unique code used to identify the commodity. Or, you may safely leave this field blank."
+msgstr "金融商品を識別するユニークなコードを入力してください。または、空白のままにしておいてください"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:5
 #, fuzzy
-msgid ""
-"Enter the full name of the commodity. Example: Cisco Sytems Inc, or Apple "
-"Computer, Inc."
+msgid "Enter the full name of the commodity. Example: Cisco Sytems Inc, or Apple Computer, Inc."
 msgstr "金融商品のフルネームを入力してください。例: 米ドル"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:6
-msgid ""
-"Enter the smallest fraction of the commodity which can be traded. For stocks "
-"which can only be traded in whole numbers, enter 1."
-msgstr ""
-"取引可能な金融証券の最小単位を入力してください。全株式でのみ取引可能な株式の"
-"場合には1を入力してください。"
+msgid "Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1."
+msgstr "取引可能な金融証券の最小単位を入力してください。全株式でのみ取引可能な株式の場合には1を入力してください。"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:7
-msgid ""
-"Enter the ticker symbol for the commodity (e.g. CSCO or AAPL).  If you are "
-"retrieving quotes online, this field must exactly match the ticker symbol "
-"used by the quote source (including case). "
+msgid "Enter the ticker symbol for the commodity (e.g. CSCO or AAPL).  If you are retrieving quotes online, this field must exactly match the ticker symbol used by the quote source (including case). "
 msgstr ""
 
 #: ../src/gnome-utils/glade/commodity.glade.h:8
@@ -10207,44 +9665,33 @@
 msgstr "始めましょう"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:9
-#, fuzzy
 msgid "Select security/currency "
-msgstr "通貨/証券を選択 "
+msgstr "証券/通貨を選択 "
 
 #: ../src/gnome-utils/glade/commodity.glade.h:10
-#, fuzzy
 msgid "Select user information here..."
-msgstr "調整情報(_R)..."
+msgstr "ここでユーザ情報を選択してください..."
 
 #: ../src/gnome-utils/glade/commodity.glade.h:11
 #, fuzzy
 msgid "Si_ngle:"
-msgstr "1列"
+msgstr "1列(_N)"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:12
-msgid ""
-"These are F::Q quote sources that retrieve information from a single site on "
-"the internet.  If that site is unavailable, you will not be able to retrieve "
-"quotes."
+msgid "These are F::Q quote sources that retrieve information from a single site on the internet.  If that site is unavailable, you will not be able to retrieve quotes."
 msgstr ""
 
 #: ../src/gnome-utils/glade/commodity.glade.h:13
-msgid ""
-"These are F::Q quote sources that retrieve information from multiple sites "
-"on the internet.  If one of the sites is unavailable, F::Q will attempt to "
-"retrieve the information from another site."
+msgid "These are F::Q quote sources that retrieve information from multiple sites on the internet.  If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site."
 msgstr ""
 
 #: ../src/gnome-utils/glade/commodity.glade.h:14
-msgid ""
-"These are quote sources that were recently added to F::Q.  GnuCash does not "
-"know if these sources retrieve information from a single site or from "
-"multiple sites on the internet."
+msgid "These are quote sources that were recently added to F::Q.  GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet."
 msgstr ""
 
 #: ../src/gnome-utils/glade/commodity.glade.h:15
 msgid "Time_zone:"
-msgstr ""
+msgstr "タイムゾーン(_Z)"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:16
 #, fuzzy
@@ -10256,68 +9703,56 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/commodity.glade.h:18
-#, fuzzy
 msgid "_Full name:"
-msgstr "フルネーム:"
+msgstr "フルネーム(_F):"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:19
 #, fuzzy
 msgid "_Get Online Quotes"
-msgstr "オンラインで建値を取得"
+msgstr "オンラインで建値を取得(_G)"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:20
 #, fuzzy
 msgid "_Multiple:"
-msgstr "複数行"
+msgstr "複数行(_M):"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:21
-#, fuzzy
 msgid "_Symbol/abbreviation:"
-msgstr "シンボル/略語:"
+msgstr "シンボル/略語(_S):"
 
 #: ../src/gnome-utils/glade/commodity.glade.h:23
-#, fuzzy
 msgid "_Unknown:"
-msgstr "未知"
+msgstr "未知(_U):"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:1
 msgid "No warnings to reset."
-msgstr ""
+msgstr "リセットする警告はありません。"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:2
-#, fuzzy
 msgid "Permanent Warnings"
-msgstr "内部留保"
+msgstr "支払警告"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:3
-#, fuzzy
 msgid "Reset Warnings"
-msgstr "内部留保"
+msgstr "警告をリセット"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:4
 msgid "Temporary Warnings"
-msgstr ""
+msgstr "一時警告"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:5
-msgid ""
-"You have requested that the following warning dialogs not be presented.  To "
-"re-enable any of these dialogs, select the check box next to the dialog, "
-"then click OK."
-msgstr ""
+msgid "You have requested that the following warning dialogs not be presented.  To re-enable any of these dialogs, select the check box next to the dialog, then click OK."
+msgstr "現在、以下の警告ダイアログの表示が抑えられています。再度表示したいものがあれば、ダイアログの前のチェックボックスを選択し、OKをクリックしてください。"
 
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:7
-#, fuzzy
 msgid "_Unselect All"
-msgstr "全て選択"
+msgstr "選択解除(_U)"
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:1
 msgid ""
 "<b>Cannot find default values</b>\n"
 "\n"
-"The configuration data used to specify default values for GnuCash cannot be "
-"found in the default system locations.  Without this data GnuCash will still "
-"operate properly but it may require some extra time to setup.  Do you wish "
-"to setup the configuration data?"
+"The configuration data used to specify default values for GnuCash cannot be found in the default system locations.  Without this data GnuCash will still operate properly but it may require some extra time to setup.  Do you wish to setup the configuration data?"
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:4
@@ -10356,18 +9791,11 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:12
-msgid ""
-"The configuration data is stored in a non-standard location.  There are two "
-"methods that can be used to make this data visible to GnuCash.  The first is "
-"to modify a system search path to include the data location.  The second is "
-"to copy the data into your home directory."
+msgid "The configuration data is stored in a non-standard location.  There are two methods that can be used to make this data visible to GnuCash.  The first is to modify a system search path to include the data location.  The second is to copy the data into your home directory."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:13
-msgid ""
-"The configuration data used by GnuCash to specify its default values cannot "
-"be found in the default system locations.  Without this data GnuCash will "
-"still operate properly, but it may require some extra time to set up."
+msgid "The configuration data used by GnuCash to specify its default values cannot be found in the default system locations.  Without this data GnuCash will still operate properly, but it may require some extra time to set up."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:14
@@ -10381,46 +9809,33 @@
 msgstr "ヘルプウィンドウを閉じる"
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:16
-msgid ""
-"This method will install the GnuCash default settings and descriptions into "
-"the .gconf directory within your home directory.  The disadvantage to this "
-"method is that future updates to GnuCash will not update your local settings "
-"to add in new keys."
+msgid "This method will install the GnuCash default settings and descriptions into the .gconf directory within your home directory.  The disadvantage to this method is that future updates to GnuCash will not update your local settings to add in new keys."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:17
-msgid ""
-"This method will modify the file .gconf.path in your home directory.  It "
-"will add the GnuCash install directory to this path so that GnuCash can find "
-"its default settings and their descriptions."
+msgid "This method will modify the file .gconf.path in your home directory.  It will add the GnuCash install directory to this path so that GnuCash can find its default settings and their descriptions."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:18
-#, fuzzy
 msgid "Update GnuCash configuration data"
-msgstr "GnuCash 設定オプション"
+msgstr "GnuCash 設定データを更新"
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:19
 #, fuzzy
 msgid "Update gconf settings - GnuCash"
-msgstr "GnuCashマニュアルを開く"
+msgstr "gconf設定 - GnuCash を更新"
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:20
 #, fuzzy
 msgid "Update search path"
-msgstr "共有ディレクトリを設定"
+msgstr "サーチパスを更新"
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:21
-msgid ""
-"You have chosen to install the configuration data used by GnuCash into the "
-"~/.gconf directory.  GnuCash can do this for you, or tell you how to do it "
-"yourself."
+msgid "You have chosen to install the configuration data used by GnuCash into the ~/.gconf directory.  GnuCash can do this for you, or tell you how to do it yourself."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:22
-msgid ""
-"You have chosen to update the system search path.  GnuCash can do this for "
-"you, or it can tell you how to do it yourself."
+msgid "You have chosen to update the system search path.  GnuCash can do this for you, or it can tell you how to do it yourself."
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gconf-setup.glade.h:23
@@ -10464,31 +9879,27 @@
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:1
 #, fuzzy
 msgid "<b>S_ystem input encodings</b>"
-msgstr "福利:"
+msgstr "<b>システム入力エンコーディング(_Y)</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:2
-#, fuzzy
 msgid "<b>_Custom encoding</b>"
-msgstr "福利:"
+msgstr "<b>カスタムエンコーディング(_C)</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:3
 #, fuzzy
 msgid "<b>_Selected encodings</b>"
-msgstr "デフォルトの通貨"
+msgstr "<b>エンコーディングを選択(_S)</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:4
-#, fuzzy
 msgid "Choose a file to import"
-msgstr "出力書式の選択"
+msgstr "インポートするファイルを選択する"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:5
 #, fuzzy
 msgid ""
-"Click \"Load another file\" if you have more data to import at this time. Do "
-"this if you have saved your accounts to separate GnuCash files.\n"
+"Click \"Load another file\" if you have more data to import at this time. Do this if you have saved your accounts to separate GnuCash files.\n"
 "\n"
-"Click \"Forward\" to finish loading files and move to the next step of the "
-"GnuCash Datafile import process."
+"Click \"Forward\" to finish loading files and move to the next step of the GnuCash Datafile import process."
 msgstr ""
 "ここでさらに読み込みたいファイルがある場合には、\"別のファイルの読み込み\"\n"
 "をクリックしてください。複数の QIF ファイルに科目を保存した場合も同様です。\n"
@@ -10497,24 +9908,20 @@
 "クリックしてください。"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:8
-#, fuzzy
 msgid "Convert the file"
-msgstr "新しいファイルを作成する"
+msgstr "そのファイルを変換する"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:9
-#, fuzzy
 msgid "Default encoding:"
-msgstr "通貨/証券を選択 "
+msgstr "デフォルトエンコーディング:"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:10
-#, fuzzy
 msgid "Do not merge"
-msgstr "ソートしない"
+msgstr "マージしない"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:11
-#, fuzzy
 msgid "Edit the list of encodings"
-msgstr "現在の価格を編集する"
+msgstr "エンコーディングの一覧を編集する"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:12
 msgid "Finish GnuCash Datafile Import"
@@ -10525,23 +9932,22 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:14
-#, fuzzy
 msgid "GnuCash data files you have loaded"
-msgstr "すでに読み込んだ QIF ファイル"
+msgstr "ロード済のGnuCashデータファイル"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:15
 #: ../src/import-export/qif-import/qif.glade.h:42
 msgid "Load another file"
-msgstr "別のファイルを読み込む"
+msgstr "別のファイルをロード"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:16
 #: ../src/import-export/qif-import/qif.glade.h:84
 msgid "Unload selected file"
-msgstr "選択されたファイルを読み込まない"
+msgstr "選択したファイルをアンロード"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:17
 msgid "_Edit list of encodings"
-msgstr ""
+msgstr "エンコーディングの一覧を編集(_E)"
 
 #: ../src/gnome-utils/glade/druid-provider-multifile.glade.h:1
 #, fuzzy
@@ -10567,9 +9973,8 @@
 msgstr "別のファイルを読み込む"
 
 #: ../src/gnome-utils/glade/druid-provider-multifile.glade.h:6
-#, fuzzy
 msgid "_Unload selected file"
-msgstr "選択されたファイルを読み込まない"
+msgstr "選択したファイルをアンロード(_U)"
 
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:1
 #, fuzzy
@@ -10587,9 +9992,8 @@
 msgstr "金額へ:"
 
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:6
-#, fuzzy
 msgid "_Exchange Rate:"
-msgstr "為替レート"
+msgstr "為替レート(_E)"
 
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:7
 #, fuzzy
@@ -10604,7 +10008,7 @@
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:2
 #, no-c-format
 msgid "%Y-%m-%d"
-msgstr ""
+msgstr "%Y-%m-%d"
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:3
 msgid "Abbreviation"
@@ -10623,7 +10027,7 @@
 #: ../src/import-export/generic-import.glade.h:28
 #, fuzzy
 msgid "Format:"
-msgstr "フォーム"
+msgstr "書式:"
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:7
 #, fuzzy
@@ -10632,7 +10036,7 @@
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:8
 msgid "Months:"
-msgstr "月"
+msgstr "月:"
 
 #: ../src/gnome-utils/glade/gnc-date-format.glade.h:11
 #: ../src/gnome-utils/glade/preferences.glade.h:105
@@ -10663,43 +10067,40 @@
 
 #: ../src/gnome-utils/glade/gnc-gui-query.glade.h:1
 msgid "Don't tell me again this session."
-msgstr ""
+msgstr "このセッションでは今後報告しない。"
 
 #: ../src/gnome-utils/glade/gnc-gui-query.glade.h:2
 msgid "Don't tell me again."
-msgstr ""
+msgstr "今後報告しない。"
 
 #: ../src/gnome-utils/glade/gnc-gui-query.glade.h:3
 msgid "Remember the answer and don't tell me again this session."
-msgstr ""
+msgstr "回答を記憶してこのセッションでは今後報告しない。"
 
 #: ../src/gnome-utils/glade/gnc-gui-query.glade.h:4
 msgid "Remember the answer and don't tell me again."
-msgstr ""
+msgstr "回答を記憶して今後報告しない。"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:1
-#, fuzzy
 msgid "'_Enter' moves to blank transaction"
-msgstr "'Enter'で空白の取引に移動する"
+msgstr "'Enter'で空白の取引に移動する(_E)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:2
 #, fuzzy
 msgid "07/31/2005"
-msgstr "12/31/00"
+msgstr "07/31/2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:3
 msgid "2005-07-31"
-msgstr ""
+msgstr "2005-07-31"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:4
-#, fuzzy
 msgid "31.07.2005"
-msgstr "12/31/00"
+msgstr "31.07.2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:5
-#, fuzzy
 msgid "31/07/2005"
-msgstr "12/31/00"
+msgstr "31/07/2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:6
 #: ../src/import-export/generic-import.glade.h:5
@@ -10721,19 +10122,17 @@
 msgstr "<b>デフォルトの通貨</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:10
-#, fuzzy
 msgid "<b>Default Report Currency</b>"
-msgstr "デフォルトの通貨"
+msgstr "<b>デフォルトの帳票通貨</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:11
-#, fuzzy
 msgid "<b>Default Style</b>"
-msgstr "デフォルトの帳簿スタイル"
+msgstr "<b>デフォルトのスタイル</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:12
 #, fuzzy
 msgid "<b>End Date</b>"
-msgstr "終了日付"
+msgstr "<b>終了日付</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:13
 msgid "<b>Fancy Date Format</b>"
@@ -10777,7 +10176,7 @@
 #: ../src/gnome-utils/glade/preferences.glade.h:22
 #, fuzzy
 msgid "<b>Reverse Balanced Accounts</b>"
-msgstr "残高を逆にする勘定科目の型"
+msgstr "残高を逆にする勘定科目"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:23
 #, fuzzy
@@ -10833,9 +10232,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:35
 #, fuzzy
-msgid ""
-"After reconciling a credit card statement, prompt the user to enter a credit "
-"card payment."
+msgid "After reconciling a credit card statement, prompt the user to enter a credit card payment."
 msgstr "クレジットカード明細の照合の後で、クレジットカードの支払を入力させる"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:36
@@ -10844,9 +10241,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:37
 #, fuzzy
-msgid ""
-"Alternate the primary and secondary colors by transaction instead of by "
-"alternating by row."
+msgid "Alternate the primary and secondary colors by transaction instead of by alternating by row."
 msgstr "第一の色と第二の色を、行毎ではなく取引ごとに替える"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:38
@@ -10864,15 +10259,11 @@
 msgstr "自動クレジットカード支払"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:41
-msgid ""
-"Automatically expand the current transaction to show all splits.  All other "
-"transactions are shown on one line. (Two in double line mode.)"
+msgid "Automatically expand the current transaction to show all splits.  All other transactions are shown on one line. (Two in double line mode.)"
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:42
-msgid ""
-"Automatically insert a decimal point into values that are entered without "
-"one."
+msgid "Automatically insert a decimal point into values that are entered without one."
 msgstr "入力された数字に自動的に小数点を挿入する"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:43
@@ -10898,9 +10289,8 @@
 msgstr "貸方勘定科目"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:48
-#, fuzzy
 msgid "Ch_oose:"
-msgstr "閉じる"
+msgstr "選択(_O):"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:49
 #, fuzzy
@@ -10913,41 +10303,36 @@
 msgstr "選択されている取引を切り取る"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:51
-#, fuzzy
 msgid "Com_press files"
-msgstr "新しいファイルを作成する"
+msgstr "ファイルを圧縮(_P)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:52
 msgid "Compress the data file with gzip when saving it to disk."
-msgstr ""
+msgstr "データファイルをディスクに保存する際、gzipにより圧縮する。"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:53
-#, fuzzy
 msgid "Date/Time"
-msgstr "正確な時間"
+msgstr "日付/時刻"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:54
-#, fuzzy
 msgid "Default _font:"
-msgstr "デフォルトの帳簿スタイル"
+msgstr "デフォルトのフォント(_F):"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:56
 msgid "Delete old log/backup files after this many days (0 = never)."
-msgstr ""
+msgstr "設定した日数を越える古いログ/バックアップを削除する(0=削除しない)。"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:57
-#, fuzzy
 msgid "Display \"_tip of the day\" dialog"
-msgstr "「今日のヒント」を表示する"
+msgstr "「今日のヒント」ダイアログを表示する(_T)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:58
 msgid "Display hints for using GnuCash at startup"
 msgstr "起動時に Gnucash を使うためのヒントを表示する"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:59
-#, fuzzy
 msgid "Display ne_gative amounts in red"
-msgstr "負の金額を赤色で表示する"
+msgstr "負の金額を赤色で表示する(_G)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:61
 #, fuzzy
@@ -10979,15 +10364,11 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:68
-msgid ""
-"Display toolbar items with the text label below the icon.  Labels are show "
-"for all items."
+msgid "Display toolbar items with the text label below the icon.  Labels are show for all items."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:69
-msgid ""
-"Display toolbar items with the text label beside the icon.  Labels are only "
-"shown for the most important items."
+msgid "Display toolbar items with the text label beside the icon.  Labels are only shown for the most important items."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:70
@@ -11002,16 +10383,15 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:72
 msgid "Draw _vertical lines between columns"
-msgstr ""
+msgstr "列間に罫線を引く(_V)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:73
 msgid "Draw hori_zontal lines between rows"
-msgstr ""
+msgstr "行間に罫線を引く(_Z)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:75
-#, fuzzy
 msgid "GnuCash Options"
-msgstr "四番目のオプション"
+msgstr "GnuCashオプション"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:76
 #, fuzzy
@@ -11023,53 +10403,37 @@
 msgstr "小数点以下に自動で挿入される桁数"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:78
-msgid ""
-"If active, GnuCash shows a confirmation question each time the auto-save "
-"feature is started. Otherwise no extra explanation is shown."
+msgid "If active, GnuCash shows a confirmation question each time the auto-save feature is started. Otherwise no extra explanation is shown."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:79
-msgid ""
-"If checked, each register will be opened in its own top level window.  If "
-"clear, the register will be opened in the current window."
+msgid "If checked, each register will be opened in its own top level window.  If clear, the register will be opened in the current window."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:80
-msgid ""
-"If checked, each report will be opened in its own top level window.  If "
-"clear, the report will be opened in the current window."
+msgid "If checked, each report will be opened in its own top level window.  If clear, the report will be opened in the current window."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:81
-msgid ""
-"If checked, non-currency commodities will be shown in the summary bar.  If "
-"clear, only currencies will be shown."
+msgid "If checked, non-currency commodities will be shown in the summary bar.  If clear, only currencies will be shown."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:82
 #, fuzzy
-msgid ""
-"If checked, pressing the 'Enter' key will move to the blank transaction at "
-"the bottom of the register.  If clear, pressing the 'Enter' key will move "
-"down one row."
-msgstr ""
-"これを選択すると、'Enter'を押した際に空白の取引行へ移動します。選択しない場"
-"合、一行下へ移動します。"
+msgid "If checked, pressing the 'Enter' key will move to the blank transaction at the bottom of the register.  If clear, pressing the 'Enter' key will move down one row."
+msgstr "これを選択すると、'Enter'を押した際に空白の取引行へ移動します。選択しない場合、一行下へ移動します。"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:83
-msgid ""
-"If checked, the system color theme will be applied to register windows.  If "
-"clear, the original GnuCash register colors will be used."
+msgid "If checked, the system color theme will be applied to register windows.  If clear, the original GnuCash register colors will be used."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:84
-#, fuzzy
 msgid "Include _grand total"
-msgstr "総合計の色"
+msgstr "総合計を含む(_G)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:85
 msgid "Include _non-currency totals"
-msgstr ""
+msgstr "非通貨合計を含む(_N)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:86
 msgid "Loc_ale:"
@@ -11081,9 +10445,8 @@
 msgstr "新規検索"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:89
-#, fuzzy
 msgid "Number of _transactions:"
-msgstr "列数"
+msgstr "取引数(_T)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:90
 #, fuzzy
@@ -11096,12 +10459,8 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:92
 #, fuzzy
-msgid ""
-"Present the new account list dialog when you choose \"New File\" from the "
-"\"File\" menu"
-msgstr ""
-"\"新規ファイル\"を\"ファイル\"メニューから選択したときに、新規科目リストダイ"
-"アログをポップアップしない"
+msgid "Present the new account list dialog when you choose \"New File\" from the \"File\" menu"
+msgstr "\"新規ファイル\"を\"ファイル\"メニューから選択したときに、新規科目リストダイアログをポップアップしない"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:93
 msgid "Print '***' before and after each text field on the check."
@@ -11126,9 +10485,8 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:99
-#, fuzzy
 msgid "Re_lative:"
-msgstr "リベート"
+msgstr "相対(_L):"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:101
 #, fuzzy
@@ -11150,14 +10508,11 @@
 msgstr "帳票"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:106
-msgid ""
-"Show a close button on each notebook tab.  These function identically to the "
-"'Close' menu item."
+msgid "Show a close button on each notebook tab.  These function identically to the 'Close' menu item."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:107
-msgid ""
-"Show a grand total of all accounts converted to the default report currency."
+msgid "Show a grand total of all accounts converted to the default report currency."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:108
@@ -11187,16 +10542,12 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:114
-msgid ""
-"Show this many transactions in a register. A value of zero means show all "
-"transactions."
+msgid "Show this many transactions in a register. A value of zero means show all transactions."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:115
 #, fuzzy
-msgid ""
-"Show two lines of information for each transaction instead of one.  Does not "
-"affect expanded transactions."
+msgid "Show two lines of information for each transaction instead of one.  Does not affect expanded transactions."
 msgstr "それぞれの取引の情報を二行で表示する"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:116
@@ -11211,9 +10562,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:118
 #, fuzzy
-msgid ""
-"Sign reverse balances on the following: Credit Card, Payable, Liability, "
-"Equity, and Income."
+msgid "Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income."
 msgstr "クレジットカード、負債、資本、収益の各勘定科目をそれぞれ逆にする"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:119
@@ -11221,11 +10570,7 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:120
-msgid ""
-"The character that will be used between components of an account name.  A "
-"legal value is any single character except letters and numbers, or any of "
-"the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and "
-"\"period\"."
+msgid "The character that will be used between components of an account name.  A legal value is any single character except letters and numbers, or any of the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and \"period\"."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:122
@@ -11234,9 +10579,8 @@
 msgstr "終了日"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:123
-#, fuzzy
 msgid "Transaction _journal"
-msgstr "取引出納帳"
+msgstr "取引仕訳帳(_J)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:124
 msgid "US Dollars (USD)"
@@ -11289,9 +10633,7 @@
 msgstr "システムロケールで規定された日付書式を使用する。"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:136
-msgid ""
-"Use the specified absolute ending date for profit/loss calculations.  Also "
-"use this date for net assets calculations."
+msgid "Use the specified absolute ending date for profit/loss calculations.  Also use this date for net assets calculations."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:137
@@ -11308,9 +10650,7 @@
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:140
-msgid ""
-"Use the specified relative ending date for profit/loss calculations.  Also "
-"use this date for net assets calculations."
+msgid "Use the specified relative ending date for profit/loss calculations.  Also use this date for net assets calculations."
 msgstr ""
 
 #: ../src/gnome-utils/glade/preferences.glade.h:141
@@ -11336,21 +10676,19 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:146
 msgid "_Absolute:"
-msgstr "絶対(_A)"
+msgstr "絶対(_A):"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:147
-#, fuzzy
 msgid "_Auto-raise lists"
-msgstr "リストを自動的に前面に出す"
+msgstr "リストを自動的に前面に出す(_A)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:148
 msgid "_Auto-split ledger"
 msgstr "自動分割元帳(_A)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:149
-#, fuzzy
 msgid "_Automatic decimal point"
-msgstr "自動小数点付加"
+msgstr "自動小数点付加(_A)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:150
 msgid "_Basic ledger"
@@ -11381,14 +10719,12 @@
 msgstr "収益 & 費用(_I)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:157
-#, fuzzy
 msgid "_Left"
-msgstr "å·¦(_R)"
+msgstr "å·¦(_L)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:158
-#, fuzzy
 msgid "_None"
-msgstr "なし"
+msgstr "なし(_N)"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:159
 msgid "_Relative:"
@@ -11430,7 +10766,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:169
 msgid "minutes"
-msgstr ""
+msgstr "分"
 
 #: ../src/gnome-utils/glade/totd.glade.h:1
 msgid "<b>Tip of the Day:</b>"
@@ -11493,8 +10829,10 @@
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
 #: ../src/gnome-utils/glade/transfer.glade.h:12
-#: ../intl-scm/guile-strings.c:1842 ../intl-scm/guile-strings.c:1926
-#: ../intl-scm/guile-strings.c:2466 ../intl-scm/guile-strings.c:2550
+#: ../intl-scm/guile-strings.c:1842
+#: ../intl-scm/guile-strings.c:1926
+#: ../intl-scm/guile-strings.c:2466
+#: ../intl-scm/guile-strings.c:2550
 msgid "Show Income/Expense"
 msgstr "収益/費用を表示する"
 
@@ -11509,17 +10847,14 @@
 
 #: ../src/gnome-utils/gnc-autosave.c:99
 msgid "Save file automatically?"
-msgstr ""
+msgstr "ファイルを自動保存しますか?"
 
 #: ../src/gnome-utils/gnc-autosave.c:102
 #, c-format
 msgid ""
-"Your data file needs to be saved to your hard disk to save your changes.  "
-"GnuCash has a feature to save the file automatically every %d minutes, just "
-"as if you had pressed the \"Save\" button each time. \n"
+"Your data file needs to be saved to your hard disk to save your changes.  GnuCash has a feature to save the file automatically every %d minutes, just as if you had pressed the \"Save\" button each time. \n"
 "\n"
-"You can change the time interval or turn off this feature under Edit -> "
-"Preferences -> General -> Auto-save time interval. \n"
+"You can change the time interval or turn off this feature under Edit -> Preferences -> General -> Auto-save time interval. \n"
 "\n"
 "Should your file be saved automatically?"
 msgstr ""
@@ -11542,21 +10877,24 @@
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:216 ../intl-scm/guile-strings.c:1880
+#: ../src/gnome-utils/gnc-date-delta.c:216
+#: ../intl-scm/guile-strings.c:1880
 #: ../intl-scm/guile-strings.c:2504
 msgid "Weeks"
 msgstr "週"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:218 ../intl-scm/guile-strings.c:1884
+#: ../src/gnome-utils/gnc-date-delta.c:218
+#: ../intl-scm/guile-strings.c:1884
 #: ../intl-scm/guile-strings.c:2508
 msgid "Months"
 msgstr "月"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:220 ../intl-scm/guile-strings.c:1886
+#: ../src/gnome-utils/gnc-date-delta.c:220
+#: ../intl-scm/guile-strings.c:1886
 #: ../intl-scm/guile-strings.c:2510
 msgid "Years"
 msgstr "å¹´"
@@ -11606,8 +10944,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../src/gnome-utils/gnc-dense-cal.c:316 ../intl-scm/guile-strings.c:448
-#: ../intl-scm/guile-strings.c:660 ../intl-scm/guile-strings.c:872
+#: ../src/gnome-utils/gnc-dense-cal.c:316
+#: ../intl-scm/guile-strings.c:448
+#: ../intl-scm/guile-strings.c:660
+#: ../intl-scm/guile-strings.c:872
 #: ../intl-scm/guile-strings.c:1084
 msgid "Date: "
 msgstr "日付: "
@@ -11633,31 +10973,32 @@
 "%s"
 
 #: ../src/gnome-utils/gnc-druid-provider-file-gnome.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open file: %s: %s"
-msgstr ""
-"ファイルを開くことができませんでした\n"
-"     %s。\n"
-"\n"
-"%s"
+msgstr "ファイル %s を開くことができませんでした: %s"
 
-#: ../src/gnome-utils/gnc-file.c:100 ../src/gnome-utils/gnc-main-window.c:235
+#: ../src/gnome-utils/gnc-file.c:100
+#: ../src/gnome-utils/gnc-main-window.c:235
 msgid "_Import"
 msgstr "インポート(_I)"
 
-#: ../src/gnome-utils/gnc-file.c:102 ../src/gnome-utils/gnc-file.c:255
+#: ../src/gnome-utils/gnc-file.c:102
+#: ../src/gnome-utils/gnc-file.c:255
 msgid "Import"
 msgstr "インポート"
 
-#: ../src/gnome-utils/gnc-file.c:108 ../src/gnome-utils/gnc-file.c:1030
+#: ../src/gnome-utils/gnc-file.c:108
+#: ../src/gnome-utils/gnc-file.c:1030
 msgid "Save"
 msgstr "保存"
 
-#: ../src/gnome-utils/gnc-file.c:112 ../src/gnome-utils/gnc-main-window.c:236
+#: ../src/gnome-utils/gnc-file.c:112
+#: ../src/gnome-utils/gnc-main-window.c:236
 msgid "_Export"
 msgstr "エクスポート(_E)"
 
-#: ../src/gnome-utils/gnc-file.c:115 ../src/gnome-utils/gnc-file.c:271
+#: ../src/gnome-utils/gnc-file.c:115
+#: ../src/gnome-utils/gnc-file.c:271
 #: ../src/gnome-utils/gnc-file.c:888
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:999
 msgid "Export"
@@ -11680,44 +11021,29 @@
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "The URL %s is not supported by this version of GnuCash."
-msgstr ""
-"次の URL \n"
-"    %s\n"
-"はこの GnuCash のバージョンではサポートされていません。"
+msgstr "URL %s は現バージョンの GnuCash ではサポートされていません。"
 
 #: ../src/gnome-utils/gnc-file.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "Can't parse the URL %s."
-msgstr ""
-"URLの構文解析ができません\n"
-"   %s\n"
+msgstr "URL %s の解析ができません"
 
 #: ../src/gnome-utils/gnc-file.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to %s. The host, username or password were incorrect."
-msgstr ""
-"次のホストに接続できません\n"
-"   %s\n"
-"ホスト名、ユーザ名、またはパスワードが違います。"
+msgstr "%s に接続できません。ホスト名、ユーザ名、またはパスワードが違います。"
 
 #: ../src/gnome-utils/gnc-file.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "Can't connect to %s. Connection was lost, unable to send data."
-msgstr ""
-"次のホストに接続できません\n"
-"   %s\n"
-"接続が消失しました。データを送ることができません"
+msgstr "%s に接続できません。接続が切れて、データを送ることができません。"
 
 #: ../src/gnome-utils/gnc-file.c:231
 #, fuzzy
-msgid ""
-"This file/URL appears to be from a newer version of GnuCash. You must "
-"upgrade your version of GnuCash to work with this data."
-msgstr ""
-"このファイルはGnuCashの新しいバージョンによって作成されたもののようです。"
-"GnuCashをアップグレードしないと読み込めません。"
+msgid "This file/URL appears to be from a newer version of GnuCash. You must upgrade your version of GnuCash to work with this data."
+msgstr "このファイルはGnuCashの新しいバージョンによって作成されたもののようです。GnuCashをアップグレードしないと読み込めません。"
 
 #: ../src/gnome-utils/gnc-file.c:238
 #, fuzzy, c-format
@@ -11729,10 +11055,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:248
 #, fuzzy, c-format
-msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by "
-"another user, in which case you should not open the database. Do you want to "
-"proceed with opening the database?"
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not open the database. Do you want to proceed with opening the database?"
 msgstr ""
 "Gnucash はロックすることができませんでした。\n"
 "   %s.\n"
@@ -11743,10 +11066,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:256
 #, fuzzy, c-format
-msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by "
-"another user, in which case you should not import the database. Do you want "
-"to proceed with importing the database?"
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not import the database. Do you want to proceed with importing the database?"
 msgstr ""
 "Gnucash はロックすることができませんでした。\n"
 "   %s.\n"
@@ -11757,10 +11077,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:264
 #, fuzzy, c-format
-msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by "
-"another user, in which case you should not save the database. Do you want to "
-"proceed with saving the database?"
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not save the database. Do you want to proceed with saving the database?"
 msgstr ""
 "Gnucash はロックすることができませんでした。\n"
 "   %s.\n"
@@ -11771,10 +11088,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:272
 #, fuzzy, c-format
-msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by "
-"another user, in which case you should not export the database. Do you want "
-"to proceed with exporting the database?"
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not export the database. Do you want to proceed with exporting the database?"
 msgstr ""
 "Gnucash はロックすることができませんでした。\n"
 "   %s.\n"
@@ -11785,9 +11099,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:295
 #, fuzzy, c-format
-msgid ""
-"GnuCash 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."
+msgid "GnuCash 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."
 msgstr ""
 "Gnucash はロックすることができませんでした。\n"
 "   %s.\n"
@@ -11806,8 +11118,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:308
 #, fuzzy, c-format
-msgid ""
-"The server at URL %s experienced an error or encountered bad or corrupt data."
+msgid "The server at URL %s experienced an error or encountered bad or corrupt data."
 msgstr ""
 "次のURLにあるサーバ\n"
 "URL %s\n"
@@ -11827,40 +11138,27 @@
 
 #: ../src/gnome-utils/gnc-file.c:325
 #, c-format
-msgid ""
-"Invalid QSF Object file! The QSF object file %s failed to validate against "
-"the QSF object schema. The XML structure of the file is either not well-"
-"formed or contains illegal data."
+msgid "Invalid QSF Object file! The QSF object file %s failed to validate against the QSF object schema. The XML structure of the file is either not well-formed or contains illegal data."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:332
 #, c-format
-msgid ""
-"Invalid QSF Map file! The QSF map file %s failed to validate against the QSF "
-"map schema. The XML structure of the file is either not well-formed or "
-"contains illegal data."
+msgid "Invalid QSF Map file! The QSF map file %s failed to validate against the QSF map schema. The XML structure of the file is either not well-formed or contains illegal data."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:339
 #, c-format
-msgid ""
-"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."
+msgid "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."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:346
 #, c-format
-msgid ""
-"The selected QSF map %s contains unusable data. This is usually because not "
-"all the required parameters for the defined objects have calculations "
-"described in the map."
+msgid "The selected QSF map %s contains unusable data. This is usually because not all the required parameters for the defined objects have calculations described in the map."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:353
 #, c-format
-msgid ""
-"The selected QSF object file %s contains one or more invalid GUIDs. The file "
-"cannot be processed - please check the source of the file and try again."
+msgid "The selected QSF object file %s contains one or more invalid GUIDs. The file cannot be processed - please check the source of the file and try again."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:360
@@ -11870,10 +11168,7 @@
 
 #: ../src/gnome-utils/gnc-file.c:366
 #, c-format
-msgid ""
-"Wrong QSF map selected. The selected map %s validates but was written for "
-"different QOF objects.  The list of objects defined in this map does not "
-"include all the objects described in the current QSF object file."
+msgid "Wrong QSF map selected. The selected map %s validates but was written for different QOF objects.  The list of objects defined in this map does not include all the objects described in the current QSF object file."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:374
@@ -11883,20 +11178,12 @@
 
 #: ../src/gnome-utils/gnc-file.c:380
 #, c-format
-msgid ""
-"When converting XML strings into numbers, an overflow has been detected. The "
-"QSF object file %s contains invalid data in a field that is meant to hold a "
-"number."
+msgid "When converting XML strings into numbers, an overflow has been detected. The QSF object file %s contains invalid data in a field that is meant to hold a number."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:387
 #, c-format
-msgid ""
-"The QSF object file %s is valid and contains GnuCash objects. However, "
-"GnuCash cannot open the file directly because the data needs to be merged "
-"into an existing GnuCash data book. Please open a GnuCash file or create a "
-"new one, then import this QSF object file so that the data can be merged "
-"into the main data book."
+msgid "The QSF object file %s is valid and contains GnuCash objects. However, GnuCash cannot open the file directly because the data needs to be merged into an existing GnuCash data book. Please open a GnuCash file or create a new one, then import this QSF object file so that the data can be merged into the main data book."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:397
@@ -11937,12 +11224,8 @@
 
 #: ../src/gnome-utils/gnc-file.c:438
 #, c-format
-msgid ""
-"Could not write to file %s.  Check that you have permission to write to this "
-"file and that there is sufficient space to create it."
-msgstr ""
-"ファイル %s に書き込めませんでした。"
-"このファイルへの書込み許可があるか、十分なスペースがあるかチェックしてください。"
+msgid "Could not write to file %s.  Check that you have permission to write to this file and that there is sufficient space to create it."
+msgstr "ファイル %s に書き込めませんでした。このファイルへの書込み許可があるか、十分なスペースがあるかチェックしてください。"
 
 #: ../src/gnome-utils/gnc-file.c:445
 #, c-format
@@ -11950,18 +11233,11 @@
 msgstr "ファイル %s の読出し許可がありません。"
 
 #: ../src/gnome-utils/gnc-file.c:450
-msgid ""
-"This database is from an older version of GnuCash. Do you want to want to "
-"upgrade the database to the current version?"
-msgstr ""
-"このデータベースはGnuCashの古いバージョン用です。"
-"データベースを現在のバージョン用に更新しますか?"
+msgid "This database is from an older version of GnuCash. Do you want to want to upgrade the database to the current version?"
+msgstr "このデータベースはGnuCashの古いバージョン用です。データベースを現在のバージョン用に更新しますか?"
 
 #: ../src/gnome-utils/gnc-file.c:457
-msgid ""
-"The SQL database is in use by other users, and the upgrade cannot be "
-"performed until they logoff. If there are currently no other users, consult "
-"the  documentation to learn how to clear out dangling login sessions."
+msgid "The SQL database is in use by other users, and the upgrade cannot be performed until they logoff. If there are currently no other users, consult the  documentation to learn how to clear out dangling login sessions."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-file.c:467
@@ -11970,14 +11246,14 @@
 msgstr "未知のI/Oエラーが発生しました。"
 
 #: ../src/gnome-utils/gnc-file.c:562
-#, fuzzy
 msgid "Save changes to the file?"
-msgstr "別のファイルを読み込む"
+msgstr "ファイルへの変更を保存しますか?"
 
-#: ../src/gnome-utils/gnc-file.c:565 ../src/gnome-utils/gnc-main-window.c:999
+#: ../src/gnome-utils/gnc-file.c:565
+#: ../src/gnome-utils/gnc-main-window.c:999
 #, c-format
 msgid "If you don't save, changes from the past %d minutes will be discarded."
-msgstr ""
+msgstr "保存しない場合、これまでの %d 分間の変更が失われます。"
 
 #: ../src/gnome-utils/gnc-file.c:579
 msgid "Continue _Without Saving"
@@ -11989,22 +11265,12 @@
 msgstr "GnuCashは %s をロックすることができませんでした。"
 
 #: ../src/gnome-utils/gnc-file.c:661
-msgid ""
-"That database may be in use by another user, in which case you should not "
-"open the database. What would you like to do?"
-msgstr ""
-"このデータベースは別のユーザに使用されている可能性があります。"
-"その場合は、データベースを開くべきではありません。どうしますか?"
+msgid "That database may be in use by another user, in which case you should not open the database. What would you like to do?"
+msgstr "このデータベースは別のユーザに使用されている可能性があります。その場合は、データベースを開くべきではありません。どうしますか?"
 
 #: ../src/gnome-utils/gnc-file.c:664
-msgid ""
-"That database may be on a read-only file system, or you may not have write "
-"permission for the directory. If you proceed you may not be able to save any "
-"changes. What would you like to do?"
-msgstr ""
-"このデータベースは読出し専用のファイルシステムにあるか、"
-"ディレクトリへの書込み許可がない可能性があります。"
-"このまま続けると変更を保存できないかもしれません。どうしますか?"
+msgid "That database may be on a read-only file system, or you may not have write permission for the directory. If you proceed you may not be able to save any changes. What would you like to do?"
+msgstr "このデータベースは読出し専用のファイルシステムにあるか、ディレクトリへの書込み許可がない可能性があります。このまま続けると変更を保存できないかもしれません。どうしますか?"
 
 #: ../src/gnome-utils/gnc-file.c:681
 msgid "_Open Anyway"
@@ -12014,7 +11280,8 @@
 msgid "_Create New File"
 msgstr "新しいファイルを作成する(_C)"
 
-#: ../src/gnome-utils/gnc-file.c:923 ../src/gnome-utils/gnc-file.c:1127
+#: ../src/gnome-utils/gnc-file.c:923
+#: ../src/gnome-utils/gnc-file.c:1127
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1355
 #, c-format
 msgid "The file %s already exists. Are you sure you want to overwrite it?"
@@ -12041,9 +11308,7 @@
 msgstr "表示..."
 
 #: ../src/gnome-utils/gnc-gnome-utils.c:280
-msgid ""
-"GnuCash could not find the files for the help documentation.  This is likely "
-"because the 'gnucash-docs' package is not installed."
+msgid "GnuCash could not find the files for the help documentation.  This is likely because the 'gnucash-docs' package is not installed."
 msgstr ""
 
 #: ../src/gnome-utils/gnc-gnome-utils.c:310
@@ -12058,21 +11323,19 @@
 msgid "The specified URL could not be loaded."
 msgstr "指定されたURLはロードできませんでした。"
 
-#: ../src/gnome-utils/gnc-html.c:507 ../src/gnome-utils/gnc-html.c:962
+#: ../src/gnome-utils/gnc-html.c:507
+#: ../src/gnome-utils/gnc-html.c:962
 #, fuzzy
-msgid ""
-"Secure HTTP access is disabled. You can enable it in the Network section of "
-"the Preferences dialog."
+msgid "Secure HTTP access is disabled. You can enable it in the Network section of the Preferences dialog."
 msgstr ""
 "セキュアHTTPアクセスがオフです。\n"
 "初期設定ダイアログのネットワークセクションで\n"
 "オンにしてください。"
 
-#: ../src/gnome-utils/gnc-html.c:516 ../src/gnome-utils/gnc-html.c:972
+#: ../src/gnome-utils/gnc-html.c:516
+#: ../src/gnome-utils/gnc-html.c:972
 #, fuzzy
-msgid ""
-"Network HTTP access is disabled. You can enable it in the Network section of "
-"the Preferences dialog."
+msgid "Network HTTP access is disabled. You can enable it in the Network section of the Preferences dialog."
 msgstr ""
 "HTTPアクセスがオフです。\n"
 "初期設定ダイアログのネットワークセクションで\n"
@@ -12088,7 +11351,8 @@
 msgid "_Delete Account"
 msgstr "勘定科目の削除(_D)"
 
-#: ../src/gnome-utils/gnc-icons.c:18 ../src/gnome/window-reconcile.c:2019
+#: ../src/gnome-utils/gnc-icons.c:18
+#: ../src/gnome/window-reconcile.c:2019
 msgid "_Edit Account"
 msgstr "勘定科目の編集(_E)"
 
@@ -12097,7 +11361,8 @@
 msgstr "新規勘定科目(_N)"
 
 #. Account menu
-#: ../src/gnome-utils/gnc-icons.c:20 ../src/gnome/window-reconcile.c:2016
+#: ../src/gnome-utils/gnc-icons.c:20
+#: ../src/gnome/window-reconcile.c:2016
 msgid "_Open Account"
 msgstr "勘定科目を開く(_O)"
 
@@ -12128,7 +11393,8 @@
 
 #. Help menu
 #: ../src/gnome-utils/gnc-main-window.c:229
-#: ../src/gnome/window-reconcile.c:1996 ../src/gnome/window-reconcile.c:2044
+#: ../src/gnome/window-reconcile.c:1996
+#: ../src/gnome/window-reconcile.c:2044
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
@@ -12203,7 +11469,7 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:277
 msgid "Reset _Warnings..."
-msgstr "警告のリセット(_W)..."
+msgstr "警告をリセット(_W)..."
 
 #: ../src/gnome-utils/gnc-main-window.c:278
 msgid "Reset the state of all warning message so they will be shown again."
@@ -12211,11 +11477,11 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:280
 msgid "Re_name Page"
-msgstr "ページ名変更"
+msgstr "ページ名変更(_N)"
 
 #: ../src/gnome-utils/gnc-main-window.c:281
 msgid "Rename this page."
-msgstr "このページの名前を変更する"
+msgstr "このページの名前を変更する。"
 
 #. Windows menu
 #: ../src/gnome-utils/gnc-main-window.c:286
@@ -12223,17 +11489,16 @@
 msgstr "新規ウィンドウ(_W)"
 
 #: ../src/gnome-utils/gnc-main-window.c:287
-#, fuzzy
 msgid "Open a new top-level GnuCash window."
-msgstr "現在の一覧用に新しいGnuCashトップレベルウィンドウを開く"
+msgstr "新しいGnuCashトップレベルウィンドウを開く。"
 
 #: ../src/gnome-utils/gnc-main-window.c:289
 msgid "New Window with _Page"
-msgstr ""
+msgstr "このページを新規ウィンドウへ(_P)"
 
 #: ../src/gnome-utils/gnc-main-window.c:290
 msgid "Move the current page to a new top-level GnuCash window."
-msgstr ""
+msgstr "現在のページを新しいGnuCashトップレベルウィンドウに移す。"
 
 #. Help menu
 #: ../src/gnome-utils/gnc-main-window.c:295
@@ -12266,7 +11531,7 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:313
 msgid "Show/hide the toolbar on this window"
-msgstr ""
+msgstr "このウィンドウのツールバーを表示する/隠す"
 
 #: ../src/gnome-utils/gnc-main-window.c:315
 msgid "Su_mmary Bar"
@@ -12327,21 +11592,17 @@
 #: ../src/gnome-utils/gnc-main-window.c:996
 #, c-format
 msgid "Save changes to file %s before closing?"
-msgstr ""
+msgstr "閉じる前にファイル %s への変更を保存しますか?"
 
 #: ../src/gnome-utils/gnc-main-window.c:1001
 #, c-format
-msgid ""
-"If you don't save, changes from the past %d hours and %d minutes will be "
-"discarded."
-msgstr ""
+msgid "If you don't save, changes from the past %d hours and %d minutes will be discarded."
+msgstr "保存しない場合、これまでの %d 時間 %d 分の変更が失われます。"
 
 #: ../src/gnome-utils/gnc-main-window.c:1003
 #, c-format
-msgid ""
-"If you don't save, changes from the past %d days and %d hours will be "
-"discarded."
-msgstr ""
+msgid "If you don't save, changes from the past %d days and %d hours will be discarded."
+msgstr "保存しない場合、これまでの %d 日と %d 時間の変更が失われます。"
 
 #: ../src/gnome-utils/gnc-main-window.c:1011
 #, fuzzy
@@ -12350,7 +11611,7 @@
 
 #: ../src/gnome-utils/gnc-main-window.c:1041
 msgid "Close _Without Saving"
-msgstr ""
+msgstr "保存せずに閉じる(_W)"
 
 #: ../src/gnome-utils/gnc-main-window.c:1229
 msgid "<no file>"
@@ -12359,8 +11620,7 @@
 #: ../src/gnome-utils/gnc-main-window.c:3473
 #, fuzzy
 msgid "The GnuCash personal finance manager. The GNU way to manage your money!"
-msgstr ""
-"GnuCash個人用財務管理。GNUでお金を管理しよう!"
+msgstr "GnuCash個人用財務管理。GNUでお金を管理しよう!"
 
 #. Development version
 #: ../src/gnome-utils/gnc-main-window.c:3486
@@ -12380,17 +11640,20 @@
 #. CY Strings
 #. src/app-utils/date-utilities.scm
 #: ../src/gnome-utils/gnc-period-select.c:66
-#: ../src/gnome-utils/gnc-period-select.c:81 ../intl-scm/guile-strings.c:218
+#: ../src/gnome-utils/gnc-period-select.c:81
+#: ../intl-scm/guile-strings.c:218
 msgid "Today"
 msgstr "本日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:67 ../intl-scm/guile-strings.c:186
+#: ../src/gnome-utils/gnc-period-select.c:67
+#: ../intl-scm/guile-strings.c:186
 msgid "Start of this month"
 msgstr "今月の開始日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:68 ../intl-scm/guile-strings.c:194
+#: ../src/gnome-utils/gnc-period-select.c:68
+#: ../intl-scm/guile-strings.c:194
 msgid "Start of previous month"
 msgstr "前月の開始日"
 
@@ -12399,7 +11662,8 @@
 msgstr "今四半期の開始日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:70 ../intl-scm/guile-strings.c:210
+#: ../src/gnome-utils/gnc-period-select.c:70
+#: ../intl-scm/guile-strings.c:210
 msgid "Start of previous quarter"
 msgstr "前四半期の開始日"
 
@@ -12421,12 +11685,14 @@
 msgstr "前年度の開始日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:82 ../intl-scm/guile-strings.c:190
+#: ../src/gnome-utils/gnc-period-select.c:82
+#: ../intl-scm/guile-strings.c:190
 msgid "End of this month"
 msgstr "今月の終了日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:83 ../intl-scm/guile-strings.c:198
+#: ../src/gnome-utils/gnc-period-select.c:83
+#: ../intl-scm/guile-strings.c:198
 msgid "End of previous month"
 msgstr "前月の終了日"
 
@@ -12435,7 +11701,8 @@
 msgstr "今四半期の終了日"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:85 ../intl-scm/guile-strings.c:214
+#: ../src/gnome-utils/gnc-period-select.c:85
+#: ../intl-scm/guile-strings.c:214
 msgid "End of previous quarter"
 msgstr "前四半期の終了日"
 
@@ -12487,13 +11754,20 @@
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
 #: ../src/gnome-utils/gnc-tree-view-account.c:507
-#: ../intl-scm/guile-strings.c:2168 ../intl-scm/guile-strings.c:2194
-#: ../intl-scm/guile-strings.c:2792 ../intl-scm/guile-strings.c:2818
-#: ../intl-scm/guile-strings.c:3526 ../intl-scm/guile-strings.c:3664
-#: ../intl-scm/guile-strings.c:3784 ../intl-scm/guile-strings.c:4680
-#: ../intl-scm/guile-strings.c:4818 ../intl-scm/guile-strings.c:4938
-#: ../intl-scm/guile-strings.c:5448 ../intl-scm/guile-strings.c:5538
-#: ../intl-scm/guile-strings.c:5628 ../intl-scm/guile-strings.c:5718
+#: ../intl-scm/guile-strings.c:2168
+#: ../intl-scm/guile-strings.c:2194
+#: ../intl-scm/guile-strings.c:2792
+#: ../intl-scm/guile-strings.c:2818
+#: ../intl-scm/guile-strings.c:3526
+#: ../intl-scm/guile-strings.c:3664
+#: ../intl-scm/guile-strings.c:3784
+#: ../intl-scm/guile-strings.c:4680
+#: ../intl-scm/guile-strings.c:4818
+#: ../intl-scm/guile-strings.c:4938
+#: ../intl-scm/guile-strings.c:5448
+#: ../intl-scm/guile-strings.c:5538
+#: ../intl-scm/guile-strings.c:5628
+#: ../intl-scm/guile-strings.c:5718
 msgid "Account Name"
 msgstr "勘定科目名"
 
@@ -12509,11 +11783,16 @@
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/transaction.scm
 #: ../src/gnome-utils/gnc-tree-view-account.c:522
-#: ../intl-scm/guile-strings.c:1282 ../intl-scm/guile-strings.c:2198
-#: ../intl-scm/guile-strings.c:2822 ../intl-scm/guile-strings.c:3236
-#: ../intl-scm/guile-strings.c:3558 ../intl-scm/guile-strings.c:3668
-#: ../intl-scm/guile-strings.c:3792 ../intl-scm/guile-strings.c:4390
-#: ../intl-scm/guile-strings.c:4712 ../intl-scm/guile-strings.c:4822
+#: ../intl-scm/guile-strings.c:1282
+#: ../intl-scm/guile-strings.c:2198
+#: ../intl-scm/guile-strings.c:2822
+#: ../intl-scm/guile-strings.c:3236
+#: ../intl-scm/guile-strings.c:3558
+#: ../intl-scm/guile-strings.c:3668
+#: ../intl-scm/guile-strings.c:3792
+#: ../intl-scm/guile-strings.c:4390
+#: ../intl-scm/guile-strings.c:4712
+#: ../intl-scm/guile-strings.c:4822
 #: ../intl-scm/guile-strings.c:4946
 msgid "Account Code"
 msgstr "勘定科目コード"
@@ -12581,31 +11860,44 @@
 #. src/business/business-reports/aging.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/gnome-utils/gnc-tree-view-account.c:610
-#: ../intl-scm/guile-strings.c:1362 ../intl-scm/guile-strings.c:1402
-#: ../intl-scm/guile-strings.c:2450 ../intl-scm/guile-strings.c:3074
-#: ../intl-scm/guile-strings.c:3366 ../intl-scm/guile-strings.c:4520
-#: ../intl-scm/guile-strings.c:5450 ../intl-scm/guile-strings.c:5540
-#: ../intl-scm/guile-strings.c:5630 ../intl-scm/guile-strings.c:5720
-#: ../intl-scm/guile-strings.c:5936 ../intl-scm/guile-strings.c:5992
-#: ../intl-scm/guile-strings.c:6254 ../intl-scm/guile-strings.c:6310
-#: ../intl-scm/guile-strings.c:6460 ../intl-scm/guile-strings.c:6516
-#: ../intl-scm/guile-strings.c:6778 ../intl-scm/guile-strings.c:6834
-#: ../intl-scm/guile-strings.c:7012 ../intl-scm/guile-strings.c:7016
-#: ../intl-scm/guile-strings.c:7038 ../intl-scm/guile-strings.c:7094
-#: ../intl-scm/guile-strings.c:7252 ../intl-scm/guile-strings.c:7256
-#: ../intl-scm/guile-strings.c:7278 ../intl-scm/guile-strings.c:7334
+#: ../intl-scm/guile-strings.c:1362
+#: ../intl-scm/guile-strings.c:1402
+#: ../intl-scm/guile-strings.c:2450
+#: ../intl-scm/guile-strings.c:3074
+#: ../intl-scm/guile-strings.c:3366
+#: ../intl-scm/guile-strings.c:4520
+#: ../intl-scm/guile-strings.c:5450
+#: ../intl-scm/guile-strings.c:5540
+#: ../intl-scm/guile-strings.c:5630
+#: ../intl-scm/guile-strings.c:5720
+#: ../intl-scm/guile-strings.c:5936
+#: ../intl-scm/guile-strings.c:5992
+#: ../intl-scm/guile-strings.c:6254
+#: ../intl-scm/guile-strings.c:6310
+#: ../intl-scm/guile-strings.c:6460
+#: ../intl-scm/guile-strings.c:6516
+#: ../intl-scm/guile-strings.c:6778
+#: ../intl-scm/guile-strings.c:6834
+#: ../intl-scm/guile-strings.c:7012
+#: ../intl-scm/guile-strings.c:7016
+#: ../intl-scm/guile-strings.c:7038
+#: ../intl-scm/guile-strings.c:7094
+#: ../intl-scm/guile-strings.c:7252
+#: ../intl-scm/guile-strings.c:7256
+#: ../intl-scm/guile-strings.c:7278
+#: ../intl-scm/guile-strings.c:7334
 msgid "Total"
 msgstr "合計"
 
 #: ../src/gnome-utils/gnc-tree-view-account.c:617
 #, fuzzy
 msgid "Total (Report)"
-msgstr "合計"
+msgstr "合計 (帳票)"
 
 #: ../src/gnome-utils/gnc-tree-view-account.c:623
 #, fuzzy
 msgid "Total (Period)"
-msgstr ". (ピリオド)"
+msgstr "合計 (期間)"
 
 #: ../src/gnome-utils/gnc-tree-view-account.c:635
 msgid "Tax Info"
@@ -12724,20 +12016,34 @@
 #: ../src/gnome-utils/gnc-tree-view-price.c:465
 #: ../src/register/ledger-core/split-register.c:2060
 #: ../src/register/ledger-core/split-register-model.c:227
-#: ../intl-scm/guile-strings.c:1834 ../intl-scm/guile-strings.c:1908
-#: ../intl-scm/guile-strings.c:1994 ../intl-scm/guile-strings.c:2208
-#: ../intl-scm/guile-strings.c:2446 ../intl-scm/guile-strings.c:2458
-#: ../intl-scm/guile-strings.c:2532 ../intl-scm/guile-strings.c:2618
-#: ../intl-scm/guile-strings.c:2832 ../intl-scm/guile-strings.c:3070
-#: ../intl-scm/guile-strings.c:3374 ../intl-scm/guile-strings.c:3538
-#: ../intl-scm/guile-strings.c:3592 ../intl-scm/guile-strings.c:3812
-#: ../intl-scm/guile-strings.c:3902 ../intl-scm/guile-strings.c:3952
-#: ../intl-scm/guile-strings.c:4528 ../intl-scm/guile-strings.c:4692
-#: ../intl-scm/guile-strings.c:4746 ../intl-scm/guile-strings.c:4966
-#: ../intl-scm/guile-strings.c:5056 ../intl-scm/guile-strings.c:5106
-#: ../intl-scm/guile-strings.c:5968 ../intl-scm/guile-strings.c:6286
-#: ../intl-scm/guile-strings.c:6492 ../intl-scm/guile-strings.c:6810
-#: ../intl-scm/guile-strings.c:7070 ../intl-scm/guile-strings.c:7310
+#: ../intl-scm/guile-strings.c:1834
+#: ../intl-scm/guile-strings.c:1908
+#: ../intl-scm/guile-strings.c:1994
+#: ../intl-scm/guile-strings.c:2208
+#: ../intl-scm/guile-strings.c:2446
+#: ../intl-scm/guile-strings.c:2458
+#: ../intl-scm/guile-strings.c:2532
+#: ../intl-scm/guile-strings.c:2618
+#: ../intl-scm/guile-strings.c:2832
+#: ../intl-scm/guile-strings.c:3070
+#: ../intl-scm/guile-strings.c:3374
+#: ../intl-scm/guile-strings.c:3538
+#: ../intl-scm/guile-strings.c:3592
+#: ../intl-scm/guile-strings.c:3812
+#: ../intl-scm/guile-strings.c:3902
+#: ../intl-scm/guile-strings.c:3952
+#: ../intl-scm/guile-strings.c:4528
+#: ../intl-scm/guile-strings.c:4692
+#: ../intl-scm/guile-strings.c:4746
+#: ../intl-scm/guile-strings.c:4966
+#: ../intl-scm/guile-strings.c:5056
+#: ../intl-scm/guile-strings.c:5106
+#: ../intl-scm/guile-strings.c:5968
+#: ../intl-scm/guile-strings.c:6286
+#: ../intl-scm/guile-strings.c:6492
+#: ../intl-scm/guile-strings.c:6810
+#: ../intl-scm/guile-strings.c:7070
+#: ../intl-scm/guile-strings.c:7310
 msgid "Price"
 msgstr "価格"
 
@@ -12748,14 +12054,12 @@
 msgstr ""
 
 #: ../src/gnome-utils/gnc-tree-view-sx-list.c:186
-#, fuzzy
 msgid "Last Occur"
-msgstr "最後"
+msgstr "前回"
 
 #: ../src/gnome-utils/gnc-tree-view-sx-list.c:191
-#, fuzzy
 msgid "Next Occur"
-msgstr "列数"
+msgstr "次回"
 
 #: ../src/gnome-utils/print-session.c:45
 msgid "Print GnuCash Document"
@@ -12780,21 +12084,17 @@
 msgstr ""
 
 #: ../src/gnome-utils/schemas/apps_gnucash_history.schemas.in.h:5
-msgid ""
-"This field contains the full path of the next most recently opened file."
+msgid "This field contains the full path of the next most recently opened file."
 msgstr ""
 
 #: ../src/gnome-utils/schemas/apps_gnucash_history.schemas.in.h:6
-msgid ""
-"This setting contains the number of files to keep in the Recently Opened "
-"Files menu. This value may be set to zero to disable the file history. This "
-"number has a maximum value of 10."
+msgid "This setting contains the number of files to keep in the Recently Opened Files menu. This value may be set to zero to disable the file history. This number has a maximum value of 10."
 msgstr ""
 
 #: ../src/gnome-utils/window-main-summarybar.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "%s, Total:"
-msgstr "合計"
+msgstr "%s, 合計:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:315
 #, fuzzy, c-format
@@ -12802,24 +12102,22 @@
 msgstr "海外通貨を表示"
 
 #: ../src/gnome-utils/window-main-summarybar.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "%s, Grand Total:"
-msgstr "総合計の色"
+msgstr "%s, 総合計:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:322
 #, c-format
 msgid "%s:"
-msgstr ""
+msgstr "%s:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:427
-#, fuzzy
 msgid "Assets:"
-msgstr "資産"
+msgstr "資産:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:429
-#, fuzzy
 msgid "Profits:"
-msgstr "利益"
+msgstr "利益:"
 
 #: ../src/gnome/window-reconcile.c:432
 #, fuzzy
@@ -12836,7 +12134,8 @@
 msgid "Payment From"
 msgstr "支払期間"
 
-#: ../src/gnome/window-reconcile.c:457 ../src/gnome/window-reconcile.c:467
+#: ../src/gnome/window-reconcile.c:457
+#: ../src/gnome/window-reconcile.c:467
 #, fuzzy
 msgid "Reconcile Account"
 msgstr "勘定科目を選択"
@@ -12866,7 +12165,8 @@
 msgstr "借方"
 
 #. src/report/report-system/report-utilities.scm
-#: ../src/gnome/window-reconcile.c:991 ../intl-scm/guile-strings.c:1368
+#: ../src/gnome/window-reconcile.c:991
+#: ../intl-scm/guile-strings.c:1368
 msgid "Credits"
 msgstr "貸方"
 
@@ -12900,9 +12200,7 @@
 
 #: ../src/gnome/window-reconcile.c:1976
 #, fuzzy
-msgid ""
-"You have made changes to this reconcile window. Are you sure you want to "
-"cancel?"
+msgid "You have made changes to this reconcile window. Are you sure you want to cancel?"
 msgstr "この調整ウィンドウには変更があります。本当にキャンセルしてもよろしいですか?"
 
 #. Toplevel
@@ -12920,8 +12218,7 @@
 msgstr "調整情報(_R)..."
 
 #: ../src/gnome/window-reconcile.c:2001
-msgid ""
-"Change the reconcile information including statement date and ending balance."
+msgid "Change the reconcile information including statement date and ending balance."
 msgstr "日付や期末残高を含む調整情報を変更する"
 
 #: ../src/gnome/window-reconcile.c:2004
@@ -12978,10 +12275,7 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:3
-msgid ""
-"\"Select Import Action\" allows you to change the matching transaction to "
-"reconcile, or the destination account of the auto-balance split (if "
-"required)."
+msgid "\"Select Import Action\" allows you to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required)."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:4
@@ -12999,16 +12293,11 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:8
-msgid ""
-"A transaction whose best match's score is in the green zone (above or equal "
-"to the Auto-CLEAR threshold) will be CLEARed by default."
+msgid "A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:9
-msgid ""
-"A transaction whose best match's score is in the red zone (above the display "
-"threshold but below or equal to the Auto-ADD threshold) will be ADDed by "
-"default."
+msgid "A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:11
@@ -13042,23 +12331,16 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:21
-msgid ""
-"Enable the SKIP action in the transaction matcher.  If enabled, a "
-"transaction whose best match's score is in the yellow zone (above the Auto-"
-"ADD threshold but below the Auto-CLEAR threshold) will be SKIPed by default."
+msgid "Enable the SKIP action in the transaction matcher.  If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be SKIPed by default."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:22
 msgid ""
-"For a new transaction, click on the \"Other Account\" entry to choose the "
-"other (destination) account of this transaction.\n"
-"For a transaction that is a duplicate of an existing one, click on the "
-"\"Other Account\" or \"Description\" entry to \n"
+"For a new transaction, click on the \"Other Account\" entry to choose the other (destination) account of this transaction.\n"
+"For a transaction that is a duplicate of an existing one, click on the \"Other Account\" or \"Description\" entry to \n"
 "check whether GnuCash chose the right existing transaction.\n"
-"To switch transactions between both states, click on the checkmark in the "
-"\"New\" column.\n"
-"When all new transactions have the correct destination account and all "
-"duplicates are matched with the right existing transaction, \n"
+"To switch transactions between both states, click on the checkmark in the \"New\" column.\n"
+"When all new transactions have the correct destination account and all duplicates are matched with the right existing transaction, \n"
 "click \"Ok\"."
 msgstr ""
 
@@ -13077,15 +12359,7 @@
 msgstr "複製とともに読み込まれた取引"
 
 #: ../src/import-export/generic-import.glade.h:32
-msgid ""
-"In some places commercial ATMs (not belonging to a financial institution) "
-"are installed in places like convienience store.  These ATM add its fee "
-"directly to the amount instead of showing up as a separate transaction or in "
-"your monthly banking fees.  For example, you withdraw 100$, and you are "
-"charged 101,50$ plus Interac fees.  If you manually entered that 100$, the "
-"amounts won't match.  You should set this to whatever is the maximum such "
-"fee in your area (in units of your local currency), so the transaction will "
-"be recognised as a match."
+msgid "In some places commercial ATMs (not belonging to a financial institution) are installed in places like convienience store.  These ATM add its fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees.  For example, you withdraw 100$, and you are charged 101,50$ plus Interac fees.  If you manually entered that 100$, the amounts won't match.  You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:33
@@ -13146,15 +12420,11 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:47
-msgid ""
-"The minimum score a potential match must have to be displayed in the match "
-"list."
+msgid "The minimum score a potential match must have to be displayed in the match list."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:48
-msgid ""
-"This transaction probably requires your intervention or it will be imported "
-"unbalanced."
+msgid "This transaction probably requires your intervention or it will be imported unbalanced."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:49
@@ -13162,9 +12432,7 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:50
-msgid ""
-"This transaction will be imported balanced (you may still want to double "
-"check the match or destination account)."
+msgid "This transaction will be imported balanced (you may still want to double check the match or destination account)."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:51
@@ -13177,8 +12445,7 @@
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:53
-msgid ""
-"Use bayesian algorithms to match new transactions with existing accounts."
+msgid "Use bayesian algorithms to match new transactions with existing accounts."
 msgstr ""
 
 #: ../src/import-export/generic-import.glade.h:54
@@ -13274,44 +12541,33 @@
 
 #: ../src/import-export/hbci/dialog-hbcitrans.c:549
 msgid ""
-"The amount is zero or the amount field could not be interpreted correctly. "
-"You might have mixed up decimal point and comma, compared to your locale "
-"settings. This does not result in a valid online transfer job. \n"
+"The amount is zero or the amount field could not be interpreted correctly. You might have mixed up decimal point and comma, compared to your locale settings. This does not result in a valid online transfer job. \n"
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
 
 #: ../src/import-export/hbci/dialog-hbcitrans.c:571
 msgid ""
-"You did not enter any transaction purpose. A purpose is required for an "
-"online transfer.\n"
+"You did not enter any transaction purpose. A purpose is required for an online transfer.\n"
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
 
 #: ../src/import-export/hbci/dialog-hbcitrans.c:592
 msgid ""
-"You did not enter a recipient name.  A recipient name is required for an "
-"online transfer.\n"
+"You did not enter a recipient name.  A recipient name is required for an online transfer.\n"
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
 
 #: ../src/import-export/hbci/dialog-hbcitrans.c:729
 #, c-format
-msgid ""
-"The internal check of the destination account number '%s' at the specified "
-"bank with bank code '%s' failed. This means the account number might contain "
-"an error. Should the online transfer job be sent with this account number "
-"anyway?"
+msgid "The internal check of the destination account number '%s' at the specified bank with bank code '%s' failed. This means the account number might contain an error. Should the online transfer job be sent with this account number anyway?"
 msgstr ""
 
 #: ../src/import-export/hbci/dialog-hbcitrans.c:835
 msgid ""
-"The job was sent to the bank successfully, but the bank is refusing to "
-"execute the job. Please check the log window for the exact error message of "
-"the bank. The line with the error message contains a code number that is "
-"greater than 9000.\n"
+"The job was sent to the bank successfully, but the bank is refusing to execute the job. Please check the log window for the exact error message of the bank. The line with the error message contains a code number that is greater than 9000.\n"
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
@@ -13345,33 +12601,22 @@
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:658
 msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully "
-"because the additional software \"Qt\" was not found.  Please install the "
-"\"Qt/Windows Open Source Edition\" from Trolltech by downloading it from www."
-"trolltech.com\n"
+"The external program \"AqBanking Setup Wizard\" failed to run successfully because the additional software \"Qt\" was not found.  Please install the \"Qt/Windows Open Source Edition\" from Trolltech by downloading it from www.trolltech.com\n"
 "\n"
-"If you have installed Qt already, you will have to adapt the PATH variable "
-"of your system appropriately.  Contact the GnuCash developers if you need "
-"further assistance on how to install Qt correctly.\n"
+"If you have installed Qt already, you will have to adapt the PATH variable of your system appropriately.  Contact the GnuCash developers if you need further assistance on how to install Qt correctly.\n"
 "\n"
-"Online Banking cannot be setup without Qt.  Press \"Close\" now, then "
-"\"Cancel\" to cancel the Online Banking setup."
+"Online Banking cannot be setup without Qt.  Press \"Close\" now, then \"Cancel\" to cancel the Online Banking setup."
 msgstr ""
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:675
-msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully.  "
-"Online Banking can only be setup if this wizard has run successfully.  "
-"Please try running the \"AqBanking Setup Wizard\" again."
+msgid "The external program \"AqBanking Setup Wizard\" failed to run successfully.  Online Banking can only be setup if this wizard has run successfully.  Please try running the \"AqBanking Setup Wizard\" again."
 msgstr ""
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:686
 msgid ""
 "The external program \"AqBanking Setup Wizard\" has not been found. \n"
 "\n"
-"The aqbanking package should include the program \"qt3-wizard\".  Please "
-"check your installation to ensure this program is present.  On some "
-"distributions this may require installing additional packages."
+"The aqbanking package should include the program \"qt3-wizard\".  Please check your installation to ensure this program is present.  On some distributions this may require installing additional packages."
 msgstr ""
 
 #: ../src/import-export/hbci/druid-hbci-initial.c:752
@@ -13393,9 +12638,7 @@
 
 #: ../src/import-export/hbci/druid-hbci-utils.c:165
 #, c-format
-msgid ""
-"The directory for file %s does not exist. Please choose another place for "
-"this file."
+msgid "The directory for file %s does not exist. Please choose another place for this file."
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:1
@@ -13441,10 +12684,7 @@
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:11
-msgid ""
-"Click on the line of an Online Banking account name if you want to match it "
-"to a GnuCash account. Click \"Forward\" when all desired accounts are "
-"matching."
+msgid "Click on the line of an Online Banking account name if you want to match it to a GnuCash account. Click \"Forward\" when all desired accounts are matching."
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:12
@@ -13577,9 +12817,12 @@
 #. src/import-export/qif-import/qif-to-gnc.scm
 #. src/import-export/qif-import/qif-merge-groups.scm
 #: ../src/import-export/hbci/glade/hbci.glade.h:38
-#: ../intl-scm/guile-strings.c:5810 ../intl-scm/guile-strings.c:5816
-#: ../intl-scm/guile-strings.c:5824 ../intl-scm/guile-strings.c:5828
-#: ../intl-scm/guile-strings.c:5834 ../intl-scm/guile-strings.c:5842
+#: ../intl-scm/guile-strings.c:5810
+#: ../intl-scm/guile-strings.c:5816
+#: ../intl-scm/guile-strings.c:5824
+#: ../intl-scm/guile-strings.c:5828
+#: ../intl-scm/guile-strings.c:5834
+#: ../intl-scm/guile-strings.c:5842
 msgid "Progress"
 msgstr ""
 
@@ -13619,47 +12862,34 @@
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:47
-msgid ""
-"The Setup of your Online Banking connection is handled by the external "
-"program \"AqBanking Setup Wizard\". Please press the button below to start "
-"this program.\t"
+msgid "The Setup of your Online Banking connection is handled by the external program \"AqBanking Setup Wizard\". Please press the button below to start this program.\t"
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:48
 msgid ""
-"The setup for matching Online Banking accounts to GnuCash accounts is now "
-"finished.  You can now invoke Online Banking actions on those accounts.\n"
+"The setup for matching Online Banking accounts to GnuCash accounts is now finished.  You can now invoke Online Banking actions on those accounts.\n"
 "\n"
-"If you want to add another bank, user, or account, you can start this druid "
-"again anytime.\n"
+"If you want to add another bank, user, or account, you can start this druid again anytime.\n"
 "\n"
 "Press \"Apply\" now."
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:53
 msgid ""
-"This druid helps you setting up your Online Banking connection with your "
-"bank.\n"
+"This druid helps you setting up your Online Banking connection with your bank.\n"
 "\n"
-"You first need to apply for Online Banking access at your bank. If your "
-"bank  decides to grant you electronic access, they will send you a letter "
-"containing \n"
+"You first need to apply for Online Banking access at your bank. If your bank  decides to grant you electronic access, they will send you a letter containing \n"
 "\n"
 "* The bank code of your bank\n"
 "* The user ID that identifies you to your bank\n"
 "* The Internet address of your bank's Online Banking server\n"
-"* For HBCI Online Banking, information about the cryptographic public key of "
-"your bank (\"Ini-Letter\").\n"
+"* For HBCI Online Banking, information about the cryptographic public key of your bank (\"Ini-Letter\").\n"
 "\n"
 "This information will be needed in the following. Press \"Forward\" now.\n"
 "\n"
-"NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online "
-"Banking server. You should not rely on time-critical transfers through "
-"Online Banking, because sometimes the bank does not give you correct "
-"feedback when a transfer is rejected.\n"
+"NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online Banking server. You should not rely on time-critical transfers through Online Banking, because sometimes the bank does not give you correct feedback when a transfer is rejected.\n"
 "\n"
-"Press \"Cancel\" if you do not wish to setup any Online Banking connection "
-"now."
+"Press \"Cancel\" if you do not wish to setup any Online Banking connection now."
 msgstr ""
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:67
@@ -13762,11 +12992,7 @@
 msgid ""
 "The downloaded Online Banking Balance was zero.\n"
 "\n"
-"Either this is the correct balance, or your bank does not support Balance "
-"download in this Online Banking version. In the latter case you should "
-"choose a different Online Banking version number in the Online Banking "
-"(AqBanking or HBCI) Setup. After that, try again to download the Online "
-"Banking Balance."
+"Either this is the correct balance, or your bank does not support Balance download in this Online Banking version. In the latter case you should choose a different Online Banking version number in the Online Banking (AqBanking or HBCI) Setup. After that, try again to download the Online Banking Balance."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:289
@@ -13782,9 +13008,7 @@
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:301
-msgid ""
-"The booked balance is identical to the current reconciled balance of the "
-"account."
+msgid "The booked balance is identical to the current reconciled balance of the account."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:315
@@ -13793,28 +13017,21 @@
 msgstr "勘定科目を選択"
 
 #: ../src/import-export/hbci/gnc-hbci-gettrans.c:208
-msgid ""
-"The Online Banking import returned no transactions for the selected time "
-"period."
+msgid "The Online Banking import returned no transactions for the selected time period."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:136
 #: ../src/import-export/hbci/gnc-hbci-utils.c:711
 msgid ""
-"The backend found an error during the preparation of the job. It is not "
-"possible to execute this job. \n"
+"The backend found an error during the preparation of the job. It is not possible to execute this job. \n"
 "\n"
-"Most probable the bank does not support your chosen job or your Online "
-"Banking account does not have the permission to execute this job. More error "
-"messages might be visible on your console log.\n"
+"Most probable the bank does not support your chosen job or your Online Banking account does not have the permission to execute this job. More error messages might be visible on your console log.\n"
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:219
-msgid ""
-"You have changed the list of online transfer templates, but you cancelled "
-"the transfer dialog. Do you nevertheless want to store the changes?"
+msgid "You have changed the list of online transfer templates, but you cancelled the transfer dialog. Do you nevertheless want to store the changes?"
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:250
@@ -13844,39 +13061,29 @@
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:370
-msgid ""
-"Unfortunately you entered a wrong PIN for too many times. Your chip card is "
-"therefore destroyed. Aborting."
+msgid "Unfortunately you entered a wrong PIN for too many times. Your chip card is therefore destroyed. Aborting."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:379
-msgid ""
-"No chip card has been found in the chip card reader. Do you want to try "
-"again?"
+msgid "No chip card has been found in the chip card reader. Do you want to try again?"
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:385
-msgid ""
-"Unfortunately this Online Banking job is not supported by your bank or for "
-"your account. Aborting."
+msgid "Unfortunately this Online Banking job is not supported by your bank or for your account. Aborting."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:393
-msgid ""
-"The server of your bank refused the Online Banking connection. Please try "
-"again later. Aborting."
+msgid "The server of your bank refused the Online Banking connection. Please try again later. Aborting."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:544
-msgid ""
-"Executing the Online Banking outbox failed. Please check the log window."
+msgid "Executing the Online Banking outbox failed. Please check the log window."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:572
 #, c-format
 msgid ""
-"A debit note has been refused by the bank. The refused debit note has the "
-"following data:\n"
+"A debit note has been refused by the bank. The refused debit note has the following data:\n"
 "Remote bank code: \"%s\"\n"
 "Remote account number: \"%s\"\n"
 "Description and remote name: \"%s\"\n"
@@ -13885,44 +13092,37 @@
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:588
 msgid ""
-"One of the jobs was sent to the bank successfully, but the bank is refusing "
-"to execute the job. Please check the log window for the exact error message "
-"of the bank. The line with the error message contains a code number that is "
-"greater than 9000.\n"
+"One of the jobs was sent to the bank successfully, but the bank is refusing to execute the job. Please check the log window for the exact error message of the bank. The line with the error message contains a code number that is greater than 9000.\n"
 "\n"
 "The job has been removed from the queue."
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:663
-msgid ""
-"No Online Banking account found for this gnucash account. These transactions "
-"will not be executed by Online Banking."
+msgid "No Online Banking account found for this gnucash account. These transactions will not be executed by Online Banking."
 msgstr ""
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/hbci/gnc-hbci-utils.c:811
-#: ../intl-scm/guile-strings.c:5764 ../intl-scm/guile-strings.c:5786
+#: ../intl-scm/guile-strings.c:5764
+#: ../intl-scm/guile-strings.c:5786
 #: ../intl-scm/guile-strings.c:5808
 msgid "Unspecified"
 msgstr "不特定"
 
 #. Menus
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:96
-#, fuzzy
 msgid "_Online Actions"
-msgstr "オンライン"
+msgstr "オンラインアクション(_O)"
 
 #. Menu Items
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:99
 msgid "_Online Banking Setup..."
-msgstr ""
+msgstr "オンラインバンキング設定(_O)..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:100
-msgid ""
-"Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using "
-"AqBanking)"
+msgid "Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using AqBanking)"
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:102
@@ -13968,7 +13168,7 @@
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:121
 #, fuzzy
 msgid "_Direct Debit..."
-msgstr "直接引き落とし"
+msgstr "直接引落し"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:122
 #, fuzzy
@@ -13977,87 +13177,72 @@
 
 #. File -> Import menu item
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:126
-#, fuzzy
 msgid "Import _MT940"
-msgstr "QIF インポート"
+msgstr "_MT940をインポート"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:127
-#, fuzzy
 msgid "Import a MT940 file into GnuCash"
-msgstr "読み込む QIF ファイルを選択"
+msgstr "MT940ファイルをGnuCashにインポートする"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:129
 #, fuzzy
 msgid "Import MT94_2"
-msgstr "QIF インポート"
+msgstr "MT94_2をインポート"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:130
 msgid "Import a MT942 file into GnuCash"
-msgstr ""
+msgstr "MT942ファイルをGnuCashにインポートする"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:132
-#, fuzzy
 msgid "Import _DTAUS"
-msgstr "QIF インポート"
+msgstr "_DTAUSをインポート"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:133
 msgid "Import a DTAUS file into GnuCash"
-msgstr ""
+msgstr "DTAUSファイルをGnuCashにインポートする"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:136
-#, fuzzy
 msgid "Import _CSV"
-msgstr "QIF インポート"
+msgstr "_CSVをインポート"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:137
-#, fuzzy
 msgid "Import a CSV file into GnuCash"
-msgstr "読み込む QIF ファイルを選択"
+msgstr "CSVファイルをGnuCashにインポートする"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:139
 msgid "Import CSV and s_end..."
-msgstr ""
+msgstr "CSVをインポートして送信(_E)..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:140
-msgid ""
-"Import a CSV file into GnuCash and send the transfers online through Online "
-"Banking"
+msgid "Import a CSV file into GnuCash and send the transfers online through Online Banking"
 msgstr ""
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:143
 msgid "Import DTAUS and _send..."
-msgstr ""
+msgstr "DTAUSをインポートして送信(_S)..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:144
-msgid ""
-"Import a DTAUS file into GnuCash and send the transfers online through "
-"Online Banking"
+msgid "Import a DTAUS file into GnuCash and send the transfers online through Online Banking"
 msgstr ""
 
 #: ../src/import-export/hbci/hbci-interaction.c:401
 #, c-format
-msgid ""
-"The PIN needs to be at least %d characters long. Do you want to try again?"
+msgid "The PIN needs to be at least %d characters long. Do you want to try again?"
 msgstr ""
 
 #: ../src/import-export/hbci/hbci-interaction.c:414
 #, c-format
-msgid ""
-"You entered %ld characters, but the PIN must be no longer than %d "
-"characters. Do you want to try again?"
+msgid "You entered %ld characters, but the PIN must be no longer than %d characters. Do you want to try again?"
 msgstr ""
 
 #: ../src/import-export/hbci/hbci-interaction.c:482
 #, c-format
-msgid ""
-"This TAN needs to be at least %d characters long. Do you want to try again?"
+msgid "This TAN needs to be at least %d characters long. Do you want to try again?"
 msgstr ""
 
 #: ../src/import-export/hbci/hbci-interaction.c:495
 #, c-format
-msgid ""
-"You entered %ld characters, but the TAN must be no longer than %d "
-"characters. Do you want to try again?"
+msgid "You entered %ld characters, but the TAN must be no longer than %d characters. Do you want to try again?"
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:1
@@ -14079,16 +13264,11 @@
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
-msgid ""
-"If active, the PIN for HBCI/AqBanking actions will be remembered in memory "
-"during a session. Otherwise it will have to be entered again each time "
-"during a session when it is needed."
+msgid "If active, the PIN for HBCI/AqBanking actions will be remembered in memory during a session. Otherwise it will have to be entered again each time during a session when it is needed."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:6
-msgid ""
-"If active, the window will be closed automatically when you finish the HBCI/"
-"AqBanking import process. Otherwise it will stay open."
+msgid "If active, the window will be closed automatically when you finish the HBCI/AqBanking import process. Otherwise it will stay open."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:7
@@ -14104,31 +13284,19 @@
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:12
-msgid ""
-"This setting specifies the data format when importing CSV files. The "
-"AqBanking library offers various import formats (called \"profiles\") of "
-"which you can choose one here."
+msgid "This setting specifies the data format when importing CSV files. The AqBanking library offers various import formats (called \"profiles\") of which you can choose one here."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:13
-msgid ""
-"This setting specifies the data format when importing DTAUS files. The "
-"AqBanking library offers various import formats (called \"profiles\") of "
-"which you can choose one here."
+msgid "This setting specifies the data format when importing DTAUS files. The AqBanking library offers various import formats (called \"profiles\") of which you can choose one here."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:14
-msgid ""
-"This setting specifies the data format when importing SWIFT MT940 files. The "
-"AqBanking library offers various import formats (called \"profiles\") of "
-"which you can choose one here."
+msgid "This setting specifies the data format when importing SWIFT MT940 files. The AqBanking library offers various import formats (called \"profiles\") of which you can choose one here."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:15
-msgid ""
-"This setting specifies the data format when importing SWIFT MT942 files. The "
-"AqBanking library offers various import formats (called \"profiles\") of "
-"which you can choose one here."
+msgid "This setting specifies the data format when importing SWIFT MT942 files. The AqBanking library offers various import formats (called \"profiles\") of which you can choose one here."
 msgstr ""
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:16
@@ -14147,16 +13315,11 @@
 
 #: ../src/import-export/import-account-matcher.c:239
 #, c-format
-msgid ""
-"The account %s is a placeholder account and does not allow transactions. "
-"Please choose a different account."
+msgid "The account %s is a placeholder account and does not allow transactions. Please choose a different account."
 msgstr ""
 
 #: ../src/import-export/import-commodity-matcher.c:112
-msgid ""
-"Please select a commodity to match the following exchange specific code. "
-"Please note that the exchange code of the commodity you select will be "
-"overwritten."
+msgid "Please select a commodity to match the following exchange specific code. Please note that the exchange code of the commodity you select will be overwritten."
 msgstr ""
 
 #: ../src/import-export/import-format-dialog.c:59
@@ -14272,15 +13435,9 @@
 #: ../src/import-export/qif-import/qif.glade.h:71
 #, fuzzy
 msgid ""
-"The QIF file format does not specify which order the day, month, and year "
-"components of a date are printed.  In most cases, it is possible to "
-"automatically determine which format is in use in a particular file. "
-"However, in the file you have just imported there exist more than one "
-"possible format that fits the data.  \n"
+"The QIF file format does not specify which order the day, month, and year components of a date are printed.  In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data.  \n"
 "\n"
-"Please select a date format for the file.  QIF files created by European "
-"software are likely  to be in \"d-m-y\" or day-month-year format, where US "
-"QIF files are likely to be \"m-d-y\" or month-day-year.    \n"
+"Please select a date format for the file.  QIF files created by European software are likely  to be in \"d-m-y\" or day-month-year format, where US QIF files are likely to be \"m-d-y\" or month-day-year.    \n"
 msgstr ""
 "QIF ファイルではどの順番で日付を構成する日、月、年のコンポーネントが \n"
 "印刷されるかを指定しません。ほとんどの場合、特定のファイルでどの形式が\n"
@@ -14293,51 +13450,39 @@
 "場合には \"m-d-y\"または月-日-年の書式になっていることが多いです。\n"
 
 #: ../src/import-export/log-replay/gnc-log-replay.c:522
-#, fuzzy
 msgid "Select a .log file to replay"
-msgstr "読み込む QIF ファイルを選択"
+msgstr "リプレイする.logファイルを選択"
 
 #. Translators: %s is the file name.
 #: ../src/import-export/log-replay/gnc-log-replay.c:541
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open the current log file: %s"
-msgstr "現在の価格を削除"
+msgstr "現在のログファイルを開くことができません: %s"
 
 #. Translation note:
 #. * First argument is the filename,
 #. * second argument is the error.
 #.
 #: ../src/import-export/log-replay/gnc-log-replay.c:554
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open log file: %s: %s"
-msgstr ""
-"ファイルを開くことができませんでした\n"
-"     %s。\n"
-"\n"
-"%s"
+msgstr "ログファイル %s を開くことができませんでした: %s"
 
 #: ../src/import-export/log-replay/gnc-log-replay.c:561
-#, fuzzy
 msgid "The log file you selected was empty."
-msgstr ""
-"ファイル \n"
-"    %s\n"
-" は空です。"
+msgstr "選択したログファイルは空です。"
 
 #: ../src/import-export/log-replay/gnc-log-replay.c:567
-msgid ""
-"The log file you selected cannot be read.  The file header was not "
-"recognized."
-msgstr ""
+msgid "The log file you selected cannot be read.  The file header was not recognized."
+msgstr "選択したログファイルが読み込めませんでした。ファイルヘッダが認識できません。"
 
 #: ../src/import-export/log-replay/gnc-plugin-log-replay.c:45
-#, fuzzy
 msgid "_Replay GnuCash .log file..."
-msgstr "照合(_R)..."
+msgstr "GnuCashの.logファイルをリプレイ(_R)..."
 
 #: ../src/import-export/log-replay/gnc-plugin-log-replay.c:46
 msgid "Replay a GnuCash log file after a crash.  This cannot be undone."
-msgstr ""
+msgstr "クラッシュ後にGnuCashのログファイルをリプレイする。これはやり直しできません。"
 
 #. This string is a default account
 #. name. It MUST NOT contain the
@@ -14386,14 +13531,12 @@
 msgstr ""
 
 #: ../src/import-export/ofx/gnc-ofx-import.c:653
-#, fuzzy
 msgid "Select an OFX/QFX file to process"
-msgstr "読み込む QIF ファイルを選択"
+msgstr "処理するOFX/QFXファイルを選択する"
 
 #: ../src/import-export/ofx/gnc-plugin-ofx.c:44
-#, fuzzy
 msgid "Import _OFX/QFX..."
-msgstr "QIF のインポート..."
+msgstr "_OFX/QFXをインポート..."
 
 #: ../src/import-export/ofx/gnc-plugin-ofx.c:45
 msgid "Process an OFX/QFX response file"
@@ -14405,34 +13548,25 @@
 
 #: ../src/import-export/qif-import/druid-qif-import.c:389
 msgid "Select QIF File"
-msgstr "QIF ファイル選択"
+msgstr "QIFファイを選択"
 
 #. stay here if no file specified
 #: ../src/import-export/qif-import/druid-qif-import.c:479
-#, fuzzy
 msgid "Please select a file to load."
-msgstr "読み込むファイルを選択して下さい。\n"
+msgstr "ロードするファイルを選択して下さい。"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:485
-#, fuzzy
 msgid "File not found or read permission denied. Please select another file."
-msgstr ""
-"ファイルが見つからないか、パーミッションがありません。\n"
-"別のファイルを選択してください。"
+msgstr "ファイルが見つからないか、パーミッションがありません。別のファイルを選択してください。"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:497
-#, fuzzy
 msgid "That QIF file is already loaded. Please select another file."
-msgstr ""
-"その QIF ファイルはすでに読込済みです。\n"
-"別のファイルを選択してください。"
+msgstr "そのQIFファイルはすでにロード済です。別のファイルを選択してください。"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "QIF file load warning: %s"
-msgstr ""
-"QIF形式ファイルの読込に関する警告:\n"
-"%s"
+msgstr "QIFファイルのロードに関する警告: %s"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:534
 msgid "An error occurred while loading the QIF file."
@@ -14441,20 +13575,16 @@
 #: ../src/import-export/qif-import/druid-qif-import.c:542
 #, fuzzy, c-format
 msgid "QIF file load failed: %s"
-msgstr ""
-"QIF形式ファイルの読込失敗:\n"
-"%s"
+msgstr "QIFファイルのロード失敗: %"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:605
 msgid "An error occurred while parsing the QIF file."
-msgstr "QIF形式ファイルの解析中にエラーが発生しました"
+msgstr "QIFファイルの解析中にエラーが発生しました"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "QIF file parse failed: %s"
-msgstr ""
-"QIF形式ファイルの解析失敗:\n"
-"%s"
+msgstr "QIFファイルの解析失敗: %s"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:864
 msgid "You must enter an account name."
@@ -14462,15 +13592,11 @@
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1047
 msgid "GnuCash account name"
-msgstr "Gnucash の勘定科目名"
+msgstr "GnuCash の勘定科目名"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1298
-msgid ""
-"An error occurred while importing QIF transactions into GnuCash. Your "
-"accounts are unchanged."
-msgstr ""
-"QIFファイルの取引を Gnucashに読込中にエラーが発生しました。勘定科目は変更され"
-"ません。"
+msgid "An error occurred while importing QIF transactions into GnuCash. Your accounts are unchanged."
+msgstr "QIFファイルの取引を Gnucashに読込中にエラーが発生しました。勘定科目は変更されません。"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1342
 #: ../src/import-export/qif-import/druid-qif-import.c:1794
@@ -14507,12 +13633,8 @@
 msgstr "商品のフルネームを入力してください。例えば、\"レッドハット株\""
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1730
-msgid ""
-"Enter the ticker symbol (such as \"RHAT\") or other unique abbreviation for "
-"the name."
-msgstr ""
-"ティッカーシンボル(例えば、\"RHAT\")あるいはその他の一意の略語を 入力してくだ"
-"さい。"
+msgid "Enter the ticker symbol (such as \"RHAT\") or other unique abbreviation for the name."
+msgstr "ティッカーシンボル(例えば、\"RHAT\")あるいはその他の一意の略語を 入力してください。"
 
 #: ../src/import-export/qif-import/druid-qif-import.c:1751
 msgid "Click \"Next\" to accept the information and move on."
@@ -14535,18 +13657,16 @@
 msgstr "複製?"
 
 #: ../src/import-export/qif-import/gnc-plugin-qif-import.c:48
-#, fuzzy
 msgid "Import _QIF..."
-msgstr "QIF のインポート..."
+msgstr "_QIFをインポート..."
 
 #: ../src/import-export/qif-import/gnc-plugin-qif-import.c:49
 msgid "Import a Quicken QIF file"
-msgstr "Quicken QIF ファイルを読み込む"
+msgstr "Quicken QIF ファイルをインポートする"
 
 #: ../src/import-export/qif-import/qif.glade.h:1
-#, fuzzy
 msgid "<b>QIF Import</b>"
-msgstr "QIF インポート"
+msgstr "<b>QIFをインポート</b>"
 
 #: ../src/import-export/qif-import/qif.glade.h:2
 msgid "Account name:"
@@ -14559,14 +13679,9 @@
 #: ../src/import-export/qif-import/qif.glade.h:4
 #, fuzzy
 msgid ""
-"Click \"Apply\" to import data from the staging area and update your GnuCash "
-"accounts. The account and category matching information you have entered "
-"will be saved and used for defaults the next time you use the QIF import  "
-"facility. \n"
+"Click \"Apply\" to import data from the staging area and update your GnuCash accounts. The account and category matching information you have entered will be saved and used for defaults the next time you use the QIF import  facility. \n"
 "\n"
-"Click \"Back\" to review your account and category matchings, to change "
-"currency and security settings for new accounts, or to add more files to the "
-"staging area.\n"
+"Click \"Back\" to review your account and category matchings, to change currency and security settings for new accounts, or to add more files to the staging area.\n"
 "\n"
 "Click \"Cancel\" to abort the QIF import process."
 msgstr ""
@@ -14587,30 +13702,22 @@
 
 #: ../src/import-export/qif-import/qif.glade.h:11
 #, fuzzy
-msgid ""
-"Click \"Forward\" to enter information about stocks and mutual funds in the "
-"imported data."
+msgid "Click \"Forward\" to enter information about stocks and mutual funds in the imported data."
 msgstr ""
 "読み込んだデータに株式、投資信託に関する情報を入力するために\n"
 "\"次\"をクリックしてください。"
 
 #: ../src/import-export/qif-import/qif.glade.h:12
 #, fuzzy
-msgid ""
-"Click \"Forward\" to enter information about the currency used in your QIF "
-"files."
-msgstr ""
-"QIF ファイルで使用されている通貨の情報を入力するために\"次\"をクリックしてく"
-"ださい。"
+msgid "Click \"Forward\" to enter information about the currency used in your QIF files."
+msgstr "QIF ファイルで使用されている通貨の情報を入力するために\"次\"をクリックしてください。"
 
 #: ../src/import-export/qif-import/qif.glade.h:13
 #, fuzzy
 msgid ""
-"Click \"Load another file\" if you have more data to import at this time. Do "
-"this if you have saved your accounts to separate QIF files.\n"
+"Click \"Load another file\" if you have more data to import at this time. Do this if you have saved your accounts to separate QIF files.\n"
 "\n"
-"Click \"Forward\" to finish loading files and move to the next step of the "
-"QIF import process. "
+"Click \"Forward\" to finish loading files and move to the next step of the QIF import process. "
 msgstr ""
 "ここでさらに読み込みたいファイルがある場合には、\"別のファイルの読み込み\"\n"
 "をクリックしてください。複数の QIF ファイルに科目を保存した場合も同様です。\n"
@@ -14625,15 +13732,11 @@
 #: ../src/import-export/qif-import/qif.glade.h:17
 #, fuzzy
 msgid ""
-"GnuCash can import financial data from QIF (Quicken Interchange Format) "
-"files written by Quicken/QuickBooks, MS Money, Moneydance, and many other "
-"programs. \n"
+"GnuCash can import financial data from QIF (Quicken Interchange Format) files written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs. \n"
 "\n"
-"The import process has several steps. Your GnuCash accounts will not be "
-"changed until you click \"Apply\" at the end of the process. \n"
+"The import process has several steps. Your GnuCash accounts will not be changed until you click \"Apply\" at the end of the process. \n"
 "\n"
-"Click \"Forward\" to start loading your QIF data, or \"Cancel\" to abort the "
-"process. "
+"Click \"Forward\" to start loading your QIF data, or \"Cancel\" to abort the process. "
 msgstr ""
 "Gnucash は財務データを Qicken/Quickbooks、MS Money、\n"
 "Moneydance およびその他のプログラムで書き込まれた QIF\n"
@@ -14648,24 +13751,16 @@
 #: ../src/import-export/qif-import/qif.glade.h:22
 #, fuzzy
 msgid ""
-"GnuCash uses separate Income and Expense accounts rather than categories to "
-"classify your transactions. Each of the categories in your QIF file will be "
-"converted to a GnuCash account. \n"
+"GnuCash uses separate Income and Expense accounts rather than categories to classify your transactions. Each of the categories in your QIF file will be converted to a GnuCash account. \n"
 "\n"
-"On the next page, you will have an opportunity to look at the suggested "
-"matches between QIF categories and GnuCash accounts. You may change matches "
-"that you do not like by double-clicking on the line containing the category "
-"name.\n"
+"On the next page, you will have an opportunity to look at the suggested matches between QIF categories and GnuCash accounts. You may change matches that you do not like by double-clicking on the line containing the category name.\n"
 "\n"
-"If you change your mind later, you can reorganize the account structure "
-"safely within GnuCash."
+"If you change your mind later, you can reorganize the account structure safely within GnuCash."
 msgstr ""
 "Gnucash では取引を分類するためにカテゴリではなく、所得と費用の別々の\n"
-"勘定科目を使用します。QIFファイルにあるそれぞれのカテゴリは Gnucash の勘定科"
-"目に変換されます。\n"
+"勘定科目を使用します。QIFファイルにあるそれぞれのカテゴリは Gnucash の勘定科目に変換されます。\n"
 "\n"
-"次のページで、QIF のカテゴリと Gnucash の勘定科目の適合に関して推奨のものを表"
-"示します。\n"
+"次のページで、QIF のカテゴリと Gnucash の勘定科目の適合に関して推奨のものを表示します。\n"
 "カテゴリ名を含む行をクリックすることにより、適合を変更することができます。\n"
 "\n"
 "後で気が変わっても、勘定科目の再構成をすることができます。"
@@ -14673,21 +13768,11 @@
 #: ../src/import-export/qif-import/qif.glade.h:27
 #, fuzzy
 msgid ""
-"If you are importing a QIF file downloaded from a bank or other financial "
-"institution, some of the information in the QIF file may duplicate "
-"information already in your GnuCash accounts.  GnuCash will try to detect "
-"duplicates of existing transactions.  \n"
+"If you are importing a QIF file downloaded from a bank or other financial institution, some of the information in the QIF file may duplicate information already in your GnuCash accounts.  GnuCash will try to detect duplicates of existing transactions.  \n"
 "\n"
-"On the next page, you will be asked to confirm that an existing transaction "
-"matches an imported transaction.  Imported transactions are shown on the "
-"left side of the page, and possible  matches for the selected left-hand "
-"transaction are shown  to the right.  There may be several old transactions "
-"that could match an imported transaction; you will be able to select the "
-"correct one by double-clicking in the \"Dup?\" column of the correct "
-"transaction.\n"
+"On the next page, you will be asked to confirm that an existing transaction matches an imported transaction.  Imported transactions are shown on the left side of the page, and possible  matches for the selected left-hand transaction are shown  to the right.  There may be several old transactions that could match an imported transaction; you will be able to select the correct one by double-clicking in the \"Dup?\" column of the correct transaction.\n"
 "\n"
-"You can control the rules used by GnuCash to find duplicate transactions in "
-"the \"QIF Import\" section of the GnuCash Preferences dialog.\n"
+"You can control the rules used by GnuCash to find duplicate transactions in the \"QIF Import\" section of the GnuCash Preferences dialog.\n"
 "\n"
 "Click \"Forward\" to find duplicate transactions. "
 msgstr ""
@@ -14697,8 +13782,7 @@
 "\n"
 "つづくページにおいて、すでに存在する取引がインポートされる取引と一致するか\n"
 "の確認を求められます。インポートされる取引が左側に表示され、一致する\n"
-"可能性のある取引が右側に表示されます。複数の古い取引が一致する可能性がありま"
-"す。\n"
+"可能性のある取引が右側に表示されます。複数の古い取引が一致する可能性があります。\n"
 "\"複製?\"という列をクリックして、正しいものを選択することができます。\n"
 "\n"
 "初期設定ダイアログの\"QIFインポート\"セクションで、複製取引を検索する\n"
@@ -14717,33 +13801,21 @@
 #: ../src/import-export/qif-import/qif.glade.h:36
 #, fuzzy
 msgid ""
-"In the next pages, you will be asked to provide information about stocks, "
-"mutual funds, and other tradable commodities that appear in the QIF file(s) "
-"you are importing. GnuCash requires more information about tradable "
-"commodities than the QIF format can represent. \n"
+"In the next pages, you will be asked to provide information about stocks, mutual funds, and other tradable commodities that appear in the QIF file(s) you are importing. GnuCash requires more information about tradable commodities than the QIF format can represent. \n"
 "\n"
-"Each stock, mutual fund, or other commodity must have a type, which is the "
-"exchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds, "
-"etc), a full name, and an abbreviation.\n"
+"Each stock, mutual fund, or other commodity must have a type, which is the exchange or listing that it is found on (NASDAQ, NYSE, US Mutual Funds, etc), a full name, and an abbreviation.\n"
 "\n"
-"Check to see if there is an existing Type that is appropriate; if not, you "
-"can enter a new Type name by hand in the box. Make sure that the "
-"abbreviation you enter matches the ticker symbol used for the commodity on "
-"the exchange or listing for its type."
+"Check to see if there is an existing Type that is appropriate; if not, you can enter a new Type name by hand in the box. Make sure that the abbreviation you enter matches the ticker symbol used for the commodity on the exchange or listing for its type."
 msgstr ""
 "次のページでは、現在読み込み中の QIF ファイルに現れる株式、投資信託、その他\n"
 "売買可能な金融商品に関する情報の入力をする必要があります。\n"
 "Gnucash は売買可能な金融商品に対して、QIF より多くの情報を必要とします。\n"
 "\n"
-"どの株式、投資信託、その他金融商品も一つのタイプに所属しなければなりませ"
-"ん。\n"
-"タイプとは、NASDAQ, NYSE, US Mutual Funds などの取引所、商品の正式名、略号"
-"ã‚’\n"
+"どの株式、投資信託、その他金融商品も一つのタイプに所属しなければなりません。\n"
+"タイプとは、NASDAQ, NYSE, US Mutual Funds などの取引所、商品の正式名、略号を\n"
 "意味しています。\n"
 "\n"
-"既存のタイプが適当なものであるかどうかをチェックしてください。適当でない場"
-"合、新しいタイプを入力してください。また、略号については、取引所で使用されて"
-"いる\n"
+"既存のタイプが適当なものであるかどうかをチェックしてください。適当でない場合、新しいタイプを入力してください。また、略号については、取引所で使用されている\n"
 "ティッカーと同じであることを確認してください。"
 
 #: ../src/import-export/qif-import/qif.glade.h:41
@@ -14769,32 +13841,18 @@
 #: ../src/import-export/qif-import/qif.glade.h:47
 #, fuzzy
 msgid ""
-"On the next page, the accounts in your QIF files and any stocks or mutual "
-"funds you own will be matched with GnuCash accounts. If a GnuCash account "
-"already exists with the same name, or a similar name and compatible type, "
-"that account will be used as a match; otherwise, GnuCash will create a new "
-"account with the same name and type as the QIF account. If you do not like "
-"the suggested GnuCash account, double-click to change it.\n"
+"On the next page, the accounts in your QIF files and any stocks or mutual funds you own will be matched with GnuCash accounts. If a GnuCash account already exists with the same name, or a similar name and compatible type, that account will be used as a match; otherwise, GnuCash will create a new account with the same name and type as the QIF account. If you do not like the suggested GnuCash account, double-click to change it.\n"
 "\n"
-"Note that GnuCash will be creating many accounts that did not exist on your "
-"other personal finance program, including a separate account for each stock "
-"you own, separate accounts for the brokerage commissions, special \"Equity\" "
-"accounts (subaccounts of Retained Earnings, by default) which are the source "
-"of your opening balances, etc. All of these accounts will appear on the next "
-"page so you can change them if you want to, but it is safe to leave them "
-"alone.\n"
+"Note that GnuCash will be creating many accounts that did not exist on your other personal finance program, including a separate account for each stock you own, separate accounts for the brokerage commissions, special \"Equity\" accounts (subaccounts of Retained Earnings, by default) which are the source of your opening balances, etc. All of these accounts will appear on the next page so you can change them if you want to, but it is safe to leave them alone.\n"
 msgstr ""
 "次のページで QIF ファイルにある勘定科目と所有するすべての株式/投資信託が\n"
 "Gnucash の勘定科目に当てはめられます。すでに Gnucash に同じ名前、あるいは\n"
-"類似する名前を持ち、かつ互換性のあるタイプの勘定の場合、その勘定科目は該当勘"
-"定科目として使用されます。そうでない場合には、Gnucash は新たに勘定科目を\n"
-"QIF ファイルと同じ名前、同じタイプで作成します。それらの科目が気に入らない場"
-"合には、クリックして変更してください。\n"
+"類似する名前を持ち、かつ互換性のあるタイプの勘定の場合、その勘定科目は該当勘定科目として使用されます。そうでない場合には、Gnucash は新たに勘定科目を\n"
+"QIF ファイルと同じ名前、同じタイプで作成します。それらの科目が気に入らない場合には、クリックして変更してください。\n"
 "\n"
 "Gnucash はあなたが使用していた個人資産管理プログラムに存在しなかった科目を\n"
 "作成することに注意してください。これには、所有するそれぞれの株式に対する\n"
-"別々の科目、仲介手数料に対する個別の科目、開始時の残高著調整の元となる特別な"
-"持ち分科目(デフォルトでは繰越利益の子勘定科目)などが含まれます。\n"
+"別々の科目、仲介手数料に対する個別の科目、開始時の残高調整の元となる特別な持ち分科目(デフォルトでは繰越利益の子勘定科目)などが含まれます。\n"
 "これらの科目はすべて次ページに表示されます。\n"
 "必要ならば修正することもできますが、通常そのままでも問題ありあせん。\n"
 
@@ -14805,15 +13863,11 @@
 #: ../src/import-export/qif-import/qif.glade.h:52
 #, fuzzy
 msgid ""
-"Please select a file to load. When you click \"Forward\", the file will be "
-"loaded and analyzed. You may need to answer some questions about the account"
-"(s) in the file.\n"
+"Please select a file to load. When you click \"Forward\", the file will be loaded and analyzed. You may need to answer some questions about the account(s) in the file.\n"
 "\n"
-"You will have the opportunity to load as many files as you wish, so don't  "
-"worry if your data is in multiple files. \n"
+"You will have the opportunity to load as many files as you wish, so don't  worry if your data is in multiple files. \n"
 msgstr ""
-"読み込むファイルを選択してください。\"次\"をクリックすると読み込みと解析を開"
-"始します。\n"
+"読み込むファイルを選択してください。\"次\"をクリックすると読み込みと解析を開始します。\n"
 "ファイル内の勘定科目に関するいくつかの質問に答える必要が\n"
 "あるかもしれません。\n"
 "\n"
@@ -14831,18 +13885,11 @@
 #: ../src/import-export/qif-import/qif.glade.h:59
 #, fuzzy
 msgid ""
-"QIF files downloaded from banks and other financial institutions may not "
-"have information about Accounts and Categories which would allow them to be "
-"correctly assigned to GnuCash accounts.  \n"
+"QIF files downloaded from banks and other financial institutions may not have information about Accounts and Categories which would allow them to be correctly assigned to GnuCash accounts.  \n"
 "\n"
-"In the following page, you will see the text that appears in the Payee and "
-"Memo fields of transactions with no QIF Account or Category. By default "
-"these transactions are assigned to the 'Unspecified' account in GnuCash. If "
-"you select a different account, it will be remembered for future QIF files. "
+"In the following page, you will see the text that appears in the Payee and Memo fields of transactions with no QIF Account or Category. By default these transactions are assigned to the 'Unspecified' account in GnuCash. If you select a different account, it will be remembered for future QIF files. "
 msgstr ""
-"銀行やその他の財務関連企業からダウンロードしたQIFファイルにはGnuCashの勘定科"
-"目に正しく割り当ててもよいアカウントおよびカテゴリについての情報が入っていま"
-"せん。\n"
+"銀行やその他の財務関連企業からダウンロードしたQIFファイルにはGnuCashの勘定科目に正しく割り当ててもよいアカウントおよびカテゴリについての情報が入っていません。\n"
 "\n"
 "つづくページにおいて、QIFのアカウントあるいはカテゴリを持たない取引の支払先\n"
 "および摘要のテキスト部分が表示されます。デフォルトではこういった取引は\n"
@@ -14874,12 +13921,9 @@
 #: ../src/import-export/qif-import/qif.glade.h:75
 #, fuzzy
 msgid ""
-"The QIF file that you just loaded appears to contain transactions for just "
-"one account, but the file does not specify a name for that account.  \n"
+"The QIF file that you just loaded appears to contain transactions for just one account, but the file does not specify a name for that account.  \n"
 "\n"
-"Please enter a name for the account. If the file was exported from another "
-"accounting program, you should use the same account name that was used  in "
-"that program.\n"
+"Please enter a name for the account. If the file was exported from another accounting program, you should use the same account name that was used  in that program.\n"
 msgstr ""
 "読み込もうとしている QIF ファイルにはたった一つの勘定科目に対する取引しか \n"
 "存在しないように見受けられます。しかし、その科目の名前を指定していません。\n"
@@ -14891,9 +13935,7 @@
 #: ../src/import-export/qif-import/qif.glade.h:79
 #, fuzzy
 msgid ""
-"The QIF importer cannot currently handle multi-currency QIF files. All the "
-"accounts in the QIF file(s) you are importing must be denominated in the "
-"same currency. This limitation should be removed soon.\n"
+"The QIF importer cannot currently handle multi-currency QIF files. All the accounts in the QIF file(s) you are importing must be denominated in the same currency. This limitation should be removed soon.\n"
 "\n"
 "Select the currency to use for transactions imported from your QIF files:\n"
 msgstr ""
@@ -14919,24 +13961,30 @@
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:66 ../intl-scm/guile-strings.c:5762
-#: ../intl-scm/guile-strings.c:5784 ../intl-scm/guile-strings.c:5806
+#: ../src/import-export/qif/qif-defaults.c:66
+#: ../intl-scm/guile-strings.c:5762
+#: ../intl-scm/guile-strings.c:5784
+#: ../intl-scm/guile-strings.c:5806
 msgid "Margin Interest"
 msgstr "マージン利率"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:74 ../intl-scm/guile-strings.c:5760
-#: ../intl-scm/guile-strings.c:5782 ../intl-scm/guile-strings.c:5804
+#: ../src/import-export/qif/qif-defaults.c:74
+#: ../intl-scm/guile-strings.c:5760
+#: ../intl-scm/guile-strings.c:5782
+#: ../intl-scm/guile-strings.c:5804
 msgid "Commissions"
 msgstr "コミッション"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:90 ../intl-scm/guile-strings.c:5750
-#: ../intl-scm/guile-strings.c:5772 ../intl-scm/guile-strings.c:5794
+#: ../src/import-export/qif/qif-defaults.c:90
+#: ../intl-scm/guile-strings.c:5750
+#: ../intl-scm/guile-strings.c:5772
+#: ../intl-scm/guile-strings.c:5794
 msgid "Cap. gain (long)"
 msgstr "キャピタルゲイン(長期)"
 
@@ -14944,7 +13992,8 @@
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:100
-#: ../intl-scm/guile-strings.c:5752 ../intl-scm/guile-strings.c:5774
+#: ../intl-scm/guile-strings.c:5752
+#: ../intl-scm/guile-strings.c:5774
 #: ../intl-scm/guile-strings.c:5796
 msgid "Cap. gain (mid)"
 msgstr "キャピタルゲイン(中期)"
@@ -14953,7 +14002,8 @@
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:110
-#: ../intl-scm/guile-strings.c:5754 ../intl-scm/guile-strings.c:5776
+#: ../intl-scm/guile-strings.c:5754
+#: ../intl-scm/guile-strings.c:5776
 #: ../intl-scm/guile-strings.c:5798
 msgid "Cap. gain (short)"
 msgstr "キャピタルゲイン(短期)"
@@ -14962,7 +14012,8 @@
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:120
-#: ../intl-scm/guile-strings.c:5744 ../intl-scm/guile-strings.c:5766
+#: ../intl-scm/guile-strings.c:5744
+#: ../intl-scm/guile-strings.c:5766
 #: ../intl-scm/guile-strings.c:5788
 msgid "Dividends"
 msgstr ""
@@ -14971,7 +14022,8 @@
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:140
-#: ../intl-scm/guile-strings.c:5748 ../intl-scm/guile-strings.c:5770
+#: ../intl-scm/guile-strings.c:5748
+#: ../intl-scm/guile-strings.c:5770
 #: ../intl-scm/guile-strings.c:5792
 msgid "Cap Return"
 msgstr ""
@@ -15065,17 +14117,11 @@
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:6
-msgid ""
-"Enable the SKIP action in the transaction matcher. If enabled, a transaction "
-"whose best match's score is in the yellow zone (above the Auto-ADD threshold "
-"but below the Auto-CLEAR threshold) will be skipped by default."
+msgid "Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:7
-msgid ""
-"Enables bayesian matching when matching imported transaction against "
-"existing transactions. Otherwise a less sophisticated rule-based matching "
-"mechanism will be used."
+msgid "Enables bayesian matching when matching imported transaction against existing transactions. Otherwise a less sophisticated rule-based matching mechanism will be used."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:8
@@ -15087,38 +14133,19 @@
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:12
-msgid ""
-"This field specifies the extra fee that is taken into account when matching "
-"imported transactions. In some places commercial ATMs (not belonging to a "
-"financial institution) are installed in places like convienience store. "
-"These ATM add its fee directly to the amount instead of showing up as a "
-"separate transaction or in your monthly banking fees. For example, you "
-"withdraw 100$, and you are charged 101,50$ plus Interac fees. If you "
-"manually entered that 100$, the amounts won't match. You should set this to "
-"whatever is the maximum such fee in your area (in units of your local "
-"currency), so the transaction will be recognised as a match."
+msgid "This field specifies the extra fee that is taken into account when matching imported transactions. In some places commercial ATMs (not belonging to a financial institution) are installed in places like convienience store. These ATM add its fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw 100$, and you are charged 101,50$ plus Interac fees. If you manually entered that 100$, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:13
-msgid ""
-"This field specifies the minimum matching score a potential matching "
-"transaction must have to be displayed in the match list."
+msgid "This field specifies the minimum matching score a potential matching transaction must have to be displayed in the match list."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:14
-msgid ""
-"This field specifies the threshold above which a matching transaction will "
-"be cleared by default. A transaction whose best match's score is in the "
-"green zone (above or equal to this Clear threshold) will be cleared by "
-"default."
+msgid "This field specifies the threshold above which a matching transaction will be cleared by default. A transaction whose best match's score is in the green zone (above or equal to this Clear threshold) will be cleared by default."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:15
-msgid ""
-"This field specifies the threshold below which a matching transaction will "
-"be added automatically. A transaction whose best match's score is in the red "
-"zone (above the display minimum score but below or equal to the Add match "
-"score) will be added to the GnuCash file by default."
+msgid "This field specifies the threshold below which a matching transaction will be added automatically. A transaction whose best match's score is in the red zone (above the display minimum score but below or equal to the Add match score) will be added to the GnuCash file by default."
 msgstr ""
 
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:16
@@ -15126,9 +14153,7 @@
 msgstr ""
 
 #: ../src/register/ledger-core/split-register.c:159
-msgid ""
-"This transaction is already being edited in another register. Please finish "
-"editing it there first."
+msgid "This transaction is already being edited in another register. Please finish editing it there first."
 msgstr ""
 
 #: ../src/register/ledger-core/split-register.c:408
@@ -15138,27 +14163,21 @@
 
 #: ../src/register/ledger-core/split-register.c:410
 #, fuzzy
-msgid ""
-"The current transaction has been changed. Would you like to record the "
-"changes before duplicating the transaction, or cancel the duplication?"
+msgid "The current transaction has been changed. Would you like to record the changes before duplicating the transaction, or cancel the duplication?"
 msgstr ""
 "この取引の情報は変更されました。\n"
 "記録しますか?"
 
 #: ../src/register/ledger-core/split-register.c:717
 #, fuzzy
-msgid ""
-"You are about to overwrite an existing split. Are you sure you want to do "
-"that?"
+msgid "You are about to overwrite an existing split. Are you sure you want to do that?"
 msgstr ""
 "既存の諸口を上書きしようとしています。\n"
 "本当に上書きしますか?"
 
 #: ../src/register/ledger-core/split-register.c:746
 #, fuzzy
-msgid ""
-"You are about to overwrite an existing transaction. Are you sure you want to "
-"do that?"
+msgid "You are about to overwrite an existing transaction. Are you sure you want to do that?"
 msgstr ""
 "既存の取引を上書きしようとしています。\n"
 "本当に上書きしますか?"
@@ -15169,9 +14188,7 @@
 
 #: ../src/register/ledger-core/split-register.c:1703
 #, fuzzy
-msgid ""
-"The values entered for this transaction are inconsistent. Which value would "
-"you like to have recalculated?"
+msgid "The values entered for this transaction are inconsistent. Which value would you like to have recalculated?"
 msgstr ""
 "この取引に入力された値は計算が合いません。\n"
 "どの値を再計算すればよろしいですか?"
@@ -15251,11 +14268,11 @@
 
 #: ../src/register/ledger-core/split-register.c:2000
 msgid "Wire"
-msgstr ""
+msgstr "電信"
 
 #: ../src/register/ledger-core/split-register.c:2002
 msgid "Direct Debit"
-msgstr "直接引き落とし"
+msgstr "直接引落し"
 
 #. src/app-utils/prefs.scm
 #: ../src/register/ledger-core/split-register.c:2006
@@ -15266,7 +14283,8 @@
 #: ../src/register/ledger-core/split-register.c:2046
 #: ../src/register/ledger-core/split-register.c:2051
 #: ../src/register/ledger-core/split-register.c:2076
-#: ../intl-scm/guile-strings.c:118 ../intl-scm/guile-strings.c:120
+#: ../intl-scm/guile-strings.c:118
+#: ../intl-scm/guile-strings.c:120
 #: ../intl-scm/guile-strings.c:122
 msgid "Buy"
 msgstr "購入"
@@ -15280,7 +14298,8 @@
 #: ../src/register/ledger-core/split-register.c:2047
 #: ../src/register/ledger-core/split-register.c:2052
 #: ../src/register/ledger-core/split-register.c:2077
-#: ../intl-scm/guile-strings.c:146 ../intl-scm/guile-strings.c:148
+#: ../intl-scm/guile-strings.c:146
+#: ../intl-scm/guile-strings.c:148
 #: ../intl-scm/guile-strings.c:150
 msgid "Sell"
 msgstr "売却"
@@ -15289,7 +14308,7 @@
 #: ../src/register/ledger-core/split-register.c:2018
 #: ../src/register/ledger-core/split-register.c:2061
 msgid "Fee"
-msgstr "費用"
+msgstr ""
 
 #. src/app-utils/prefs.scm
 #: ../src/register/ledger-core/split-register.c:2043
@@ -15351,8 +14370,7 @@
 msgstr "貸借/残高:"
 
 #: ../src/register/ledger-core/split-register-control.c:1042
-msgid ""
-"You need to expand the transaction in order to modify its exchange rates."
+msgid "You need to expand the transaction in order to modify its exchange rates."
 msgstr ""
 
 #: ../src/register/ledger-core/split-register-control.c:1165
@@ -15361,10 +14379,7 @@
 msgstr "この取引をキャンセルする"
 
 #: ../src/register/ledger-core/split-register-control.c:1167
-msgid ""
-"The current transaction has been changed.  Would you like to record the "
-"changes before moving to a new transaction, discard the changes, or return "
-"to the changed transaction?"
+msgid "The current transaction has been changed.  Would you like to record the changes before moving to a new transaction, discard the changes, or return to the changed transaction?"
 msgstr ""
 
 #: ../src/register/ledger-core/split-register-control.c:1180
@@ -15383,9 +14398,7 @@
 
 #: ../src/register/ledger-core/split-register-control.c:1465
 #, fuzzy
-msgid ""
-"You are about to mark a reconciled split as unreconciled.  Doing so might "
-"make future reconciliation difficult!  Continue with this change?"
+msgid "You are about to mark a reconciled split as unreconciled.  Doing so might make future reconciliation difficult!  Continue with this change?"
 msgstr ""
 "この取引に未照合のマークをつけますか?\n"
 "この場合、後ほど照合するのが難しくなります。"
@@ -15435,12 +14448,12 @@
 
 #: ../src/register/ledger-core/split-register-layout.c:685
 msgid "sample:No Particular Reason"
-msgstr ""
+msgstr "例:特に理由なし"
 
 #: ../src/register/ledger-core/split-register-layout.c:693
 #: ../src/register/ledger-core/split-register-layout.c:701
 msgid "sample:(x + 0.33 * y + (x+y) )"
-msgstr ""
+msgstr "例:(x + 0.33 * y + (x+y) )"
 
 #: ../src/register/ledger-core/split-register-model.c:120
 msgid "Ref"
@@ -15477,9 +14490,8 @@
 #. This seems to be the one that initially gets used, the InactiveDateCell
 #. is set to, and subsequently displayed.
 #: ../src/register/ledger-core/split-register-model.c:805
-#, fuzzy
 msgid "Scheduled"
-msgstr "スケジュール"
+msgstr "予定済"
 
 #: ../src/register/ledger-core/split-register-model.c:836
 #, fuzzy
@@ -15491,14 +14503,12 @@
 msgstr "取引番号を入力する(小切手の番号など)"
 
 #: ../src/register/ledger-core/split-register-model.c:874
-#, fuzzy
 msgid "Enter the name of the Customer"
-msgstr "勘定科目の名前を入力する"
+msgstr "顧客の名前を入力する"
 
 #: ../src/register/ledger-core/split-register-model.c:877
-#, fuzzy
 msgid "Enter the name of the Vendor"
-msgstr "勘定科目の名前を入力する"
+msgstr "納入業者の名前を入力する"
 
 #: ../src/register/ledger-core/split-register-model.c:880
 msgid "Enter a description of the transaction"
@@ -15506,7 +14516,7 @@
 
 #: ../src/register/ledger-core/split-register-model.c:910
 msgid "Enter notes for the transaction"
-msgstr "取引の注釈を入力する"
+msgstr "取引の備考を入力する"
 
 #: ../src/register/ledger-core/split-register-model.c:940
 #, fuzzy
@@ -15515,7 +14525,7 @@
 
 #: ../src/register/ledger-core/split-register-model.c:1032
 msgid "Enter the type of transaction, or choose one from the list"
-msgstr "取引の型を入力するか、リストから選択する"
+msgstr "取引のタイプを入力するか、リストから選択する"
 
 #: ../src/register/ledger-core/split-register-model.c:1060
 msgid "Enter a description of the split"
@@ -15536,25 +14546,23 @@
 msgstr "移動元の勘定科目を入力するか、リストから選択する"
 
 #: ../src/register/ledger-core/split-register-model.c:1298
-msgid ""
-"This transaction has multiple splits; press the Split button to see them all"
-msgstr ""
-"この取引には複数の諸口があります。全部見たい時には諸口ボタンを押してください"
+msgid "This transaction has multiple splits; press the Split button to see them all"
+msgstr "この取引には複数の諸口があります。全部見たい時には諸口ボタンを押してください"
 
 #: ../src/register/ledger-core/split-register-model.c:1301
-msgid ""
-"This transaction is a stock split; press the Split button to see details"
-msgstr ""
-"この取引には複数の諸口があります。全部見たい時には諸口ボタンを押してください"
+msgid "This transaction is a stock split; press the Split button to see details"
+msgstr "この取引には複数の諸口があります。全部見たい時には諸口ボタンを押してください"
 
 #: ../src/register/ledger-core/split-register-model.c:1618
 #, c-format
 msgid ""
-"Cannot modify or delete this transaction. This transaction is marked read-"
-"only because:\n"
+"Cannot modify or delete this transaction. This transaction is marked read-only because:\n"
 "\n"
 "'%s'"
 msgstr ""
+"この取引は変更・削除できません。この取引は次の理由によりリードオンリーにマークされています:\n"
+"\n"
+"'%s'"
 
 #: ../src/register/ledger-core/split-register-model.c:1670
 #, fuzzy
@@ -15563,9 +14571,7 @@
 
 #: ../src/register/ledger-core/split-register-model.c:1672
 #, fuzzy
-msgid ""
-"You are about to change a reconciled split.  Doing so might make future "
-"reconciliation difficult!  Continue with this change?"
+msgid "You are about to change a reconciled split.  Doing so might make future reconciliation difficult!  Continue with this change?"
 msgstr ""
 "この取引に未照合のマークをつけますか?\n"
 "この場合、後ほど照合するのが難しくなります。"
@@ -15586,9 +14592,8 @@
 msgstr "取引の注釈を入力する"
 
 #: ../src/register/register-gnome/gnucash-item-list.c:476
-#, fuzzy
 msgid "List"
-msgstr "リスト"
+msgstr "一覧"
 
 #: ../src/report/report-gnome/dialog-column-view.c:332
 msgid "Contents"
@@ -15599,8 +14604,10 @@
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/report/report-gnome/dialog-column-view.c:361
-#: ../intl-scm/guile-strings.c:1434 ../intl-scm/guile-strings.c:1444
-#: ../intl-scm/guile-strings.c:6210 ../intl-scm/guile-strings.c:6734
+#: ../intl-scm/guile-strings.c:1434
+#: ../intl-scm/guile-strings.c:1444
+#: ../intl-scm/guile-strings.c:6210
+#: ../intl-scm/guile-strings.c:6734
 msgid "Report"
 msgstr "帳票"
 
@@ -15639,10 +14646,7 @@
 msgstr "帳票を追加(_R)"
 
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:969
-msgid ""
-"Add the current report to the `Custom' menu for later use. The report will "
-"be saved in the file ~/.gnucash/saved-reports-2.0. It will be accessible as "
-"menu entry in the report menu at the next startup of GnuCash."
+msgid "Add the current report to the `Custom' menu for later use. The report will be saved in the file ~/.gnucash/saved-reports-2.0. It will be accessible as menu entry in the report menu at the next startup of GnuCash."
 msgstr ""
 
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:974
@@ -15659,7 +14663,8 @@
 
 #. src/report/report-system/html-utilities.scm
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:978
-#: ../intl-scm/guile-strings.c:1414 ../intl-scm/guile-strings.c:1420
+#: ../intl-scm/guile-strings.c:1414
+#: ../intl-scm/guile-strings.c:1420
 #: ../intl-scm/guile-strings.c:1426
 msgid "Edit report options"
 msgstr "帳票のオプションを編集する"
@@ -15742,25 +14747,22 @@
 "%s"
 
 #: ../src/report/report-gnome/gnc-plugin-page-report.c:1466
-#, fuzzy
 msgid "There are no options for this report."
-msgstr "この帳票の説明的な名前を入力する"
+msgstr "この帳票にはオプションはありません。"
 
 #. * @}
 #. * @}
 #: ../src/report/report-gnome/report.glade.h:1
-#, fuzzy
 msgid "<< _Remove"
-msgstr "<< 削除"
+msgstr "<< 削除(_R)"
 
 #: ../src/report/report-gnome/report.glade.h:2
-#, fuzzy
 msgid "<b>A_vailable reports</b>"
-msgstr "利用可能なレポート"
+msgstr "<b>利用可能な帳票(_V)</b>"
 
 #: ../src/report/report-gnome/report.glade.h:3
 msgid "<b>Available style sheets</b>"
-msgstr ""
+msgstr "<b>利用可能なスタイルシート</b>"
 
 #: ../src/report/report-gnome/report.glade.h:4
 msgid "<b>New style sheet info</b>"
@@ -15772,7 +14774,7 @@
 
 #: ../src/report/report-gnome/report.glade.h:6
 msgid "<b>_Selected Reports</b>"
-msgstr "<b>選択された帳票</b>"
+msgstr "<b>選択された帳票(_S)</b>"
 
 #: ../src/report/report-gnome/report.glade.h:7
 msgid "A_dd  >>"
@@ -15829,14 +14831,16 @@
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
 #: ../src/report/report-gnome/window-report.c:202
-#: ../intl-scm/guile-strings.c:1462 ../intl-scm/guile-strings.c:1484
+#: ../intl-scm/guile-strings.c:1462
+#: ../intl-scm/guile-strings.c:1484
 msgid "Report error"
 msgstr "帳票エラー"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
 #: ../src/report/report-gnome/window-report.c:203
-#: ../intl-scm/guile-strings.c:1464 ../intl-scm/guile-strings.c:1486
+#: ../intl-scm/guile-strings.c:1464
+#: ../intl-scm/guile-strings.c:1486
 #, fuzzy
 msgid "An error occurred while running the report."
 msgstr "QIF形式ファイルの解析中にエラーが発生しました"
@@ -15866,9 +14870,7 @@
 msgstr ""
 
 #: ../lib/libqof/backend/file/qsf-backend.c:108
-msgid ""
-"QOF can compress QSF XML files using gzip. Note that compression is not used "
-"when outputting to STDOUT."
+msgid "QOF can compress QSF XML files using gzip. Note that compression is not used when outputting to STDOUT."
 msgstr ""
 
 #: ../lib/libqof/backend/file/qsf-backend.c:116
@@ -15876,9 +14878,7 @@
 msgstr ""
 
 #: ../lib/libqof/backend/file/qsf-backend.c:117
-msgid ""
-"QOF can convert objects within QSF XML files using a map of the changes "
-"required."
+msgid "QOF can convert objects within QSF XML files using a map of the changes required."
 msgstr ""
 
 #: ../lib/libqof/backend/file/qsf-backend.c:125
@@ -15886,9 +14886,7 @@
 msgstr ""
 
 #: ../lib/libqof/backend/file/qsf-backend.c:126
-msgid ""
-"QSF defaults to UTF-8. Other encodings are supported by passing the string "
-"encoding in this option."
+msgid "QSF defaults to UTF-8. Other encodings are supported by passing the string encoding in this option."
 msgstr ""
 
 #. src/scm/main-window.scm
@@ -15899,33 +14897,37 @@
 
 #. src/scm/command-line.scm
 #: ../intl-scm/guile-strings.c:4
-msgid ""
-"A list of directories (strings) indicating where to look for html and parsed-"
-"html files. Each element must be a string representing a directory or a "
-"symbol where 'default expands to the default path, and 'current expands to "
-"the current value of the path."
+msgid "A list of directories (strings) indicating where to look for html and parsed-html files. Each element must be a string representing a directory or a symbol where 'default expands to the default path, and 'current expands to the current value of the path."
 msgstr ""
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:8 ../intl-scm/guile-strings.c:10
-#: ../intl-scm/guile-strings.c:52 ../intl-scm/guile-strings.c:54
+#: ../intl-scm/guile-strings.c:8
+#: ../intl-scm/guile-strings.c:10
+#: ../intl-scm/guile-strings.c:52
+#: ../intl-scm/guile-strings.c:54
 msgid "No commodities marked for quote retrieval."
 msgstr ""
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:12 ../intl-scm/guile-strings.c:14
-#: ../intl-scm/guile-strings.c:30 ../intl-scm/guile-strings.c:32
-#: ../intl-scm/guile-strings.c:56 ../intl-scm/guile-strings.c:58
-#: ../intl-scm/guile-strings.c:74 ../intl-scm/guile-strings.c:76
+#: ../intl-scm/guile-strings.c:12
+#: ../intl-scm/guile-strings.c:14
+#: ../intl-scm/guile-strings.c:30
+#: ../intl-scm/guile-strings.c:32
+#: ../intl-scm/guile-strings.c:56
+#: ../intl-scm/guile-strings.c:58
+#: ../intl-scm/guile-strings.c:74
+#: ../intl-scm/guile-strings.c:76
 msgid "Unable to get quotes or diagnose the problem."
 msgstr "見積を取得できないか、あるいは問題を診断できません"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:16 ../intl-scm/guile-strings.c:19
-#: ../intl-scm/guile-strings.c:60 ../intl-scm/guile-strings.c:63
+#: ../intl-scm/guile-strings.c:16
+#: ../intl-scm/guile-strings.c:19
+#: ../intl-scm/guile-strings.c:60
+#: ../intl-scm/guile-strings.c:63
 #, fuzzy
 msgid ""
 "You are missing some needed Perl libraries.\n"
@@ -15936,62 +14938,76 @@
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:22 ../intl-scm/guile-strings.c:24
-#: ../intl-scm/guile-strings.c:66 ../intl-scm/guile-strings.c:68
+#: ../intl-scm/guile-strings.c:22
+#: ../intl-scm/guile-strings.c:24
+#: ../intl-scm/guile-strings.c:66
+#: ../intl-scm/guile-strings.c:68
 #, fuzzy
 msgid "There was a system error while retrieving the price quotes."
 msgstr "ファイル保存中にエラー"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:26 ../intl-scm/guile-strings.c:28
-#: ../intl-scm/guile-strings.c:70 ../intl-scm/guile-strings.c:72
+#: ../intl-scm/guile-strings.c:26
+#: ../intl-scm/guile-strings.c:28
+#: ../intl-scm/guile-strings.c:70
+#: ../intl-scm/guile-strings.c:72
 #, fuzzy
 msgid "There was an unknown error while retrieving the price quotes."
 msgstr "ファイル保存中にエラー"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:34 ../intl-scm/guile-strings.c:38
-#: ../intl-scm/guile-strings.c:40 ../intl-scm/guile-strings.c:78
-#: ../intl-scm/guile-strings.c:82 ../intl-scm/guile-strings.c:84
+#: ../intl-scm/guile-strings.c:34
+#: ../intl-scm/guile-strings.c:38
+#: ../intl-scm/guile-strings.c:40
+#: ../intl-scm/guile-strings.c:78
+#: ../intl-scm/guile-strings.c:82
+#: ../intl-scm/guile-strings.c:84
 msgid "Unable to retrieve quotes for these items:"
 msgstr "これらの項目に対する見積を検索できません:"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:36 ../intl-scm/guile-strings.c:80
+#: ../intl-scm/guile-strings.c:36
+#: ../intl-scm/guile-strings.c:80
 msgid "Continue using only the good quotes?"
 msgstr "良い見積だけを使いつづけますか?"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:42 ../intl-scm/guile-strings.c:86
+#: ../intl-scm/guile-strings.c:42
+#: ../intl-scm/guile-strings.c:86
 msgid "Continuing with good quotes."
 msgstr "良い見積とともに続ける"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:44 ../intl-scm/guile-strings.c:48
-#: ../intl-scm/guile-strings.c:88 ../intl-scm/guile-strings.c:92
+#: ../intl-scm/guile-strings.c:44
+#: ../intl-scm/guile-strings.c:48
+#: ../intl-scm/guile-strings.c:88
+#: ../intl-scm/guile-strings.c:92
 msgid "Unable to create prices for these items:"
 msgstr "これらの項目に対して価格を作成することができません:"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:46 ../intl-scm/guile-strings.c:90
+#: ../intl-scm/guile-strings.c:46
+#: ../intl-scm/guile-strings.c:90
 msgid "Add remaining good quotes?"
 msgstr "残りの良い見積を追加しますか?"
 
 #. src/scm/price-quotes.scm
 #. src/scm/gnucash/price-quotes.scm
-#: ../intl-scm/guile-strings.c:50 ../intl-scm/guile-strings.c:94
+#: ../intl-scm/guile-strings.c:50
+#: ../intl-scm/guile-strings.c:94
 msgid "Adding remaining good quotes."
 msgstr "残りの良い見積を追加します"
 
 #. src/tax/us/de_DE.scm
 #. src/tax/us/gnucash/tax/de_DE.scm
-#: ../intl-scm/guile-strings.c:98 ../intl-scm/guile-strings.c:102
+#: ../intl-scm/guile-strings.c:98
+#: ../intl-scm/guile-strings.c:102
 #, fuzzy
 msgid "Tax Number"
 msgstr "番号"
@@ -16013,13 +15029,15 @@
 msgstr "受取"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:114 ../intl-scm/guile-strings.c:144
+#: ../intl-scm/guile-strings.c:114
+#: ../intl-scm/guile-strings.c:144
 #: ../intl-scm/guile-strings.c:160
 msgid "Increase"
 msgstr "増加"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:116 ../intl-scm/guile-strings.c:132
+#: ../intl-scm/guile-strings.c:116
+#: ../intl-scm/guile-strings.c:132
 #: ../intl-scm/guile-strings.c:142
 msgid "Decrease"
 msgstr "減少"
@@ -16157,27 +15175,32 @@
 msgstr "本日の日付"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:222 ../intl-scm/guile-strings.c:224
+#: ../intl-scm/guile-strings.c:222
+#: ../intl-scm/guile-strings.c:224
 msgid "One Month Ago"
 msgstr "一ヶ月前"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:226 ../intl-scm/guile-strings.c:228
+#: ../intl-scm/guile-strings.c:226
+#: ../intl-scm/guile-strings.c:228
 msgid "One Week Ago"
 msgstr "一週間前"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:230 ../intl-scm/guile-strings.c:232
+#: ../intl-scm/guile-strings.c:230
+#: ../intl-scm/guile-strings.c:232
 msgid "Three Months Ago"
 msgstr "三ヶ月前"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:234 ../intl-scm/guile-strings.c:236
+#: ../intl-scm/guile-strings.c:234
+#: ../intl-scm/guile-strings.c:236
 msgid "Six Months Ago"
 msgstr "半年前"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:238 ../intl-scm/guile-strings.c:240
+#: ../intl-scm/guile-strings.c:238
+#: ../intl-scm/guile-strings.c:240
 msgid "One Year Ago"
 msgstr "一年前"
 
@@ -16185,10 +15208,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:244 ../intl-scm/guile-strings.c:370
-#: ../intl-scm/guile-strings.c:456 ../intl-scm/guile-strings.c:582
-#: ../intl-scm/guile-strings.c:668 ../intl-scm/guile-strings.c:794
-#: ../intl-scm/guile-strings.c:880 ../intl-scm/guile-strings.c:1006
+#: ../intl-scm/guile-strings.c:244
+#: ../intl-scm/guile-strings.c:370
+#: ../intl-scm/guile-strings.c:456
+#: ../intl-scm/guile-strings.c:582
+#: ../intl-scm/guile-strings.c:668
+#: ../intl-scm/guile-strings.c:794
+#: ../intl-scm/guile-strings.c:880
+#: ../intl-scm/guile-strings.c:1006
 msgid "Preparer"
 msgstr ""
 
@@ -16196,8 +15223,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:246 ../intl-scm/guile-strings.c:458
-#: ../intl-scm/guile-strings.c:670 ../intl-scm/guile-strings.c:882
+#: ../intl-scm/guile-strings.c:246
+#: ../intl-scm/guile-strings.c:458
+#: ../intl-scm/guile-strings.c:670
+#: ../intl-scm/guile-strings.c:882
 msgid "Name of person preparing the report"
 msgstr ""
 
@@ -16205,10 +15234,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:250 ../intl-scm/guile-strings.c:374
-#: ../intl-scm/guile-strings.c:462 ../intl-scm/guile-strings.c:586
-#: ../intl-scm/guile-strings.c:674 ../intl-scm/guile-strings.c:798
-#: ../intl-scm/guile-strings.c:886 ../intl-scm/guile-strings.c:1010
+#: ../intl-scm/guile-strings.c:250
+#: ../intl-scm/guile-strings.c:374
+#: ../intl-scm/guile-strings.c:462
+#: ../intl-scm/guile-strings.c:586
+#: ../intl-scm/guile-strings.c:674
+#: ../intl-scm/guile-strings.c:798
+#: ../intl-scm/guile-strings.c:886
+#: ../intl-scm/guile-strings.c:1010
 msgid "Prepared for"
 msgstr ""
 
@@ -16216,8 +15249,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:252 ../intl-scm/guile-strings.c:464
-#: ../intl-scm/guile-strings.c:676 ../intl-scm/guile-strings.c:888
+#: ../intl-scm/guile-strings.c:252
+#: ../intl-scm/guile-strings.c:464
+#: ../intl-scm/guile-strings.c:676
+#: ../intl-scm/guile-strings.c:888
 msgid "Name of organization or company prepared for"
 msgstr ""
 
@@ -16225,10 +15260,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:256 ../intl-scm/guile-strings.c:378
-#: ../intl-scm/guile-strings.c:468 ../intl-scm/guile-strings.c:590
-#: ../intl-scm/guile-strings.c:680 ../intl-scm/guile-strings.c:802
-#: ../intl-scm/guile-strings.c:892 ../intl-scm/guile-strings.c:1014
+#: ../intl-scm/guile-strings.c:256
+#: ../intl-scm/guile-strings.c:378
+#: ../intl-scm/guile-strings.c:468
+#: ../intl-scm/guile-strings.c:590
+#: ../intl-scm/guile-strings.c:680
+#: ../intl-scm/guile-strings.c:802
+#: ../intl-scm/guile-strings.c:892
+#: ../intl-scm/guile-strings.c:1014
 msgid "Show preparer info"
 msgstr ""
 
@@ -16236,8 +15275,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:258 ../intl-scm/guile-strings.c:470
-#: ../intl-scm/guile-strings.c:682 ../intl-scm/guile-strings.c:894
+#: ../intl-scm/guile-strings.c:258
+#: ../intl-scm/guile-strings.c:470
+#: ../intl-scm/guile-strings.c:682
+#: ../intl-scm/guile-strings.c:894
 msgid "Name of organization or company"
 msgstr ""
 
@@ -16247,11 +15288,16 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:262 ../intl-scm/guile-strings.c:382
-#: ../intl-scm/guile-strings.c:474 ../intl-scm/guile-strings.c:594
-#: ../intl-scm/guile-strings.c:686 ../intl-scm/guile-strings.c:806
-#: ../intl-scm/guile-strings.c:898 ../intl-scm/guile-strings.c:1018
-#: ../intl-scm/guile-strings.c:1104 ../intl-scm/guile-strings.c:1144
+#: ../intl-scm/guile-strings.c:262
+#: ../intl-scm/guile-strings.c:382
+#: ../intl-scm/guile-strings.c:474
+#: ../intl-scm/guile-strings.c:594
+#: ../intl-scm/guile-strings.c:686
+#: ../intl-scm/guile-strings.c:806
+#: ../intl-scm/guile-strings.c:898
+#: ../intl-scm/guile-strings.c:1018
+#: ../intl-scm/guile-strings.c:1104
+#: ../intl-scm/guile-strings.c:1144
 msgid "Enable Links"
 msgstr ""
 
@@ -16259,8 +15305,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:264 ../intl-scm/guile-strings.c:476
-#: ../intl-scm/guile-strings.c:688 ../intl-scm/guile-strings.c:900
+#: ../intl-scm/guile-strings.c:264
+#: ../intl-scm/guile-strings.c:476
+#: ../intl-scm/guile-strings.c:688
+#: ../intl-scm/guile-strings.c:900
 msgid "Enable hyperlinks in reports"
 msgstr ""
 
@@ -16268,22 +15316,38 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:266 ../intl-scm/guile-strings.c:272
-#: ../intl-scm/guile-strings.c:278 ../intl-scm/guile-strings.c:296
-#: ../intl-scm/guile-strings.c:416 ../intl-scm/guile-strings.c:420
-#: ../intl-scm/guile-strings.c:424 ../intl-scm/guile-strings.c:428
-#: ../intl-scm/guile-strings.c:478 ../intl-scm/guile-strings.c:484
-#: ../intl-scm/guile-strings.c:490 ../intl-scm/guile-strings.c:508
-#: ../intl-scm/guile-strings.c:628 ../intl-scm/guile-strings.c:632
-#: ../intl-scm/guile-strings.c:636 ../intl-scm/guile-strings.c:640
-#: ../intl-scm/guile-strings.c:690 ../intl-scm/guile-strings.c:696
-#: ../intl-scm/guile-strings.c:702 ../intl-scm/guile-strings.c:720
-#: ../intl-scm/guile-strings.c:840 ../intl-scm/guile-strings.c:844
-#: ../intl-scm/guile-strings.c:848 ../intl-scm/guile-strings.c:852
-#: ../intl-scm/guile-strings.c:902 ../intl-scm/guile-strings.c:908
-#: ../intl-scm/guile-strings.c:914 ../intl-scm/guile-strings.c:932
-#: ../intl-scm/guile-strings.c:1052 ../intl-scm/guile-strings.c:1056
-#: ../intl-scm/guile-strings.c:1060 ../intl-scm/guile-strings.c:1064
+#: ../intl-scm/guile-strings.c:266
+#: ../intl-scm/guile-strings.c:272
+#: ../intl-scm/guile-strings.c:278
+#: ../intl-scm/guile-strings.c:296
+#: ../intl-scm/guile-strings.c:416
+#: ../intl-scm/guile-strings.c:420
+#: ../intl-scm/guile-strings.c:424
+#: ../intl-scm/guile-strings.c:428
+#: ../intl-scm/guile-strings.c:478
+#: ../intl-scm/guile-strings.c:484
+#: ../intl-scm/guile-strings.c:490
+#: ../intl-scm/guile-strings.c:508
+#: ../intl-scm/guile-strings.c:628
+#: ../intl-scm/guile-strings.c:632
+#: ../intl-scm/guile-strings.c:636
+#: ../intl-scm/guile-strings.c:640
+#: ../intl-scm/guile-strings.c:690
+#: ../intl-scm/guile-strings.c:696
+#: ../intl-scm/guile-strings.c:702
+#: ../intl-scm/guile-strings.c:720
+#: ../intl-scm/guile-strings.c:840
+#: ../intl-scm/guile-strings.c:844
+#: ../intl-scm/guile-strings.c:848
+#: ../intl-scm/guile-strings.c:852
+#: ../intl-scm/guile-strings.c:902
+#: ../intl-scm/guile-strings.c:908
+#: ../intl-scm/guile-strings.c:914
+#: ../intl-scm/guile-strings.c:932
+#: ../intl-scm/guile-strings.c:1052
+#: ../intl-scm/guile-strings.c:1056
+#: ../intl-scm/guile-strings.c:1060
+#: ../intl-scm/guile-strings.c:1064
 msgid "Images"
 msgstr "画像"
 
@@ -16291,10 +15355,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:268 ../intl-scm/guile-strings.c:418
-#: ../intl-scm/guile-strings.c:480 ../intl-scm/guile-strings.c:630
-#: ../intl-scm/guile-strings.c:692 ../intl-scm/guile-strings.c:842
-#: ../intl-scm/guile-strings.c:904 ../intl-scm/guile-strings.c:1054
+#: ../intl-scm/guile-strings.c:268
+#: ../intl-scm/guile-strings.c:418
+#: ../intl-scm/guile-strings.c:480
+#: ../intl-scm/guile-strings.c:630
+#: ../intl-scm/guile-strings.c:692
+#: ../intl-scm/guile-strings.c:842
+#: ../intl-scm/guile-strings.c:904
+#: ../intl-scm/guile-strings.c:1054
 msgid "Background Tile"
 msgstr "背景図形"
 
@@ -16304,9 +15372,12 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:270 ../intl-scm/guile-strings.c:482
-#: ../intl-scm/guile-strings.c:694 ../intl-scm/guile-strings.c:906
-#: ../intl-scm/guile-strings.c:1100 ../intl-scm/guile-strings.c:1140
+#: ../intl-scm/guile-strings.c:270
+#: ../intl-scm/guile-strings.c:482
+#: ../intl-scm/guile-strings.c:694
+#: ../intl-scm/guile-strings.c:906
+#: ../intl-scm/guile-strings.c:1100
+#: ../intl-scm/guile-strings.c:1140
 msgid "Background tile for reports."
 msgstr "帳票の背景の図形"
 
@@ -16314,10 +15385,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:274 ../intl-scm/guile-strings.c:422
-#: ../intl-scm/guile-strings.c:486 ../intl-scm/guile-strings.c:634
-#: ../intl-scm/guile-strings.c:698 ../intl-scm/guile-strings.c:846
-#: ../intl-scm/guile-strings.c:910 ../intl-scm/guile-strings.c:1058
+#: ../intl-scm/guile-strings.c:274
+#: ../intl-scm/guile-strings.c:422
+#: ../intl-scm/guile-strings.c:486
+#: ../intl-scm/guile-strings.c:634
+#: ../intl-scm/guile-strings.c:698
+#: ../intl-scm/guile-strings.c:846
+#: ../intl-scm/guile-strings.c:910
+#: ../intl-scm/guile-strings.c:1058
 msgid "Heading Banner"
 msgstr "ヘッダとなるバナー"
 
@@ -16325,10 +15400,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:276 ../intl-scm/guile-strings.c:282
-#: ../intl-scm/guile-strings.c:488 ../intl-scm/guile-strings.c:494
-#: ../intl-scm/guile-strings.c:700 ../intl-scm/guile-strings.c:706
-#: ../intl-scm/guile-strings.c:912 ../intl-scm/guile-strings.c:918
+#: ../intl-scm/guile-strings.c:276
+#: ../intl-scm/guile-strings.c:282
+#: ../intl-scm/guile-strings.c:488
+#: ../intl-scm/guile-strings.c:494
+#: ../intl-scm/guile-strings.c:700
+#: ../intl-scm/guile-strings.c:706
+#: ../intl-scm/guile-strings.c:912
+#: ../intl-scm/guile-strings.c:918
 msgid "Banner for top of report."
 msgstr "帳票の一番上のバナー"
 
@@ -16336,10 +15415,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:280 ../intl-scm/guile-strings.c:430
-#: ../intl-scm/guile-strings.c:492 ../intl-scm/guile-strings.c:642
-#: ../intl-scm/guile-strings.c:704 ../intl-scm/guile-strings.c:854
-#: ../intl-scm/guile-strings.c:916 ../intl-scm/guile-strings.c:1066
+#: ../intl-scm/guile-strings.c:280
+#: ../intl-scm/guile-strings.c:430
+#: ../intl-scm/guile-strings.c:492
+#: ../intl-scm/guile-strings.c:642
+#: ../intl-scm/guile-strings.c:704
+#: ../intl-scm/guile-strings.c:854
+#: ../intl-scm/guile-strings.c:916
+#: ../intl-scm/guile-strings.c:1066
 #, fuzzy
 msgid "Heading Alignment"
 msgstr "ヘッダとなるバナー"
@@ -16348,8 +15431,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:284 ../intl-scm/guile-strings.c:496
-#: ../intl-scm/guile-strings.c:708 ../intl-scm/guile-strings.c:920
+#: ../intl-scm/guile-strings.c:284
+#: ../intl-scm/guile-strings.c:496
+#: ../intl-scm/guile-strings.c:708
+#: ../intl-scm/guile-strings.c:920
 msgid "Left"
 msgstr "å·¦"
 
@@ -16357,8 +15442,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:286 ../intl-scm/guile-strings.c:498
-#: ../intl-scm/guile-strings.c:710 ../intl-scm/guile-strings.c:922
+#: ../intl-scm/guile-strings.c:286
+#: ../intl-scm/guile-strings.c:498
+#: ../intl-scm/guile-strings.c:710
+#: ../intl-scm/guile-strings.c:922
 msgid "Align the banner to the left"
 msgstr ""
 
@@ -16366,8 +15453,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:288 ../intl-scm/guile-strings.c:500
-#: ../intl-scm/guile-strings.c:712 ../intl-scm/guile-strings.c:924
+#: ../intl-scm/guile-strings.c:288
+#: ../intl-scm/guile-strings.c:500
+#: ../intl-scm/guile-strings.c:712
+#: ../intl-scm/guile-strings.c:924
 msgid "Center"
 msgstr "中央"
 
@@ -16375,8 +15464,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:290 ../intl-scm/guile-strings.c:502
-#: ../intl-scm/guile-strings.c:714 ../intl-scm/guile-strings.c:926
+#: ../intl-scm/guile-strings.c:290
+#: ../intl-scm/guile-strings.c:502
+#: ../intl-scm/guile-strings.c:714
+#: ../intl-scm/guile-strings.c:926
 msgid "Align the banner in the center"
 msgstr ""
 
@@ -16384,8 +15475,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:292 ../intl-scm/guile-strings.c:504
-#: ../intl-scm/guile-strings.c:716 ../intl-scm/guile-strings.c:928
+#: ../intl-scm/guile-strings.c:292
+#: ../intl-scm/guile-strings.c:504
+#: ../intl-scm/guile-strings.c:716
+#: ../intl-scm/guile-strings.c:928
 msgid "Right"
 msgstr "右"
 
@@ -16393,8 +15486,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:294 ../intl-scm/guile-strings.c:506
-#: ../intl-scm/guile-strings.c:718 ../intl-scm/guile-strings.c:930
+#: ../intl-scm/guile-strings.c:294
+#: ../intl-scm/guile-strings.c:506
+#: ../intl-scm/guile-strings.c:718
+#: ../intl-scm/guile-strings.c:930
 msgid "Align the banner to the right"
 msgstr ""
 
@@ -16402,10 +15497,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:298 ../intl-scm/guile-strings.c:426
-#: ../intl-scm/guile-strings.c:510 ../intl-scm/guile-strings.c:638
-#: ../intl-scm/guile-strings.c:722 ../intl-scm/guile-strings.c:850
-#: ../intl-scm/guile-strings.c:934 ../intl-scm/guile-strings.c:1062
+#: ../intl-scm/guile-strings.c:298
+#: ../intl-scm/guile-strings.c:426
+#: ../intl-scm/guile-strings.c:510
+#: ../intl-scm/guile-strings.c:638
+#: ../intl-scm/guile-strings.c:722
+#: ../intl-scm/guile-strings.c:850
+#: ../intl-scm/guile-strings.c:934
+#: ../intl-scm/guile-strings.c:1062
 msgid "Logo"
 msgstr "ロゴ"
 
@@ -16413,8 +15512,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:300 ../intl-scm/guile-strings.c:512
-#: ../intl-scm/guile-strings.c:724 ../intl-scm/guile-strings.c:936
+#: ../intl-scm/guile-strings.c:300
+#: ../intl-scm/guile-strings.c:512
+#: ../intl-scm/guile-strings.c:724
+#: ../intl-scm/guile-strings.c:936
 msgid "Company logo image."
 msgstr "会社のロゴ画像"
 
@@ -16424,43 +15525,80 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:302 ../intl-scm/guile-strings.c:308
-#: ../intl-scm/guile-strings.c:314 ../intl-scm/guile-strings.c:320
-#: ../intl-scm/guile-strings.c:326 ../intl-scm/guile-strings.c:332
-#: ../intl-scm/guile-strings.c:338 ../intl-scm/guile-strings.c:344
-#: ../intl-scm/guile-strings.c:384 ../intl-scm/guile-strings.c:388
-#: ../intl-scm/guile-strings.c:392 ../intl-scm/guile-strings.c:396
-#: ../intl-scm/guile-strings.c:400 ../intl-scm/guile-strings.c:404
-#: ../intl-scm/guile-strings.c:408 ../intl-scm/guile-strings.c:412
-#: ../intl-scm/guile-strings.c:514 ../intl-scm/guile-strings.c:520
-#: ../intl-scm/guile-strings.c:526 ../intl-scm/guile-strings.c:532
-#: ../intl-scm/guile-strings.c:538 ../intl-scm/guile-strings.c:544
-#: ../intl-scm/guile-strings.c:550 ../intl-scm/guile-strings.c:556
-#: ../intl-scm/guile-strings.c:596 ../intl-scm/guile-strings.c:600
-#: ../intl-scm/guile-strings.c:604 ../intl-scm/guile-strings.c:608
-#: ../intl-scm/guile-strings.c:612 ../intl-scm/guile-strings.c:616
-#: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:624
-#: ../intl-scm/guile-strings.c:726 ../intl-scm/guile-strings.c:732
-#: ../intl-scm/guile-strings.c:738 ../intl-scm/guile-strings.c:744
-#: ../intl-scm/guile-strings.c:750 ../intl-scm/guile-strings.c:756
-#: ../intl-scm/guile-strings.c:762 ../intl-scm/guile-strings.c:768
-#: ../intl-scm/guile-strings.c:808 ../intl-scm/guile-strings.c:812
-#: ../intl-scm/guile-strings.c:816 ../intl-scm/guile-strings.c:820
-#: ../intl-scm/guile-strings.c:824 ../intl-scm/guile-strings.c:828
-#: ../intl-scm/guile-strings.c:832 ../intl-scm/guile-strings.c:836
-#: ../intl-scm/guile-strings.c:938 ../intl-scm/guile-strings.c:944
-#: ../intl-scm/guile-strings.c:950 ../intl-scm/guile-strings.c:956
-#: ../intl-scm/guile-strings.c:962 ../intl-scm/guile-strings.c:968
-#: ../intl-scm/guile-strings.c:974 ../intl-scm/guile-strings.c:980
-#: ../intl-scm/guile-strings.c:1020 ../intl-scm/guile-strings.c:1024
-#: ../intl-scm/guile-strings.c:1028 ../intl-scm/guile-strings.c:1032
-#: ../intl-scm/guile-strings.c:1036 ../intl-scm/guile-strings.c:1040
-#: ../intl-scm/guile-strings.c:1044 ../intl-scm/guile-strings.c:1048
-#: ../intl-scm/guile-strings.c:3858 ../intl-scm/guile-strings.c:3862
-#: ../intl-scm/guile-strings.c:3866 ../intl-scm/guile-strings.c:3870
-#: ../intl-scm/guile-strings.c:3874 ../intl-scm/guile-strings.c:5012
-#: ../intl-scm/guile-strings.c:5016 ../intl-scm/guile-strings.c:5020
-#: ../intl-scm/guile-strings.c:5024 ../intl-scm/guile-strings.c:5028
+#: ../intl-scm/guile-strings.c:302
+#: ../intl-scm/guile-strings.c:308
+#: ../intl-scm/guile-strings.c:314
+#: ../intl-scm/guile-strings.c:320
+#: ../intl-scm/guile-strings.c:326
+#: ../intl-scm/guile-strings.c:332
+#: ../intl-scm/guile-strings.c:338
+#: ../intl-scm/guile-strings.c:344
+#: ../intl-scm/guile-strings.c:384
+#: ../intl-scm/guile-strings.c:388
+#: ../intl-scm/guile-strings.c:392
+#: ../intl-scm/guile-strings.c:396
+#: ../intl-scm/guile-strings.c:400
+#: ../intl-scm/guile-strings.c:404
+#: ../intl-scm/guile-strings.c:408
+#: ../intl-scm/guile-strings.c:412
+#: ../intl-scm/guile-strings.c:514
+#: ../intl-scm/guile-strings.c:520
+#: ../intl-scm/guile-strings.c:526
+#: ../intl-scm/guile-strings.c:532
+#: ../intl-scm/guile-strings.c:538
+#: ../intl-scm/guile-strings.c:544
+#: ../intl-scm/guile-strings.c:550
+#: ../intl-scm/guile-strings.c:556
+#: ../intl-scm/guile-strings.c:596
+#: ../intl-scm/guile-strings.c:600
+#: ../intl-scm/guile-strings.c:604
+#: ../intl-scm/guile-strings.c:608
+#: ../intl-scm/guile-strings.c:612
+#: ../intl-scm/guile-strings.c:616
+#: ../intl-scm/guile-strings.c:620
+#: ../intl-scm/guile-strings.c:624
+#: ../intl-scm/guile-strings.c:726
+#: ../intl-scm/guile-strings.c:732
+#: ../intl-scm/guile-strings.c:738
+#: ../intl-scm/guile-strings.c:744
+#: ../intl-scm/guile-strings.c:750
+#: ../intl-scm/guile-strings.c:756
+#: ../intl-scm/guile-strings.c:762
+#: ../intl-scm/guile-strings.c:768
+#: ../intl-scm/guile-strings.c:808
+#: ../intl-scm/guile-strings.c:812
+#: ../intl-scm/guile-strings.c:816
+#: ../intl-scm/guile-strings.c:820
+#: ../intl-scm/guile-strings.c:824
+#: ../intl-scm/guile-strings.c:828
+#: ../intl-scm/guile-strings.c:832
+#: ../intl-scm/guile-strings.c:836
+#: ../intl-scm/guile-strings.c:938
+#: ../intl-scm/guile-strings.c:944
+#: ../intl-scm/guile-strings.c:950
+#: ../intl-scm/guile-strings.c:956
+#: ../intl-scm/guile-strings.c:962
+#: ../intl-scm/guile-strings.c:968
+#: ../intl-scm/guile-strings.c:974
+#: ../intl-scm/guile-strings.c:980
+#: ../intl-scm/guile-strings.c:1020
+#: ../intl-scm/guile-strings.c:1024
+#: ../intl-scm/guile-strings.c:1028
+#: ../intl-scm/guile-strings.c:1032
+#: ../intl-scm/guile-strings.c:1036
+#: ../intl-scm/guile-strings.c:1040
+#: ../intl-scm/guile-strings.c:1044
+#: ../intl-scm/guile-strings.c:1048
+#: ../intl-scm/guile-strings.c:3858
+#: ../intl-scm/guile-strings.c:3862
+#: ../intl-scm/guile-strings.c:3866
+#: ../intl-scm/guile-strings.c:3870
+#: ../intl-scm/guile-strings.c:3874
+#: ../intl-scm/guile-strings.c:5012
+#: ../intl-scm/guile-strings.c:5016
+#: ../intl-scm/guile-strings.c:5020
+#: ../intl-scm/guile-strings.c:5024
+#: ../intl-scm/guile-strings.c:5028
 msgid "Colors"
 msgstr "色"
 
@@ -16472,12 +15610,18 @@
 #. src/report/stylesheets/stylesheet-plain.scm
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:304 ../intl-scm/guile-strings.c:386
-#: ../intl-scm/guile-strings.c:516 ../intl-scm/guile-strings.c:598
-#: ../intl-scm/guile-strings.c:728 ../intl-scm/guile-strings.c:810
-#: ../intl-scm/guile-strings.c:940 ../intl-scm/guile-strings.c:1022
-#: ../intl-scm/guile-strings.c:1092 ../intl-scm/guile-strings.c:1132
-#: ../intl-scm/guile-strings.c:1564 ../intl-scm/guile-strings.c:1730
+#: ../intl-scm/guile-strings.c:304
+#: ../intl-scm/guile-strings.c:386
+#: ../intl-scm/guile-strings.c:516
+#: ../intl-scm/guile-strings.c:598
+#: ../intl-scm/guile-strings.c:728
+#: ../intl-scm/guile-strings.c:810
+#: ../intl-scm/guile-strings.c:940
+#: ../intl-scm/guile-strings.c:1022
+#: ../intl-scm/guile-strings.c:1092
+#: ../intl-scm/guile-strings.c:1132
+#: ../intl-scm/guile-strings.c:1564
+#: ../intl-scm/guile-strings.c:1730
 msgid "Background Color"
 msgstr "背景色"
 
@@ -16485,8 +15629,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:306 ../intl-scm/guile-strings.c:518
-#: ../intl-scm/guile-strings.c:730 ../intl-scm/guile-strings.c:942
+#: ../intl-scm/guile-strings.c:306
+#: ../intl-scm/guile-strings.c:518
+#: ../intl-scm/guile-strings.c:730
+#: ../intl-scm/guile-strings.c:942
 msgid "General background color for report."
 msgstr "一般的な帳票の背景色"
 
@@ -16496,11 +15642,16 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:310 ../intl-scm/guile-strings.c:390
-#: ../intl-scm/guile-strings.c:522 ../intl-scm/guile-strings.c:602
-#: ../intl-scm/guile-strings.c:734 ../intl-scm/guile-strings.c:814
-#: ../intl-scm/guile-strings.c:946 ../intl-scm/guile-strings.c:1026
-#: ../intl-scm/guile-strings.c:1570 ../intl-scm/guile-strings.c:1736
+#: ../intl-scm/guile-strings.c:310
+#: ../intl-scm/guile-strings.c:390
+#: ../intl-scm/guile-strings.c:522
+#: ../intl-scm/guile-strings.c:602
+#: ../intl-scm/guile-strings.c:734
+#: ../intl-scm/guile-strings.c:814
+#: ../intl-scm/guile-strings.c:946
+#: ../intl-scm/guile-strings.c:1026
+#: ../intl-scm/guile-strings.c:1570
+#: ../intl-scm/guile-strings.c:1736
 msgid "Text Color"
 msgstr "文字色"
 
@@ -16508,8 +15659,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:312 ../intl-scm/guile-strings.c:524
-#: ../intl-scm/guile-strings.c:736 ../intl-scm/guile-strings.c:948
+#: ../intl-scm/guile-strings.c:312
+#: ../intl-scm/guile-strings.c:524
+#: ../intl-scm/guile-strings.c:736
+#: ../intl-scm/guile-strings.c:948
 msgid "Normal body text color."
 msgstr "通常の文字色"
 
@@ -16517,10 +15670,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:316 ../intl-scm/guile-strings.c:394
-#: ../intl-scm/guile-strings.c:528 ../intl-scm/guile-strings.c:606
-#: ../intl-scm/guile-strings.c:740 ../intl-scm/guile-strings.c:818
-#: ../intl-scm/guile-strings.c:952 ../intl-scm/guile-strings.c:1030
+#: ../intl-scm/guile-strings.c:316
+#: ../intl-scm/guile-strings.c:394
+#: ../intl-scm/guile-strings.c:528
+#: ../intl-scm/guile-strings.c:606
+#: ../intl-scm/guile-strings.c:740
+#: ../intl-scm/guile-strings.c:818
+#: ../intl-scm/guile-strings.c:952
+#: ../intl-scm/guile-strings.c:1030
 msgid "Link Color"
 msgstr "リンクの色"
 
@@ -16528,8 +15685,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:318 ../intl-scm/guile-strings.c:530
-#: ../intl-scm/guile-strings.c:742 ../intl-scm/guile-strings.c:954
+#: ../intl-scm/guile-strings.c:318
+#: ../intl-scm/guile-strings.c:530
+#: ../intl-scm/guile-strings.c:742
+#: ../intl-scm/guile-strings.c:954
 msgid "Link text color."
 msgstr "リンク文字色"
 
@@ -16537,10 +15696,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:322 ../intl-scm/guile-strings.c:398
-#: ../intl-scm/guile-strings.c:534 ../intl-scm/guile-strings.c:610
-#: ../intl-scm/guile-strings.c:746 ../intl-scm/guile-strings.c:822
-#: ../intl-scm/guile-strings.c:958 ../intl-scm/guile-strings.c:1034
+#: ../intl-scm/guile-strings.c:322
+#: ../intl-scm/guile-strings.c:398
+#: ../intl-scm/guile-strings.c:534
+#: ../intl-scm/guile-strings.c:610
+#: ../intl-scm/guile-strings.c:746
+#: ../intl-scm/guile-strings.c:822
+#: ../intl-scm/guile-strings.c:958
+#: ../intl-scm/guile-strings.c:1034
 msgid "Table Cell Color"
 msgstr "表のセル色"
 
@@ -16548,8 +15711,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:324 ../intl-scm/guile-strings.c:536
-#: ../intl-scm/guile-strings.c:748 ../intl-scm/guile-strings.c:960
+#: ../intl-scm/guile-strings.c:324
+#: ../intl-scm/guile-strings.c:536
+#: ../intl-scm/guile-strings.c:748
+#: ../intl-scm/guile-strings.c:960
 msgid "Default background for table cells."
 msgstr "セルのデフォルトの背景色"
 
@@ -16557,10 +15722,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:328 ../intl-scm/guile-strings.c:402
-#: ../intl-scm/guile-strings.c:540 ../intl-scm/guile-strings.c:614
-#: ../intl-scm/guile-strings.c:752 ../intl-scm/guile-strings.c:826
-#: ../intl-scm/guile-strings.c:964 ../intl-scm/guile-strings.c:1038
+#: ../intl-scm/guile-strings.c:328
+#: ../intl-scm/guile-strings.c:402
+#: ../intl-scm/guile-strings.c:540
+#: ../intl-scm/guile-strings.c:614
+#: ../intl-scm/guile-strings.c:752
+#: ../intl-scm/guile-strings.c:826
+#: ../intl-scm/guile-strings.c:964
+#: ../intl-scm/guile-strings.c:1038
 msgid "Alternate Table Cell Color"
 msgstr "代わりのセルの色"
 
@@ -16568,8 +15737,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:330 ../intl-scm/guile-strings.c:542
-#: ../intl-scm/guile-strings.c:754 ../intl-scm/guile-strings.c:966
+#: ../intl-scm/guile-strings.c:330
+#: ../intl-scm/guile-strings.c:542
+#: ../intl-scm/guile-strings.c:754
+#: ../intl-scm/guile-strings.c:966
 msgid "Default alternate background for table cells."
 msgstr "セルの背景に使われるデフォルトの代替背景色"
 
@@ -16577,10 +15748,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:334 ../intl-scm/guile-strings.c:406
-#: ../intl-scm/guile-strings.c:546 ../intl-scm/guile-strings.c:618
-#: ../intl-scm/guile-strings.c:758 ../intl-scm/guile-strings.c:830
-#: ../intl-scm/guile-strings.c:970 ../intl-scm/guile-strings.c:1042
+#: ../intl-scm/guile-strings.c:334
+#: ../intl-scm/guile-strings.c:406
+#: ../intl-scm/guile-strings.c:546
+#: ../intl-scm/guile-strings.c:618
+#: ../intl-scm/guile-strings.c:758
+#: ../intl-scm/guile-strings.c:830
+#: ../intl-scm/guile-strings.c:970
+#: ../intl-scm/guile-strings.c:1042
 msgid "Subheading/Subtotal Cell Color"
 msgstr ""
 
@@ -16588,8 +15763,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:336 ../intl-scm/guile-strings.c:548
-#: ../intl-scm/guile-strings.c:760 ../intl-scm/guile-strings.c:972
+#: ../intl-scm/guile-strings.c:336
+#: ../intl-scm/guile-strings.c:548
+#: ../intl-scm/guile-strings.c:760
+#: ../intl-scm/guile-strings.c:972
 msgid "Default color for subtotal rows."
 msgstr "小計行のデフォルト色"
 
@@ -16597,10 +15774,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:340 ../intl-scm/guile-strings.c:410
-#: ../intl-scm/guile-strings.c:552 ../intl-scm/guile-strings.c:622
-#: ../intl-scm/guile-strings.c:764 ../intl-scm/guile-strings.c:834
-#: ../intl-scm/guile-strings.c:976 ../intl-scm/guile-strings.c:1046
+#: ../intl-scm/guile-strings.c:340
+#: ../intl-scm/guile-strings.c:410
+#: ../intl-scm/guile-strings.c:552
+#: ../intl-scm/guile-strings.c:622
+#: ../intl-scm/guile-strings.c:764
+#: ../intl-scm/guile-strings.c:834
+#: ../intl-scm/guile-strings.c:976
+#: ../intl-scm/guile-strings.c:1046
 msgid "Sub-subheading/total Cell Color"
 msgstr ""
 
@@ -16608,8 +15789,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:342 ../intl-scm/guile-strings.c:554
-#: ../intl-scm/guile-strings.c:766 ../intl-scm/guile-strings.c:978
+#: ../intl-scm/guile-strings.c:342
+#: ../intl-scm/guile-strings.c:554
+#: ../intl-scm/guile-strings.c:766
+#: ../intl-scm/guile-strings.c:978
 msgid "Color for subsubtotals"
 msgstr "小計の色"
 
@@ -16617,10 +15800,14 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:346 ../intl-scm/guile-strings.c:414
-#: ../intl-scm/guile-strings.c:558 ../intl-scm/guile-strings.c:626
-#: ../intl-scm/guile-strings.c:770 ../intl-scm/guile-strings.c:838
-#: ../intl-scm/guile-strings.c:982 ../intl-scm/guile-strings.c:1050
+#: ../intl-scm/guile-strings.c:346
+#: ../intl-scm/guile-strings.c:414
+#: ../intl-scm/guile-strings.c:558
+#: ../intl-scm/guile-strings.c:626
+#: ../intl-scm/guile-strings.c:770
+#: ../intl-scm/guile-strings.c:838
+#: ../intl-scm/guile-strings.c:982
+#: ../intl-scm/guile-strings.c:1050
 msgid "Grand Total Cell Color"
 msgstr "総合計のセルの色"
 
@@ -16628,8 +15815,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:348 ../intl-scm/guile-strings.c:560
-#: ../intl-scm/guile-strings.c:772 ../intl-scm/guile-strings.c:984
+#: ../intl-scm/guile-strings.c:348
+#: ../intl-scm/guile-strings.c:560
+#: ../intl-scm/guile-strings.c:772
+#: ../intl-scm/guile-strings.c:984
 msgid "Color for grand totals"
 msgstr "総合計の色"
 
@@ -16639,21 +15828,36 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:350 ../intl-scm/guile-strings.c:356
-#: ../intl-scm/guile-strings.c:362 ../intl-scm/guile-strings.c:432
-#: ../intl-scm/guile-strings.c:436 ../intl-scm/guile-strings.c:440
-#: ../intl-scm/guile-strings.c:562 ../intl-scm/guile-strings.c:568
-#: ../intl-scm/guile-strings.c:574 ../intl-scm/guile-strings.c:644
-#: ../intl-scm/guile-strings.c:648 ../intl-scm/guile-strings.c:652
-#: ../intl-scm/guile-strings.c:774 ../intl-scm/guile-strings.c:780
-#: ../intl-scm/guile-strings.c:786 ../intl-scm/guile-strings.c:856
-#: ../intl-scm/guile-strings.c:860 ../intl-scm/guile-strings.c:864
-#: ../intl-scm/guile-strings.c:986 ../intl-scm/guile-strings.c:992
-#: ../intl-scm/guile-strings.c:998 ../intl-scm/guile-strings.c:1068
-#: ../intl-scm/guile-strings.c:1072 ../intl-scm/guile-strings.c:1076
-#: ../intl-scm/guile-strings.c:1108 ../intl-scm/guile-strings.c:1114
-#: ../intl-scm/guile-strings.c:1120 ../intl-scm/guile-strings.c:1148
-#: ../intl-scm/guile-strings.c:1154 ../intl-scm/guile-strings.c:1160
+#: ../intl-scm/guile-strings.c:350
+#: ../intl-scm/guile-strings.c:356
+#: ../intl-scm/guile-strings.c:362
+#: ../intl-scm/guile-strings.c:432
+#: ../intl-scm/guile-strings.c:436
+#: ../intl-scm/guile-strings.c:440
+#: ../intl-scm/guile-strings.c:562
+#: ../intl-scm/guile-strings.c:568
+#: ../intl-scm/guile-strings.c:574
+#: ../intl-scm/guile-strings.c:644
+#: ../intl-scm/guile-strings.c:648
+#: ../intl-scm/guile-strings.c:652
+#: ../intl-scm/guile-strings.c:774
+#: ../intl-scm/guile-strings.c:780
+#: ../intl-scm/guile-strings.c:786
+#: ../intl-scm/guile-strings.c:856
+#: ../intl-scm/guile-strings.c:860
+#: ../intl-scm/guile-strings.c:864
+#: ../intl-scm/guile-strings.c:986
+#: ../intl-scm/guile-strings.c:992
+#: ../intl-scm/guile-strings.c:998
+#: ../intl-scm/guile-strings.c:1068
+#: ../intl-scm/guile-strings.c:1072
+#: ../intl-scm/guile-strings.c:1076
+#: ../intl-scm/guile-strings.c:1108
+#: ../intl-scm/guile-strings.c:1114
+#: ../intl-scm/guile-strings.c:1120
+#: ../intl-scm/guile-strings.c:1148
+#: ../intl-scm/guile-strings.c:1154
+#: ../intl-scm/guile-strings.c:1160
 msgid "Tables"
 msgstr "表"
 
@@ -16663,11 +15867,16 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:352 ../intl-scm/guile-strings.c:434
-#: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:646
-#: ../intl-scm/guile-strings.c:776 ../intl-scm/guile-strings.c:858
-#: ../intl-scm/guile-strings.c:988 ../intl-scm/guile-strings.c:1070
-#: ../intl-scm/guile-strings.c:1110 ../intl-scm/guile-strings.c:1150
+#: ../intl-scm/guile-strings.c:352
+#: ../intl-scm/guile-strings.c:434
+#: ../intl-scm/guile-strings.c:564
+#: ../intl-scm/guile-strings.c:646
+#: ../intl-scm/guile-strings.c:776
+#: ../intl-scm/guile-strings.c:858
+#: ../intl-scm/guile-strings.c:988
+#: ../intl-scm/guile-strings.c:1070
+#: ../intl-scm/guile-strings.c:1110
+#: ../intl-scm/guile-strings.c:1150
 msgid "Table cell spacing"
 msgstr "セルの間隔"
 
@@ -16677,12 +15886,18 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:354 ../intl-scm/guile-strings.c:360
-#: ../intl-scm/guile-strings.c:566 ../intl-scm/guile-strings.c:572
-#: ../intl-scm/guile-strings.c:778 ../intl-scm/guile-strings.c:784
-#: ../intl-scm/guile-strings.c:990 ../intl-scm/guile-strings.c:996
-#: ../intl-scm/guile-strings.c:1112 ../intl-scm/guile-strings.c:1118
-#: ../intl-scm/guile-strings.c:1152 ../intl-scm/guile-strings.c:1158
+#: ../intl-scm/guile-strings.c:354
+#: ../intl-scm/guile-strings.c:360
+#: ../intl-scm/guile-strings.c:566
+#: ../intl-scm/guile-strings.c:572
+#: ../intl-scm/guile-strings.c:778
+#: ../intl-scm/guile-strings.c:784
+#: ../intl-scm/guile-strings.c:990
+#: ../intl-scm/guile-strings.c:996
+#: ../intl-scm/guile-strings.c:1112
+#: ../intl-scm/guile-strings.c:1118
+#: ../intl-scm/guile-strings.c:1152
+#: ../intl-scm/guile-strings.c:1158
 msgid "Space between table cells"
 msgstr "セルとセルの間の間隔"
 
@@ -16692,11 +15907,16 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:358 ../intl-scm/guile-strings.c:438
-#: ../intl-scm/guile-strings.c:570 ../intl-scm/guile-strings.c:650
-#: ../intl-scm/guile-strings.c:782 ../intl-scm/guile-strings.c:862
-#: ../intl-scm/guile-strings.c:994 ../intl-scm/guile-strings.c:1074
-#: ../intl-scm/guile-strings.c:1116 ../intl-scm/guile-strings.c:1156
+#: ../intl-scm/guile-strings.c:358
+#: ../intl-scm/guile-strings.c:438
+#: ../intl-scm/guile-strings.c:570
+#: ../intl-scm/guile-strings.c:650
+#: ../intl-scm/guile-strings.c:782
+#: ../intl-scm/guile-strings.c:862
+#: ../intl-scm/guile-strings.c:994
+#: ../intl-scm/guile-strings.c:1074
+#: ../intl-scm/guile-strings.c:1116
+#: ../intl-scm/guile-strings.c:1156
 msgid "Table cell padding"
 msgstr "セル内の文字とセル罫線の間隔"
 
@@ -16706,11 +15926,16 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:364 ../intl-scm/guile-strings.c:442
-#: ../intl-scm/guile-strings.c:576 ../intl-scm/guile-strings.c:654
-#: ../intl-scm/guile-strings.c:788 ../intl-scm/guile-strings.c:866
-#: ../intl-scm/guile-strings.c:1000 ../intl-scm/guile-strings.c:1078
-#: ../intl-scm/guile-strings.c:1122 ../intl-scm/guile-strings.c:1162
+#: ../intl-scm/guile-strings.c:364
+#: ../intl-scm/guile-strings.c:442
+#: ../intl-scm/guile-strings.c:576
+#: ../intl-scm/guile-strings.c:654
+#: ../intl-scm/guile-strings.c:788
+#: ../intl-scm/guile-strings.c:866
+#: ../intl-scm/guile-strings.c:1000
+#: ../intl-scm/guile-strings.c:1078
+#: ../intl-scm/guile-strings.c:1122
+#: ../intl-scm/guile-strings.c:1162
 msgid "Table border width"
 msgstr "罫線の幅"
 
@@ -16720,9 +15945,12 @@
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:366 ../intl-scm/guile-strings.c:578
-#: ../intl-scm/guile-strings.c:790 ../intl-scm/guile-strings.c:1002
-#: ../intl-scm/guile-strings.c:1124 ../intl-scm/guile-strings.c:1164
+#: ../intl-scm/guile-strings.c:366
+#: ../intl-scm/guile-strings.c:578
+#: ../intl-scm/guile-strings.c:790
+#: ../intl-scm/guile-strings.c:1002
+#: ../intl-scm/guile-strings.c:1124
+#: ../intl-scm/guile-strings.c:1164
 msgid "Bevel depth on tables"
 msgstr "表のベベル深度"
 
@@ -16730,8 +15958,10 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:444 ../intl-scm/guile-strings.c:656
-#: ../intl-scm/guile-strings.c:868 ../intl-scm/guile-strings.c:1080
+#: ../intl-scm/guile-strings.c:444
+#: ../intl-scm/guile-strings.c:656
+#: ../intl-scm/guile-strings.c:868
+#: ../intl-scm/guile-strings.c:1080
 msgid "Prepared by: "
 msgstr ""
 
@@ -16739,51 +15969,61 @@
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:446 ../intl-scm/guile-strings.c:658
-#: ../intl-scm/guile-strings.c:870 ../intl-scm/guile-strings.c:1082
+#: ../intl-scm/guile-strings.c:446
+#: ../intl-scm/guile-strings.c:658
+#: ../intl-scm/guile-strings.c:870
+#: ../intl-scm/guile-strings.c:1082
 msgid "Prepared for: "
 msgstr ""
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:450 ../intl-scm/guile-strings.c:874
+#: ../intl-scm/guile-strings.c:450
+#: ../intl-scm/guile-strings.c:874
 msgid "Fancy"
 msgstr ""
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:452 ../intl-scm/guile-strings.c:876
+#: ../intl-scm/guile-strings.c:452
+#: ../intl-scm/guile-strings.c:876
 msgid "Technicolor"
 msgstr ""
 
 #. src/report/stylesheets/stylesheet-easy.scm
 #. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:662 ../intl-scm/guile-strings.c:664
-#: ../intl-scm/guile-strings.c:1086 ../intl-scm/guile-strings.c:1088
+#: ../intl-scm/guile-strings.c:662
+#: ../intl-scm/guile-strings.c:664
+#: ../intl-scm/guile-strings.c:1086
+#: ../intl-scm/guile-strings.c:1088
 msgid "Easy"
 msgstr ""
 
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:1094 ../intl-scm/guile-strings.c:1134
+#: ../intl-scm/guile-strings.c:1094
+#: ../intl-scm/guile-strings.c:1134
 msgid "Background color for reports."
 msgstr "帳票の背景色"
 
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:1098 ../intl-scm/guile-strings.c:1138
+#: ../intl-scm/guile-strings.c:1098
+#: ../intl-scm/guile-strings.c:1138
 msgid "Background Pixmap"
 msgstr "背景画像"
 
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:1106 ../intl-scm/guile-strings.c:1146
+#: ../intl-scm/guile-strings.c:1106
+#: ../intl-scm/guile-strings.c:1146
 msgid "Enable hyperlinks in reports."
 msgstr "帳票内のハイパーリンクを有効にする"
 
 #. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:1126 ../intl-scm/guile-strings.c:1166
+#: ../intl-scm/guile-strings.c:1126
+#: ../intl-scm/guile-strings.c:1166
 msgid "Plain"
 msgstr "空白"
 
@@ -16791,8 +16031,10 @@
 #. src/report/stylesheets/stylesheet-plain.scm
 #. src/report/report-system/report.scm
 #. src/report/report-system/html-style-sheet.scm
-#: ../intl-scm/guile-strings.c:1128 ../intl-scm/guile-strings.c:1168
-#: ../intl-scm/guile-strings.c:1348 ../intl-scm/guile-strings.c:1430
+#: ../intl-scm/guile-strings.c:1128
+#: ../intl-scm/guile-strings.c:1168
+#: ../intl-scm/guile-strings.c:1348
+#: ../intl-scm/guile-strings.c:1430
 msgid "Default"
 msgstr "デフォルト"
 
@@ -16817,43 +16059,48 @@
 msgstr "データ点間の合計時間"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1178 ../intl-scm/guile-strings.c:1180
+#: ../intl-scm/guile-strings.c:1178
+#: ../intl-scm/guile-strings.c:1180
 msgid "Day"
 msgstr "æ—¥"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1182 ../intl-scm/guile-strings.c:1184
+#: ../intl-scm/guile-strings.c:1182
+#: ../intl-scm/guile-strings.c:1184
 msgid "Week"
 msgstr "週"
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1186
 msgid "2Week"
-msgstr "隔週"
+msgstr "2週"
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1188
-#, fuzzy
 msgid "Two Weeks"
-msgstr "隔週"
+msgstr "2週間"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1190 ../intl-scm/guile-strings.c:1192
+#: ../intl-scm/guile-strings.c:1190
+#: ../intl-scm/guile-strings.c:1192
 msgid "Month"
 msgstr "月"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1194 ../intl-scm/guile-strings.c:1196
+#: ../intl-scm/guile-strings.c:1194
+#: ../intl-scm/guile-strings.c:1196
 msgid "Quarter"
 msgstr "四半期"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1198 ../intl-scm/guile-strings.c:1200
+#: ../intl-scm/guile-strings.c:1198
+#: ../intl-scm/guile-strings.c:1200
 msgid "Half Year"
 msgstr "半年"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1202 ../intl-scm/guile-strings.c:1204
+#: ../intl-scm/guile-strings.c:1202
+#: ../intl-scm/guile-strings.c:1204
 msgid "Year"
 msgstr "å¹´"
 
@@ -16883,7 +16130,8 @@
 msgstr "第三レベル"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1216 ../intl-scm/guile-strings.c:1218
+#: ../intl-scm/guile-strings.c:1216
+#: ../intl-scm/guile-strings.c:1218
 msgid "Fourth-level"
 msgstr "第四レベル"
 
@@ -16899,11 +16147,8 @@
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1224
-msgid ""
-"Override account-selection and show sub-accounts of all selected accounts?"
-msgstr ""
-"勘定科目選択をオーバライドして、すべての選択された科目の子勘定科目を表示しま"
-"すか?"
+msgid "Override account-selection and show sub-accounts of all selected accounts?"
+msgstr "勘定科目選択をオーバライドして、すべての選択された科目の子勘定科目を表示しますか?"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16912,9 +16157,12 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1226 ../intl-scm/guile-strings.c:2256
-#: ../intl-scm/guile-strings.c:2880 ../intl-scm/guile-strings.c:3094
-#: ../intl-scm/guile-strings.c:3202 ../intl-scm/guile-strings.c:4248
+#: ../intl-scm/guile-strings.c:1226
+#: ../intl-scm/guile-strings.c:2256
+#: ../intl-scm/guile-strings.c:2880
+#: ../intl-scm/guile-strings.c:3094
+#: ../intl-scm/guile-strings.c:3202
+#: ../intl-scm/guile-strings.c:4248
 #: ../intl-scm/guile-strings.c:4356
 msgid "Report on these accounts, if display depth allows."
 msgstr "表示の深さが許すならこれらの科目上に帳票を表示"
@@ -16944,8 +16192,10 @@
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1236 ../intl-scm/guile-strings.c:1860
-#: ../intl-scm/guile-strings.c:2484 ../intl-scm/guile-strings.c:3316
+#: ../intl-scm/guile-strings.c:1236
+#: ../intl-scm/guile-strings.c:1860
+#: ../intl-scm/guile-strings.c:2484
+#: ../intl-scm/guile-strings.c:3316
 #: ../intl-scm/guile-strings.c:4470
 msgid "The source of price information"
 msgstr "建値の元に関する情報"
@@ -16953,7 +16203,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1238 ../intl-scm/guile-strings.c:1862
+#: ../intl-scm/guile-strings.c:1238
+#: ../intl-scm/guile-strings.c:1862
 #: ../intl-scm/guile-strings.c:2486
 msgid "Weighted Average"
 msgstr "加重平均"
@@ -16961,7 +16212,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1240 ../intl-scm/guile-strings.c:1864
+#: ../intl-scm/guile-strings.c:1240
+#: ../intl-scm/guile-strings.c:1864
 #: ../intl-scm/guile-strings.c:2488
 msgid "The weighted average of all currency transactions of the past"
 msgstr "過去のすべての通貨の取引の加重平均"
@@ -16969,7 +16221,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1242 ../intl-scm/guile-strings.c:3318
+#: ../intl-scm/guile-strings.c:1242
+#: ../intl-scm/guile-strings.c:3318
 #: ../intl-scm/guile-strings.c:4472
 msgid "Most recent"
 msgstr "もっとも最近"
@@ -16977,7 +16230,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1244 ../intl-scm/guile-strings.c:3320
+#: ../intl-scm/guile-strings.c:1244
+#: ../intl-scm/guile-strings.c:3320
 #: ../intl-scm/guile-strings.c:4474
 msgid "The most recent recorded price"
 msgstr "もっとも最近に記録された価格"
@@ -16985,7 +16239,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1246 ../intl-scm/guile-strings.c:3322
+#: ../intl-scm/guile-strings.c:1246
+#: ../intl-scm/guile-strings.c:3322
 #: ../intl-scm/guile-strings.c:4476
 msgid "Nearest in time"
 msgstr "時間的にもっとも近い"
@@ -16993,7 +16248,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1248 ../intl-scm/guile-strings.c:3324
+#: ../intl-scm/guile-strings.c:1248
+#: ../intl-scm/guile-strings.c:3324
 #: ../intl-scm/guile-strings.c:4478
 msgid "The price recorded nearest in time to the report date"
 msgstr "帳票の記録された時間が時間的にもっとも近い価格"
@@ -17014,24 +16270,28 @@
 msgstr "各データ点のマーカーを選択してください。"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1256 ../intl-scm/guile-strings.c:1258
+#: ../intl-scm/guile-strings.c:1256
+#: ../intl-scm/guile-strings.c:1258
 msgid "Circle"
 msgstr "円"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1260 ../intl-scm/guile-strings.c:1262
+#: ../intl-scm/guile-strings.c:1260
+#: ../intl-scm/guile-strings.c:1262
 #, fuzzy
 msgid "Cross"
 msgstr "十字"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1264 ../intl-scm/guile-strings.c:1266
+#: ../intl-scm/guile-strings.c:1264
+#: ../intl-scm/guile-strings.c:1266
 #, fuzzy
 msgid "Square"
 msgstr "四角"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1268 ../intl-scm/guile-strings.c:1270
+#: ../intl-scm/guile-strings.c:1268
+#: ../intl-scm/guile-strings.c:1270
 msgid "Asterisk"
 msgstr "星印"
 
@@ -17091,7 +16351,8 @@
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1296 ../intl-scm/guile-strings.c:3232
+#: ../intl-scm/guile-strings.c:1296
+#: ../intl-scm/guile-strings.c:3232
 #: ../intl-scm/guile-strings.c:4386
 #, fuzzy
 msgid "Account Balance"
@@ -17104,13 +16365,12 @@
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1302
-msgid ""
-"Calculate the subtotal for this parent account and all of its subaccounts, "
-"and show this as the parent account balance"
+msgid "Calculate the subtotal for this parent account and all of its subaccounts, and show this as the parent account balance"
 msgstr ""
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:1304 ../intl-scm/guile-strings.c:1314
+#: ../intl-scm/guile-strings.c:1304
+#: ../intl-scm/guile-strings.c:1314
 msgid "Do not show"
 msgstr "表示しない"
 
@@ -17150,9 +16410,7 @@
 
 #. src/report/report-system/options-utilities.scm
 #: ../intl-scm/guile-strings.c:1320
-msgid ""
-"Show parent account subtotals, indented per accounting text book practice "
-"(experimental)"
+msgid "Show parent account subtotals, indented per accounting text book practice (experimental)"
 msgstr ""
 
 #. src/report/report-system/report.scm
@@ -17191,65 +16449,124 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:1336 ../intl-scm/guile-strings.c:3508
-#: ../intl-scm/guile-strings.c:3512 ../intl-scm/guile-strings.c:3516
-#: ../intl-scm/guile-strings.c:3520 ../intl-scm/guile-strings.c:3524
-#: ../intl-scm/guile-strings.c:3528 ../intl-scm/guile-strings.c:3532
-#: ../intl-scm/guile-strings.c:3536 ../intl-scm/guile-strings.c:3540
-#: ../intl-scm/guile-strings.c:3544 ../intl-scm/guile-strings.c:3548
-#: ../intl-scm/guile-strings.c:3552 ../intl-scm/guile-strings.c:3556
-#: ../intl-scm/guile-strings.c:3560 ../intl-scm/guile-strings.c:3564
-#: ../intl-scm/guile-strings.c:3878 ../intl-scm/guile-strings.c:3920
-#: ../intl-scm/guile-strings.c:3926 ../intl-scm/guile-strings.c:3932
-#: ../intl-scm/guile-strings.c:3938 ../intl-scm/guile-strings.c:3944
-#: ../intl-scm/guile-strings.c:3950 ../intl-scm/guile-strings.c:3956
-#: ../intl-scm/guile-strings.c:3970 ../intl-scm/guile-strings.c:3976
-#: ../intl-scm/guile-strings.c:4662 ../intl-scm/guile-strings.c:4666
-#: ../intl-scm/guile-strings.c:4670 ../intl-scm/guile-strings.c:4674
-#: ../intl-scm/guile-strings.c:4678 ../intl-scm/guile-strings.c:4682
-#: ../intl-scm/guile-strings.c:4686 ../intl-scm/guile-strings.c:4690
-#: ../intl-scm/guile-strings.c:4694 ../intl-scm/guile-strings.c:4698
-#: ../intl-scm/guile-strings.c:4702 ../intl-scm/guile-strings.c:4706
-#: ../intl-scm/guile-strings.c:4710 ../intl-scm/guile-strings.c:4714
-#: ../intl-scm/guile-strings.c:4718 ../intl-scm/guile-strings.c:5032
-#: ../intl-scm/guile-strings.c:5074 ../intl-scm/guile-strings.c:5080
-#: ../intl-scm/guile-strings.c:5086 ../intl-scm/guile-strings.c:5092
-#: ../intl-scm/guile-strings.c:5098 ../intl-scm/guile-strings.c:5104
-#: ../intl-scm/guile-strings.c:5110 ../intl-scm/guile-strings.c:5124
-#: ../intl-scm/guile-strings.c:5130 ../intl-scm/guile-strings.c:5996
-#: ../intl-scm/guile-strings.c:6002 ../intl-scm/guile-strings.c:6008
-#: ../intl-scm/guile-strings.c:6014 ../intl-scm/guile-strings.c:6020
-#: ../intl-scm/guile-strings.c:6026 ../intl-scm/guile-strings.c:6032
-#: ../intl-scm/guile-strings.c:6038 ../intl-scm/guile-strings.c:6044
-#: ../intl-scm/guile-strings.c:6050 ../intl-scm/guile-strings.c:6056
-#: ../intl-scm/guile-strings.c:6064 ../intl-scm/guile-strings.c:6070
-#: ../intl-scm/guile-strings.c:6314 ../intl-scm/guile-strings.c:6320
-#: ../intl-scm/guile-strings.c:6326 ../intl-scm/guile-strings.c:6332
-#: ../intl-scm/guile-strings.c:6338 ../intl-scm/guile-strings.c:6344
-#: ../intl-scm/guile-strings.c:6350 ../intl-scm/guile-strings.c:6356
-#: ../intl-scm/guile-strings.c:6362 ../intl-scm/guile-strings.c:6368
-#: ../intl-scm/guile-strings.c:6374 ../intl-scm/guile-strings.c:6380
-#: ../intl-scm/guile-strings.c:6520 ../intl-scm/guile-strings.c:6526
-#: ../intl-scm/guile-strings.c:6532 ../intl-scm/guile-strings.c:6538
-#: ../intl-scm/guile-strings.c:6544 ../intl-scm/guile-strings.c:6550
-#: ../intl-scm/guile-strings.c:6556 ../intl-scm/guile-strings.c:6562
-#: ../intl-scm/guile-strings.c:6568 ../intl-scm/guile-strings.c:6574
-#: ../intl-scm/guile-strings.c:6580 ../intl-scm/guile-strings.c:6588
-#: ../intl-scm/guile-strings.c:6594 ../intl-scm/guile-strings.c:6838
-#: ../intl-scm/guile-strings.c:6844 ../intl-scm/guile-strings.c:6850
-#: ../intl-scm/guile-strings.c:6856 ../intl-scm/guile-strings.c:6862
-#: ../intl-scm/guile-strings.c:6868 ../intl-scm/guile-strings.c:6874
-#: ../intl-scm/guile-strings.c:6880 ../intl-scm/guile-strings.c:6886
-#: ../intl-scm/guile-strings.c:6892 ../intl-scm/guile-strings.c:6898
-#: ../intl-scm/guile-strings.c:6904 ../intl-scm/guile-strings.c:7098
-#: ../intl-scm/guile-strings.c:7104 ../intl-scm/guile-strings.c:7110
-#: ../intl-scm/guile-strings.c:7116 ../intl-scm/guile-strings.c:7122
-#: ../intl-scm/guile-strings.c:7128 ../intl-scm/guile-strings.c:7134
-#: ../intl-scm/guile-strings.c:7140 ../intl-scm/guile-strings.c:7148
-#: ../intl-scm/guile-strings.c:7338 ../intl-scm/guile-strings.c:7344
-#: ../intl-scm/guile-strings.c:7350 ../intl-scm/guile-strings.c:7356
-#: ../intl-scm/guile-strings.c:7362 ../intl-scm/guile-strings.c:7368
-#: ../intl-scm/guile-strings.c:7374 ../intl-scm/guile-strings.c:7380
+#: ../intl-scm/guile-strings.c:1336
+#: ../intl-scm/guile-strings.c:3508
+#: ../intl-scm/guile-strings.c:3512
+#: ../intl-scm/guile-strings.c:3516
+#: ../intl-scm/guile-strings.c:3520
+#: ../intl-scm/guile-strings.c:3524
+#: ../intl-scm/guile-strings.c:3528
+#: ../intl-scm/guile-strings.c:3532
+#: ../intl-scm/guile-strings.c:3536
+#: ../intl-scm/guile-strings.c:3540
+#: ../intl-scm/guile-strings.c:3544
+#: ../intl-scm/guile-strings.c:3548
+#: ../intl-scm/guile-strings.c:3552
+#: ../intl-scm/guile-strings.c:3556
+#: ../intl-scm/guile-strings.c:3560
+#: ../intl-scm/guile-strings.c:3564
+#: ../intl-scm/guile-strings.c:3878
+#: ../intl-scm/guile-strings.c:3920
+#: ../intl-scm/guile-strings.c:3926
+#: ../intl-scm/guile-strings.c:3932
+#: ../intl-scm/guile-strings.c:3938
+#: ../intl-scm/guile-strings.c:3944
+#: ../intl-scm/guile-strings.c:3950
+#: ../intl-scm/guile-strings.c:3956
+#: ../intl-scm/guile-strings.c:3970
+#: ../intl-scm/guile-strings.c:3976
+#: ../intl-scm/guile-strings.c:4662
+#: ../intl-scm/guile-strings.c:4666
+#: ../intl-scm/guile-strings.c:4670
+#: ../intl-scm/guile-strings.c:4674
+#: ../intl-scm/guile-strings.c:4678
+#: ../intl-scm/guile-strings.c:4682
+#: ../intl-scm/guile-strings.c:4686
+#: ../intl-scm/guile-strings.c:4690
+#: ../intl-scm/guile-strings.c:4694
+#: ../intl-scm/guile-strings.c:4698
+#: ../intl-scm/guile-strings.c:4702
+#: ../intl-scm/guile-strings.c:4706
+#: ../intl-scm/guile-strings.c:4710
+#: ../intl-scm/guile-strings.c:4714
+#: ../intl-scm/guile-strings.c:4718
+#: ../intl-scm/guile-strings.c:5032
+#: ../intl-scm/guile-strings.c:5074
+#: ../intl-scm/guile-strings.c:5080
+#: ../intl-scm/guile-strings.c:5086
+#: ../intl-scm/guile-strings.c:5092
+#: ../intl-scm/guile-strings.c:5098
+#: ../intl-scm/guile-strings.c:5104
+#: ../intl-scm/guile-strings.c:5110
+#: ../intl-scm/guile-strings.c:5124
+#: ../intl-scm/guile-strings.c:5130
+#: ../intl-scm/guile-strings.c:5996
+#: ../intl-scm/guile-strings.c:6002
+#: ../intl-scm/guile-strings.c:6008
+#: ../intl-scm/guile-strings.c:6014
+#: ../intl-scm/guile-strings.c:6020
+#: ../intl-scm/guile-strings.c:6026
+#: ../intl-scm/guile-strings.c:6032
+#: ../intl-scm/guile-strings.c:6038
+#: ../intl-scm/guile-strings.c:6044
+#: ../intl-scm/guile-strings.c:6050
+#: ../intl-scm/guile-strings.c:6056
+#: ../intl-scm/guile-strings.c:6064
+#: ../intl-scm/guile-strings.c:6070
+#: ../intl-scm/guile-strings.c:6314
+#: ../intl-scm/guile-strings.c:6320
+#: ../intl-scm/guile-strings.c:6326
+#: ../intl-scm/guile-strings.c:6332
+#: ../intl-scm/guile-strings.c:6338
+#: ../intl-scm/guile-strings.c:6344
+#: ../intl-scm/guile-strings.c:6350
+#: ../intl-scm/guile-strings.c:6356
+#: ../intl-scm/guile-strings.c:6362
+#: ../intl-scm/guile-strings.c:6368
+#: ../intl-scm/guile-strings.c:6374
+#: ../intl-scm/guile-strings.c:6380
+#: ../intl-scm/guile-strings.c:6520
+#: ../intl-scm/guile-strings.c:6526
+#: ../intl-scm/guile-strings.c:6532
+#: ../intl-scm/guile-strings.c:6538
+#: ../intl-scm/guile-strings.c:6544
+#: ../intl-scm/guile-strings.c:6550
+#: ../intl-scm/guile-strings.c:6556
+#: ../intl-scm/guile-strings.c:6562
+#: ../intl-scm/guile-strings.c:6568
+#: ../intl-scm/guile-strings.c:6574
+#: ../intl-scm/guile-strings.c:6580
+#: ../intl-scm/guile-strings.c:6588
+#: ../intl-scm/guile-strings.c:6594
+#: ../intl-scm/guile-strings.c:6838
+#: ../intl-scm/guile-strings.c:6844
+#: ../intl-scm/guile-strings.c:6850
+#: ../intl-scm/guile-strings.c:6856
+#: ../intl-scm/guile-strings.c:6862
+#: ../intl-scm/guile-strings.c:6868
+#: ../intl-scm/guile-strings.c:6874
+#: ../intl-scm/guile-strings.c:6880
+#: ../intl-scm/guile-strings.c:6886
+#: ../intl-scm/guile-strings.c:6892
+#: ../intl-scm/guile-strings.c:6898
+#: ../intl-scm/guile-strings.c:6904
+#: ../intl-scm/guile-strings.c:7098
+#: ../intl-scm/guile-strings.c:7104
+#: ../intl-scm/guile-strings.c:7110
+#: ../intl-scm/guile-strings.c:7116
+#: ../intl-scm/guile-strings.c:7122
+#: ../intl-scm/guile-strings.c:7128
+#: ../intl-scm/guile-strings.c:7134
+#: ../intl-scm/guile-strings.c:7140
+#: ../intl-scm/guile-strings.c:7148
+#: ../intl-scm/guile-strings.c:7338
+#: ../intl-scm/guile-strings.c:7344
+#: ../intl-scm/guile-strings.c:7350
+#: ../intl-scm/guile-strings.c:7356
+#: ../intl-scm/guile-strings.c:7362
+#: ../intl-scm/guile-strings.c:7368
+#: ../intl-scm/guile-strings.c:7374
+#: ../intl-scm/guile-strings.c:7380
 #: ../intl-scm/guile-strings.c:7388
 msgid "Display"
 msgstr "表示"
@@ -17261,10 +16578,7 @@
 
 #. src/report/report-system/report.scm
 #: ../intl-scm/guile-strings.c:1340
-msgid ""
-"A custom report with this name already exists. Either rename the report to "
-"store it with a different name, or edit your saved-reports file and delete "
-"the section with the following name: "
+msgid "A custom report with this name already exists. Either rename the report to store it with a different name, or edit your saved-reports file and delete the section with the following name: "
 msgstr ""
 
 #. src/report/report-system/report.scm
@@ -17273,7 +16587,8 @@
 msgstr "この帳票の説明的な名前を入力する"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:1344 ../intl-scm/guile-strings.c:1352
+#: ../intl-scm/guile-strings.c:1344
+#: ../intl-scm/guile-strings.c:1352
 #: ../intl-scm/guile-strings.c:1354
 msgid "Stylesheet"
 msgstr "スタイルシート"
@@ -17291,10 +16606,7 @@
 #. src/report/report-system/report.scm
 #: ../intl-scm/guile-strings.c:1356
 #, c-format
-msgid ""
-"Your report \"%s\" has been saved into the configuration file \"%s\".  The "
-"report will be available in the menu Reports -> Custom at the next startup "
-"of GnuCash."
+msgid "Your report \"%s\" has been saved into the configuration file \"%s\".  The report will be available in the menu Reports -> Custom at the next startup of GnuCash."
 msgstr ""
 
 #. src/report/report-system/html-acct-table.scm
@@ -17304,9 +16616,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1358 ../intl-scm/guile-strings.c:2146
-#: ../intl-scm/guile-strings.c:2330 ../intl-scm/guile-strings.c:2770
-#: ../intl-scm/guile-strings.c:2954 ../intl-scm/guile-strings.c:3450
+#: ../intl-scm/guile-strings.c:1358
+#: ../intl-scm/guile-strings.c:2146
+#: ../intl-scm/guile-strings.c:2330
+#: ../intl-scm/guile-strings.c:2770
+#: ../intl-scm/guile-strings.c:2954
+#: ../intl-scm/guile-strings.c:3450
 #: ../intl-scm/guile-strings.c:4604
 #, fuzzy
 msgid "Closing Entries"
@@ -17315,7 +16630,8 @@
 #. src/report/report-system/html-acct-table.scm
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1360 ../intl-scm/guile-strings.c:2144
+#: ../intl-scm/guile-strings.c:1360
+#: ../intl-scm/guile-strings.c:2144
 #: ../intl-scm/guile-strings.c:2768
 #, fuzzy
 msgid "Adjusting Entries"
@@ -17328,9 +16644,12 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1370 ../intl-scm/guile-strings.c:1954
-#: ../intl-scm/guile-strings.c:2578 ../intl-scm/guile-strings.c:3166
-#: ../intl-scm/guile-strings.c:4184 ../intl-scm/guile-strings.c:4320
+#: ../intl-scm/guile-strings.c:1370
+#: ../intl-scm/guile-strings.c:1954
+#: ../intl-scm/guile-strings.c:2578
+#: ../intl-scm/guile-strings.c:3166
+#: ../intl-scm/guile-strings.c:4184
+#: ../intl-scm/guile-strings.c:4320
 #: ../intl-scm/guile-strings.c:5338
 msgid "Assets"
 msgstr "資産"
@@ -17342,9 +16661,12 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1372 ../intl-scm/guile-strings.c:1956
-#: ../intl-scm/guile-strings.c:2580 ../intl-scm/guile-strings.c:3170
-#: ../intl-scm/guile-strings.c:4186 ../intl-scm/guile-strings.c:4324
+#: ../intl-scm/guile-strings.c:1372
+#: ../intl-scm/guile-strings.c:1956
+#: ../intl-scm/guile-strings.c:2580
+#: ../intl-scm/guile-strings.c:3170
+#: ../intl-scm/guile-strings.c:4186
+#: ../intl-scm/guile-strings.c:4324
 #: ../intl-scm/guile-strings.c:5340
 msgid "Liabilities"
 msgstr "負債"
@@ -17367,7 +16689,8 @@
 #. src/report/report-system/report-utilities.scm
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:1382 ../intl-scm/guile-strings.c:2342
+#: ../intl-scm/guile-strings.c:1382
+#: ../intl-scm/guile-strings.c:2342
 #: ../intl-scm/guile-strings.c:2966
 msgid "Expenses"
 msgstr "費用"
@@ -17453,16 +16776,15 @@
 #. src/report/report-system/html-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1422 ../intl-scm/guile-strings.c:1900
+#: ../intl-scm/guile-strings.c:1422
+#: ../intl-scm/guile-strings.c:1900
 #: ../intl-scm/guile-strings.c:2524
 msgid "No data"
 msgstr "データなし"
 
 #. src/report/report-system/html-utilities.scm
 #: ../intl-scm/guile-strings.c:1424
-msgid ""
-"The selected accounts contain no data/transactions (or only zeroes) for the "
-"selected time period"
+msgid "The selected accounts contain no data/transactions (or only zeroes) for the selected time period"
 msgstr ""
 
 #. src/report/report-system/html-style-sheet.scm
@@ -17472,519 +16794,594 @@
 
 #. src/report/report-gnome/report-gnome.scm
 #. src/report/report-gnome/gnucash/report/report-gnome.scm
-#: ../intl-scm/guile-strings.c:1432 ../intl-scm/guile-strings.c:1442
+#: ../intl-scm/guile-strings.c:1432
+#: ../intl-scm/guile-strings.c:1442
 msgid "This report has no options."
 msgstr "この帳票にはオプションはありません"
 
 #. src/report/report-gnome/report-gnome.scm
 #. src/report/report-gnome/gnucash/report/report-gnome.scm
-#: ../intl-scm/guile-strings.c:1436 ../intl-scm/guile-strings.c:1446
+#: ../intl-scm/guile-strings.c:1436
+#: ../intl-scm/guile-strings.c:1446
 #, c-format
 msgid "Display the %s report"
 msgstr "%s の帳票を表示。"
 
 #. src/report/report-gnome/report-gnome.scm
 #. src/report/report-gnome/gnucash/report/report-gnome.scm
-#: ../intl-scm/guile-strings.c:1438 ../intl-scm/guile-strings.c:1448
+#: ../intl-scm/guile-strings.c:1438
+#: ../intl-scm/guile-strings.c:1448
 #, fuzzy
 msgid "Welcome Sample Report"
 msgstr "完了"
 
 #. src/report/report-gnome/report-gnome.scm
 #. src/report/report-gnome/gnucash/report/report-gnome.scm
-#: ../intl-scm/guile-strings.c:1440 ../intl-scm/guile-strings.c:1450
+#: ../intl-scm/guile-strings.c:1440
+#: ../intl-scm/guile-strings.c:1450
 #, fuzzy
 msgid "Welcome-to-GnuCash report screen"
 msgstr "\"GnuCashへようこそ\"の画面"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1454 ../intl-scm/guile-strings.c:1460
-#: ../intl-scm/guile-strings.c:1476 ../intl-scm/guile-strings.c:1482
+#: ../intl-scm/guile-strings.c:1454
+#: ../intl-scm/guile-strings.c:1460
+#: ../intl-scm/guile-strings.c:1476
+#: ../intl-scm/guile-strings.c:1482
 msgid "Number of columns"
 msgstr "列数"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1456 ../intl-scm/guile-strings.c:1478
+#: ../intl-scm/guile-strings.c:1456
+#: ../intl-scm/guile-strings.c:1478
 msgid "Number of columns before wrapping to a new row"
 msgstr "新しい行へ包み込まれる前の列数"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1466 ../intl-scm/guile-strings.c:1488
+#: ../intl-scm/guile-strings.c:1466
+#: ../intl-scm/guile-strings.c:1488
 msgid "Edit Options"
 msgstr "オプションを編集"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1468 ../intl-scm/guile-strings.c:1490
+#: ../intl-scm/guile-strings.c:1468
+#: ../intl-scm/guile-strings.c:1490
 #, fuzzy
 msgid "Single Report"
 msgstr "帳票"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1470 ../intl-scm/guile-strings.c:1492
+#: ../intl-scm/guile-strings.c:1470
+#: ../intl-scm/guile-strings.c:1492
 msgid "Multicolumn View"
 msgstr "複数列ビュー"
 
 #. src/report/utility-reports/view-column.scm
 #. src/report/utility-reports/gnucash/report/view-column.scm
-#: ../intl-scm/guile-strings.c:1472 ../intl-scm/guile-strings.c:1494
+#: ../intl-scm/guile-strings.c:1472
+#: ../intl-scm/guile-strings.c:1494
 #, fuzzy
 msgid "Custom Multicolumn Report"
 msgstr "複数列ビュー"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1496 ../intl-scm/guile-strings.c:1502
-#: ../intl-scm/guile-strings.c:1524 ../intl-scm/guile-strings.c:1532
-#: ../intl-scm/guile-strings.c:1538 ../intl-scm/guile-strings.c:1544
-#: ../intl-scm/guile-strings.c:1550 ../intl-scm/guile-strings.c:1556
-#: ../intl-scm/guile-strings.c:1562 ../intl-scm/guile-strings.c:1568
-#: ../intl-scm/guile-strings.c:1662 ../intl-scm/guile-strings.c:1668
-#: ../intl-scm/guile-strings.c:1690 ../intl-scm/guile-strings.c:1698
-#: ../intl-scm/guile-strings.c:1704 ../intl-scm/guile-strings.c:1710
-#: ../intl-scm/guile-strings.c:1716 ../intl-scm/guile-strings.c:1722
-#: ../intl-scm/guile-strings.c:1728 ../intl-scm/guile-strings.c:1734
+#: ../intl-scm/guile-strings.c:1496
+#: ../intl-scm/guile-strings.c:1502
+#: ../intl-scm/guile-strings.c:1524
+#: ../intl-scm/guile-strings.c:1532
+#: ../intl-scm/guile-strings.c:1538
+#: ../intl-scm/guile-strings.c:1544
+#: ../intl-scm/guile-strings.c:1550
+#: ../intl-scm/guile-strings.c:1556
+#: ../intl-scm/guile-strings.c:1562
+#: ../intl-scm/guile-strings.c:1568
+#: ../intl-scm/guile-strings.c:1662
+#: ../intl-scm/guile-strings.c:1668
+#: ../intl-scm/guile-strings.c:1690
+#: ../intl-scm/guile-strings.c:1698
+#: ../intl-scm/guile-strings.c:1704
+#: ../intl-scm/guile-strings.c:1710
+#: ../intl-scm/guile-strings.c:1716
+#: ../intl-scm/guile-strings.c:1722
+#: ../intl-scm/guile-strings.c:1728
+#: ../intl-scm/guile-strings.c:1734
 msgid "Hello, World!"
 msgstr "Hello, World!"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1498 ../intl-scm/guile-strings.c:1664
+#: ../intl-scm/guile-strings.c:1498
+#: ../intl-scm/guile-strings.c:1664
 msgid "Boolean Option"
 msgstr "論理値オプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1500 ../intl-scm/guile-strings.c:1666
+#: ../intl-scm/guile-strings.c:1500
+#: ../intl-scm/guile-strings.c:1666
 msgid "This is a boolean option."
 msgstr "これは論理値オプションです。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1504 ../intl-scm/guile-strings.c:1670
+#: ../intl-scm/guile-strings.c:1504
+#: ../intl-scm/guile-strings.c:1670
 msgid "Multi Choice Option"
 msgstr "複数選択オプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1506 ../intl-scm/guile-strings.c:1672
+#: ../intl-scm/guile-strings.c:1506
+#: ../intl-scm/guile-strings.c:1672
 msgid "This is a multi choice option."
 msgstr "これは複数選択オプションです。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1508 ../intl-scm/guile-strings.c:1674
+#: ../intl-scm/guile-strings.c:1508
+#: ../intl-scm/guile-strings.c:1674
 msgid "First Option"
 msgstr "最初のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1510 ../intl-scm/guile-strings.c:1676
+#: ../intl-scm/guile-strings.c:1510
+#: ../intl-scm/guile-strings.c:1676
 msgid "Help for first option"
 msgstr "最初のオプションのヘルプ"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1512 ../intl-scm/guile-strings.c:1678
+#: ../intl-scm/guile-strings.c:1512
+#: ../intl-scm/guile-strings.c:1678
 msgid "Second Option"
-msgstr "二番目のオプション"
+msgstr "2番目のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1514 ../intl-scm/guile-strings.c:1680
+#: ../intl-scm/guile-strings.c:1514
+#: ../intl-scm/guile-strings.c:1680
 msgid "Help for second option"
-msgstr "二番目のオプションのヘルプ"
+msgstr "2番目のオプションのヘルプ"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1516 ../intl-scm/guile-strings.c:1682
+#: ../intl-scm/guile-strings.c:1516
+#: ../intl-scm/guile-strings.c:1682
 msgid "Third Option"
-msgstr "三番目のオプション"
+msgstr "3番目のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1518 ../intl-scm/guile-strings.c:1684
+#: ../intl-scm/guile-strings.c:1518
+#: ../intl-scm/guile-strings.c:1684
 msgid "Help for third option"
-msgstr "三番目のオプションのヘルプ"
+msgstr "3番目のオプションのヘルプ"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1520 ../intl-scm/guile-strings.c:1686
+#: ../intl-scm/guile-strings.c:1520
+#: ../intl-scm/guile-strings.c:1686
 msgid "Fourth Options"
-msgstr "四番目のオプション"
+msgstr "4番目のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1522 ../intl-scm/guile-strings.c:1688
+#: ../intl-scm/guile-strings.c:1522
+#: ../intl-scm/guile-strings.c:1688
 msgid "The fourth option rules!"
-msgstr "四番目のオプションのヘルプ"
+msgstr "4番目のオプションのヘルプ"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1526 ../intl-scm/guile-strings.c:1692
+#: ../intl-scm/guile-strings.c:1526
+#: ../intl-scm/guile-strings.c:1692
 msgid "String Option"
 msgstr "文字列のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1528 ../intl-scm/guile-strings.c:1694
+#: ../intl-scm/guile-strings.c:1528
+#: ../intl-scm/guile-strings.c:1694
 msgid "This is a string option"
 msgstr "これは文字列のオプションです"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1530 ../intl-scm/guile-strings.c:1604
-#: ../intl-scm/guile-strings.c:1648 ../intl-scm/guile-strings.c:1696
-#: ../intl-scm/guile-strings.c:1770 ../intl-scm/guile-strings.c:1814
+#: ../intl-scm/guile-strings.c:1530
+#: ../intl-scm/guile-strings.c:1604
+#: ../intl-scm/guile-strings.c:1648
+#: ../intl-scm/guile-strings.c:1696
+#: ../intl-scm/guile-strings.c:1770
+#: ../intl-scm/guile-strings.c:1814
 msgid "Hello, World"
 msgstr "Hello, World"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1534 ../intl-scm/guile-strings.c:1700
+#: ../intl-scm/guile-strings.c:1534
+#: ../intl-scm/guile-strings.c:1700
 msgid "Just a Date Option"
 msgstr "日付のみのオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1536 ../intl-scm/guile-strings.c:1702
+#: ../intl-scm/guile-strings.c:1536
+#: ../intl-scm/guile-strings.c:1702
 msgid "This is a date option"
 msgstr "これは日付のオプションです"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1540 ../intl-scm/guile-strings.c:1706
+#: ../intl-scm/guile-strings.c:1540
+#: ../intl-scm/guile-strings.c:1706
 msgid "Time and Date Option"
 msgstr "時刻と日付の設定"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1542 ../intl-scm/guile-strings.c:1708
+#: ../intl-scm/guile-strings.c:1542
+#: ../intl-scm/guile-strings.c:1708
 msgid "This is a date option with time"
 msgstr "これは時間を含む日付のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1546 ../intl-scm/guile-strings.c:1712
+#: ../intl-scm/guile-strings.c:1546
+#: ../intl-scm/guile-strings.c:1712
 msgid "Combo Date Option"
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1548 ../intl-scm/guile-strings.c:1714
+#: ../intl-scm/guile-strings.c:1548
+#: ../intl-scm/guile-strings.c:1714
 msgid "This is a combination date option"
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1552 ../intl-scm/guile-strings.c:1718
+#: ../intl-scm/guile-strings.c:1552
+#: ../intl-scm/guile-strings.c:1718
 msgid "Relative Date Option"
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1554 ../intl-scm/guile-strings.c:1720
+#: ../intl-scm/guile-strings.c:1554
+#: ../intl-scm/guile-strings.c:1720
 msgid "This is a relative date option"
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1558 ../intl-scm/guile-strings.c:1724
+#: ../intl-scm/guile-strings.c:1558
+#: ../intl-scm/guile-strings.c:1724
 msgid "Number Option"
 msgstr "数値オプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1560 ../intl-scm/guile-strings.c:1726
+#: ../intl-scm/guile-strings.c:1560
+#: ../intl-scm/guile-strings.c:1726
 msgid "This is a number option."
 msgstr "これは数値のオプションです。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1566 ../intl-scm/guile-strings.c:1572
-#: ../intl-scm/guile-strings.c:1732 ../intl-scm/guile-strings.c:1738
+#: ../intl-scm/guile-strings.c:1566
+#: ../intl-scm/guile-strings.c:1572
+#: ../intl-scm/guile-strings.c:1732
+#: ../intl-scm/guile-strings.c:1738
 msgid "This is a color option"
 msgstr "これは色のオプションです"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1574 ../intl-scm/guile-strings.c:1580
-#: ../intl-scm/guile-strings.c:1740 ../intl-scm/guile-strings.c:1746
+#: ../intl-scm/guile-strings.c:1574
+#: ../intl-scm/guile-strings.c:1580
+#: ../intl-scm/guile-strings.c:1740
+#: ../intl-scm/guile-strings.c:1746
 msgid "Hello Again"
 msgstr "Hello Again"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1576 ../intl-scm/guile-strings.c:1742
+#: ../intl-scm/guile-strings.c:1576
+#: ../intl-scm/guile-strings.c:1742
 msgid "An account list option"
 msgstr "勘定一覧オプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1578 ../intl-scm/guile-strings.c:1744
+#: ../intl-scm/guile-strings.c:1578
+#: ../intl-scm/guile-strings.c:1744
 msgid "This is an account list option"
 msgstr "これは勘定一覧オプションです"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1582 ../intl-scm/guile-strings.c:1748
+#: ../intl-scm/guile-strings.c:1582
+#: ../intl-scm/guile-strings.c:1748
 msgid "A list option"
 msgstr "一覧のオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1584 ../intl-scm/guile-strings.c:1750
+#: ../intl-scm/guile-strings.c:1584
+#: ../intl-scm/guile-strings.c:1750
 msgid "This is a list option"
 msgstr "これは一覧のオプションです"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1586 ../intl-scm/guile-strings.c:1752
+#: ../intl-scm/guile-strings.c:1586
+#: ../intl-scm/guile-strings.c:1752
 msgid "The Good"
 msgstr "ためになるもの"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1588 ../intl-scm/guile-strings.c:1754
+#: ../intl-scm/guile-strings.c:1588
+#: ../intl-scm/guile-strings.c:1754
 msgid "Good option"
 msgstr "ためになるオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1590 ../intl-scm/guile-strings.c:1756
+#: ../intl-scm/guile-strings.c:1590
+#: ../intl-scm/guile-strings.c:1756
 msgid "The Bad"
 msgstr "ためにならないもの"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1592 ../intl-scm/guile-strings.c:1758
+#: ../intl-scm/guile-strings.c:1592
+#: ../intl-scm/guile-strings.c:1758
 msgid "Bad option"
 msgstr "ためにならないオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1594 ../intl-scm/guile-strings.c:1760
+#: ../intl-scm/guile-strings.c:1594
+#: ../intl-scm/guile-strings.c:1760
 msgid "The Ugly"
 msgstr "ひどいもの"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1596 ../intl-scm/guile-strings.c:1762
+#: ../intl-scm/guile-strings.c:1596
+#: ../intl-scm/guile-strings.c:1762
 msgid "Ugly option"
 msgstr "ひどいオプション"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1598 ../intl-scm/guile-strings.c:1764
+#: ../intl-scm/guile-strings.c:1598
+#: ../intl-scm/guile-strings.c:1764
 msgid "Testing"
 msgstr "テスト中"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1600 ../intl-scm/guile-strings.c:1766
+#: ../intl-scm/guile-strings.c:1600
+#: ../intl-scm/guile-strings.c:1766
 msgid "Crash the report"
 msgstr "帳票をクラッシュさせる"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1602 ../intl-scm/guile-strings.c:1768
-msgid ""
-"This is for testing. Your reports probably shouldn't have an option like "
-"this."
-msgstr ""
-"これはテスト用です。あなたの帳票にはこんなオプションはない方がいいでしょう。"
+#: ../intl-scm/guile-strings.c:1602
+#: ../intl-scm/guile-strings.c:1768
+msgid "This is for testing. Your reports probably shouldn't have an option like this."
+msgstr "これはテスト用です。あなたの帳票にはこんなオプションはない方がいいでしょう。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1606 ../intl-scm/guile-strings.c:1772
+#: ../intl-scm/guile-strings.c:1606
+#: ../intl-scm/guile-strings.c:1772
 #, fuzzy
-msgid ""
-"This is a sample GnuCash report. See the guile (scheme) source code in the "
-"scm/report directory for details on writing your own reports, or extending "
-"existing reports."
-msgstr ""
-"これはGnuCashの帳票の例です。%s 内の guile(scheme)のソースコードを見ると、自"
-"分で新しく帳票を作成したり、既存の帳票を修正したりする際の詳細情報を得ること"
-"ができます。"
+msgid "This is a sample GnuCash report. See the guile (scheme) source code in the scm/report directory for details on writing your own reports, or extending existing reports."
+msgstr "これはGnuCashの帳票の例です。%s 内の guile(scheme)のソースコードを見ると、自分で新しく帳票を作成したり、既存の帳票を修正したりする際の詳細情報を得ることができます。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1608 ../intl-scm/guile-strings.c:1774
+#: ../intl-scm/guile-strings.c:1608
+#: ../intl-scm/guile-strings.c:1774
 #, c-format
-msgid ""
-"For help on writing reports, or to contribute your brand new, totally cool "
-"report, consult the mailing list %s."
-msgstr ""
-"新しい帳票を書く手助けが欲しい、自分の新しい帳票やすばらしい帳票を提供したい"
-"場合、メーリングリスト %s にご連絡ください。"
+msgid "For help on writing reports, or to contribute your brand new, totally cool report, consult the mailing list %s."
+msgstr "新しい帳票を書く手助けが欲しい、自分の新しい帳票やすばらしい帳票を提供したい場合、メーリングリスト %s にご連絡ください。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1610 ../intl-scm/guile-strings.c:1776
+#: ../intl-scm/guile-strings.c:1610
+#: ../intl-scm/guile-strings.c:1776
 #, fuzzy
-msgid ""
-"For details on subscribing to that list, see &lt;http://www.gnucash.org/&gt;."
+msgid "For details on subscribing to that list, see &lt;http://www.gnucash.org/&gt;."
 msgstr "メーリングリストに参加するには %s をご覧ください。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1612 ../intl-scm/guile-strings.c:1778
+#: ../intl-scm/guile-strings.c:1612
+#: ../intl-scm/guile-strings.c:1778
 #, fuzzy
-msgid ""
-"You can learn more about writing scheme at &lt;http://www.scheme.com/tspl2d/"
-"&gt;."
+msgid "You can learn more about writing scheme at &lt;http://www.scheme.com/tspl2d/&gt;."
 msgstr "この %s を用いれば、schemeの書き方についてもっと学べます。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1614 ../intl-scm/guile-strings.c:1780
+#: ../intl-scm/guile-strings.c:1614
+#: ../intl-scm/guile-strings.c:1780
 #, c-format
 msgid "The current time is %s."
 msgstr "現在時刻は %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1616 ../intl-scm/guile-strings.c:1782
+#: ../intl-scm/guile-strings.c:1616
+#: ../intl-scm/guile-strings.c:1782
 #, c-format
 msgid "The boolean option is %s."
-msgstr "ブーリアンのオプションは %s です。"
+msgstr "論理値のオプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1618 ../intl-scm/guile-strings.c:1784
+#: ../intl-scm/guile-strings.c:1618
+#: ../intl-scm/guile-strings.c:1784
 msgid "true"
 msgstr "真"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1620 ../intl-scm/guile-strings.c:1786
+#: ../intl-scm/guile-strings.c:1620
+#: ../intl-scm/guile-strings.c:1786
 msgid "false"
 msgstr "偽"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1622 ../intl-scm/guile-strings.c:1788
+#: ../intl-scm/guile-strings.c:1622
+#: ../intl-scm/guile-strings.c:1788
 #, c-format
 msgid "The multi-choice option is %s."
 msgstr "複選択肢のオプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1624 ../intl-scm/guile-strings.c:1790
+#: ../intl-scm/guile-strings.c:1624
+#: ../intl-scm/guile-strings.c:1790
 #, c-format
 msgid "The string option is %s."
 msgstr "文字列のオプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1626 ../intl-scm/guile-strings.c:1792
+#: ../intl-scm/guile-strings.c:1626
+#: ../intl-scm/guile-strings.c:1792
 #, c-format
 msgid "The date option is %s."
 msgstr "日付のオプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1628 ../intl-scm/guile-strings.c:1794
+#: ../intl-scm/guile-strings.c:1628
+#: ../intl-scm/guile-strings.c:1794
 #, c-format
 msgid "The date and time option is %s."
 msgstr "日付および時間のオプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1630 ../intl-scm/guile-strings.c:1796
+#: ../intl-scm/guile-strings.c:1630
+#: ../intl-scm/guile-strings.c:1796
 #, c-format
 msgid "The relative date option is %s."
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1632 ../intl-scm/guile-strings.c:1798
+#: ../intl-scm/guile-strings.c:1632
+#: ../intl-scm/guile-strings.c:1798
 #, c-format
 msgid "The combination date option is %s."
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1634 ../intl-scm/guile-strings.c:1800
+#: ../intl-scm/guile-strings.c:1634
+#: ../intl-scm/guile-strings.c:1800
 #, c-format
 msgid "The number option is %s."
 msgstr "数値オプションは %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1636 ../intl-scm/guile-strings.c:1802
+#: ../intl-scm/guile-strings.c:1636
+#: ../intl-scm/guile-strings.c:1802
 #, c-format
 msgid "The number option formatted as currency is %s."
 msgstr "数値オプションを通貨としてフォーマットすると %s です。"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1638 ../intl-scm/guile-strings.c:1804
+#: ../intl-scm/guile-strings.c:1638
+#: ../intl-scm/guile-strings.c:1804
 msgid "Items you selected:"
 msgstr "選択したアイテム:"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1640 ../intl-scm/guile-strings.c:1806
+#: ../intl-scm/guile-strings.c:1640
+#: ../intl-scm/guile-strings.c:1806
 msgid "List items selected"
 msgstr "選択されたアイテム一覧"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1642 ../intl-scm/guile-strings.c:1808
+#: ../intl-scm/guile-strings.c:1642
+#: ../intl-scm/guile-strings.c:1808
 msgid "(You selected no list items.)"
 msgstr "(アイテム一覧が選択されてません)"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1644 ../intl-scm/guile-strings.c:1810
+#: ../intl-scm/guile-strings.c:1644
+#: ../intl-scm/guile-strings.c:1810
 msgid "You have selected no accounts."
 msgstr "勘定科目が一つも選択されていません"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1646 ../intl-scm/guile-strings.c:1812
+#: ../intl-scm/guile-strings.c:1646
+#: ../intl-scm/guile-strings.c:1812
 msgid "Have a nice day!"
 msgstr "Have a nice day!"
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1650 ../intl-scm/guile-strings.c:1816
+#: ../intl-scm/guile-strings.c:1650
+#: ../intl-scm/guile-strings.c:1816
 msgid "Sample Report with Examples"
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1652 ../intl-scm/guile-strings.c:1818
+#: ../intl-scm/guile-strings.c:1652
+#: ../intl-scm/guile-strings.c:1818
 msgid "A sample report with examples."
 msgstr ""
 
 #. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1654 ../intl-scm/guile-strings.c:1660
-#: ../intl-scm/guile-strings.c:1820 ../intl-scm/guile-strings.c:1826
+#: ../intl-scm/guile-strings.c:1654
+#: ../intl-scm/guile-strings.c:1660
+#: ../intl-scm/guile-strings.c:1820
+#: ../intl-scm/guile-strings.c:1826
 #, fuzzy
 msgid "Welcome to GnuCash"
 msgstr "GnuCash 1.6へようこそ"
 
 #. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1656 ../intl-scm/guile-strings.c:1822
+#: ../intl-scm/guile-strings.c:1656
+#: ../intl-scm/guile-strings.c:1822
 #, fuzzy
 msgid "Welcome to GnuCash 2.0!"
 msgstr "GnuCash 1.6にようこそ!"
 
 #. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1658 ../intl-scm/guile-strings.c:1824
+#: ../intl-scm/guile-strings.c:1658
+#: ../intl-scm/guile-strings.c:1824
 #, fuzzy
 msgid "GnuCash 2.0 has lots of nice features. Here are a few."
-msgstr ""
-"GnuCash 1.6にはたくさんの素晴らしい機能があります。ここで少し紹介します。"
+msgstr "GnuCash 1.6にはたくさんの素晴らしい機能があります。ここで少し紹介します。"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
@@ -18008,18 +17405,30 @@
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:1828 ../intl-scm/guile-strings.c:1914
-#: ../intl-scm/guile-strings.c:2004 ../intl-scm/guile-strings.c:2374
-#: ../intl-scm/guile-strings.c:2452 ../intl-scm/guile-strings.c:2538
-#: ../intl-scm/guile-strings.c:2628 ../intl-scm/guile-strings.c:2998
-#: ../intl-scm/guile-strings.c:3602 ../intl-scm/guile-strings.c:4028
-#: ../intl-scm/guile-strings.c:4114 ../intl-scm/guile-strings.c:4188
-#: ../intl-scm/guile-strings.c:4756 ../intl-scm/guile-strings.c:5182
-#: ../intl-scm/guile-strings.c:5268 ../intl-scm/guile-strings.c:5342
-#: ../intl-scm/guile-strings.c:5386 ../intl-scm/guile-strings.c:5476
-#: ../intl-scm/guile-strings.c:5566 ../intl-scm/guile-strings.c:5656
-#: ../intl-scm/guile-strings.c:6164 ../intl-scm/guile-strings.c:6200
-#: ../intl-scm/guile-strings.c:6688 ../intl-scm/guile-strings.c:6724
+#: ../intl-scm/guile-strings.c:1828
+#: ../intl-scm/guile-strings.c:1914
+#: ../intl-scm/guile-strings.c:2004
+#: ../intl-scm/guile-strings.c:2374
+#: ../intl-scm/guile-strings.c:2452
+#: ../intl-scm/guile-strings.c:2538
+#: ../intl-scm/guile-strings.c:2628
+#: ../intl-scm/guile-strings.c:2998
+#: ../intl-scm/guile-strings.c:3602
+#: ../intl-scm/guile-strings.c:4028
+#: ../intl-scm/guile-strings.c:4114
+#: ../intl-scm/guile-strings.c:4188
+#: ../intl-scm/guile-strings.c:4756
+#: ../intl-scm/guile-strings.c:5182
+#: ../intl-scm/guile-strings.c:5268
+#: ../intl-scm/guile-strings.c:5342
+#: ../intl-scm/guile-strings.c:5386
+#: ../intl-scm/guile-strings.c:5476
+#: ../intl-scm/guile-strings.c:5566
+#: ../intl-scm/guile-strings.c:5656
+#: ../intl-scm/guile-strings.c:6164
+#: ../intl-scm/guile-strings.c:6200
+#: ../intl-scm/guile-strings.c:6688
+#: ../intl-scm/guile-strings.c:6724
 msgid "From"
 msgstr "開始日"
 
@@ -18047,20 +17456,34 @@
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1830 ../intl-scm/guile-strings.c:1916
-#: ../intl-scm/guile-strings.c:2006 ../intl-scm/guile-strings.c:2376
-#: ../intl-scm/guile-strings.c:2454 ../intl-scm/guile-strings.c:2540
-#: ../intl-scm/guile-strings.c:2630 ../intl-scm/guile-strings.c:3000
-#: ../intl-scm/guile-strings.c:3604 ../intl-scm/guile-strings.c:4030
-#: ../intl-scm/guile-strings.c:4116 ../intl-scm/guile-strings.c:4190
-#: ../intl-scm/guile-strings.c:4758 ../intl-scm/guile-strings.c:5184
-#: ../intl-scm/guile-strings.c:5270 ../intl-scm/guile-strings.c:5344
-#: ../intl-scm/guile-strings.c:5388 ../intl-scm/guile-strings.c:5478
-#: ../intl-scm/guile-strings.c:5568 ../intl-scm/guile-strings.c:5658
-#: ../intl-scm/guile-strings.c:6166 ../intl-scm/guile-strings.c:6202
-#: ../intl-scm/guile-strings.c:6690 ../intl-scm/guile-strings.c:6726
-#: ../intl-scm/guile-strings.c:6958 ../intl-scm/guile-strings.c:7014
-#: ../intl-scm/guile-strings.c:7198 ../intl-scm/guile-strings.c:7254
+#: ../intl-scm/guile-strings.c:1830
+#: ../intl-scm/guile-strings.c:1916
+#: ../intl-scm/guile-strings.c:2006
+#: ../intl-scm/guile-strings.c:2376
+#: ../intl-scm/guile-strings.c:2454
+#: ../intl-scm/guile-strings.c:2540
+#: ../intl-scm/guile-strings.c:2630
+#: ../intl-scm/guile-strings.c:3000
+#: ../intl-scm/guile-strings.c:3604
+#: ../intl-scm/guile-strings.c:4030
+#: ../intl-scm/guile-strings.c:4116
+#: ../intl-scm/guile-strings.c:4190
+#: ../intl-scm/guile-strings.c:4758
+#: ../intl-scm/guile-strings.c:5184
+#: ../intl-scm/guile-strings.c:5270
+#: ../intl-scm/guile-strings.c:5344
+#: ../intl-scm/guile-strings.c:5388
+#: ../intl-scm/guile-strings.c:5478
+#: ../intl-scm/guile-strings.c:5568
+#: ../intl-scm/guile-strings.c:5658
+#: ../intl-scm/guile-strings.c:6166
+#: ../intl-scm/guile-strings.c:6202
+#: ../intl-scm/guile-strings.c:6690
+#: ../intl-scm/guile-strings.c:6726
+#: ../intl-scm/guile-strings.c:6958
+#: ../intl-scm/guile-strings.c:7014
+#: ../intl-scm/guile-strings.c:7198
+#: ../intl-scm/guile-strings.c:7254
 msgid "To"
 msgstr "終了日"
 
@@ -18072,10 +17495,14 @@
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:1832 ../intl-scm/guile-strings.c:1918
-#: ../intl-scm/guile-strings.c:2378 ../intl-scm/guile-strings.c:2456
-#: ../intl-scm/guile-strings.c:2542 ../intl-scm/guile-strings.c:3002
-#: ../intl-scm/guile-strings.c:4032 ../intl-scm/guile-strings.c:5186
+#: ../intl-scm/guile-strings.c:1832
+#: ../intl-scm/guile-strings.c:1918
+#: ../intl-scm/guile-strings.c:2378
+#: ../intl-scm/guile-strings.c:2456
+#: ../intl-scm/guile-strings.c:2542
+#: ../intl-scm/guile-strings.c:3002
+#: ../intl-scm/guile-strings.c:4032
+#: ../intl-scm/guile-strings.c:5186
 msgid "Step Size"
 msgstr "ステップサイズ"
 
@@ -18105,25 +17532,39 @@
 #. src/report/standard-reports/account-piecharts.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1836 ../intl-scm/guile-strings.c:1920
-#: ../intl-scm/guile-strings.c:2014 ../intl-scm/guile-strings.c:2116
-#: ../intl-scm/guile-strings.c:2304 ../intl-scm/guile-strings.c:2380
-#: ../intl-scm/guile-strings.c:2460 ../intl-scm/guile-strings.c:2544
-#: ../intl-scm/guile-strings.c:2638 ../intl-scm/guile-strings.c:2740
-#: ../intl-scm/guile-strings.c:2928 ../intl-scm/guile-strings.c:3004
-#: ../intl-scm/guile-strings.c:3150 ../intl-scm/guile-strings.c:3254
-#: ../intl-scm/guile-strings.c:3420 ../intl-scm/guile-strings.c:4034
-#: ../intl-scm/guile-strings.c:4118 ../intl-scm/guile-strings.c:4192
-#: ../intl-scm/guile-strings.c:4304 ../intl-scm/guile-strings.c:4408
-#: ../intl-scm/guile-strings.c:4574 ../intl-scm/guile-strings.c:5188
-#: ../intl-scm/guile-strings.c:5272 ../intl-scm/guile-strings.c:5346
-#: ../intl-scm/guile-strings.c:6964 ../intl-scm/guile-strings.c:7204
+#: ../intl-scm/guile-strings.c:1836
+#: ../intl-scm/guile-strings.c:1920
+#: ../intl-scm/guile-strings.c:2014
+#: ../intl-scm/guile-strings.c:2116
+#: ../intl-scm/guile-strings.c:2304
+#: ../intl-scm/guile-strings.c:2380
+#: ../intl-scm/guile-strings.c:2460
+#: ../intl-scm/guile-strings.c:2544
+#: ../intl-scm/guile-strings.c:2638
+#: ../intl-scm/guile-strings.c:2740
+#: ../intl-scm/guile-strings.c:2928
+#: ../intl-scm/guile-strings.c:3004
+#: ../intl-scm/guile-strings.c:3150
+#: ../intl-scm/guile-strings.c:3254
+#: ../intl-scm/guile-strings.c:3420
+#: ../intl-scm/guile-strings.c:4034
+#: ../intl-scm/guile-strings.c:4118
+#: ../intl-scm/guile-strings.c:4192
+#: ../intl-scm/guile-strings.c:4304
+#: ../intl-scm/guile-strings.c:4408
+#: ../intl-scm/guile-strings.c:4574
+#: ../intl-scm/guile-strings.c:5188
+#: ../intl-scm/guile-strings.c:5272
+#: ../intl-scm/guile-strings.c:5346
+#: ../intl-scm/guile-strings.c:6964
+#: ../intl-scm/guile-strings.c:7204
 msgid "Report's currency"
 msgstr "帳票の通貨"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1838 ../intl-scm/guile-strings.c:2462
+#: ../intl-scm/guile-strings.c:1838
+#: ../intl-scm/guile-strings.c:2462
 msgid "Price of Commodity"
 msgstr "金融商品の価格"
 
@@ -18159,22 +17600,38 @@
 #. src/report/standard-reports/account-piecharts.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1840 ../intl-scm/guile-strings.c:1922
-#: ../intl-scm/guile-strings.c:2016 ../intl-scm/guile-strings.c:2118
-#: ../intl-scm/guile-strings.c:2306 ../intl-scm/guile-strings.c:2382
-#: ../intl-scm/guile-strings.c:2420 ../intl-scm/guile-strings.c:2464
-#: ../intl-scm/guile-strings.c:2546 ../intl-scm/guile-strings.c:2640
-#: ../intl-scm/guile-strings.c:2742 ../intl-scm/guile-strings.c:2930
-#: ../intl-scm/guile-strings.c:3006 ../intl-scm/guile-strings.c:3044
-#: ../intl-scm/guile-strings.c:3152 ../intl-scm/guile-strings.c:3256
-#: ../intl-scm/guile-strings.c:3292 ../intl-scm/guile-strings.c:3422
-#: ../intl-scm/guile-strings.c:4008 ../intl-scm/guile-strings.c:4036
-#: ../intl-scm/guile-strings.c:4120 ../intl-scm/guile-strings.c:4194
-#: ../intl-scm/guile-strings.c:4306 ../intl-scm/guile-strings.c:4410
-#: ../intl-scm/guile-strings.c:4446 ../intl-scm/guile-strings.c:4576
-#: ../intl-scm/guile-strings.c:5162 ../intl-scm/guile-strings.c:5190
-#: ../intl-scm/guile-strings.c:5274 ../intl-scm/guile-strings.c:5348
-#: ../intl-scm/guile-strings.c:6966 ../intl-scm/guile-strings.c:7206
+#: ../intl-scm/guile-strings.c:1840
+#: ../intl-scm/guile-strings.c:1922
+#: ../intl-scm/guile-strings.c:2016
+#: ../intl-scm/guile-strings.c:2118
+#: ../intl-scm/guile-strings.c:2306
+#: ../intl-scm/guile-strings.c:2382
+#: ../intl-scm/guile-strings.c:2420
+#: ../intl-scm/guile-strings.c:2464
+#: ../intl-scm/guile-strings.c:2546
+#: ../intl-scm/guile-strings.c:2640
+#: ../intl-scm/guile-strings.c:2742
+#: ../intl-scm/guile-strings.c:2930
+#: ../intl-scm/guile-strings.c:3006
+#: ../intl-scm/guile-strings.c:3044
+#: ../intl-scm/guile-strings.c:3152
+#: ../intl-scm/guile-strings.c:3256
+#: ../intl-scm/guile-strings.c:3292
+#: ../intl-scm/guile-strings.c:3422
+#: ../intl-scm/guile-strings.c:4008
+#: ../intl-scm/guile-strings.c:4036
+#: ../intl-scm/guile-strings.c:4120
+#: ../intl-scm/guile-strings.c:4194
+#: ../intl-scm/guile-strings.c:4306
+#: ../intl-scm/guile-strings.c:4410
+#: ../intl-scm/guile-strings.c:4446
+#: ../intl-scm/guile-strings.c:4576
+#: ../intl-scm/guile-strings.c:5162
+#: ../intl-scm/guile-strings.c:5190
+#: ../intl-scm/guile-strings.c:5274
+#: ../intl-scm/guile-strings.c:5348
+#: ../intl-scm/guile-strings.c:6966
+#: ../intl-scm/guile-strings.c:7206
 msgid "Price Source"
 msgstr "価格の建値元"
 
@@ -18182,8 +17639,10 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1844 ../intl-scm/guile-strings.c:1928
-#: ../intl-scm/guile-strings.c:2468 ../intl-scm/guile-strings.c:2552
+#: ../intl-scm/guile-strings.c:1844
+#: ../intl-scm/guile-strings.c:1928
+#: ../intl-scm/guile-strings.c:2468
+#: ../intl-scm/guile-strings.c:2552
 msgid "Show Net Profit"
 msgstr "純利益を表示"
 
@@ -18191,8 +17650,10 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1846 ../intl-scm/guile-strings.c:1930
-#: ../intl-scm/guile-strings.c:2470 ../intl-scm/guile-strings.c:2554
+#: ../intl-scm/guile-strings.c:1846
+#: ../intl-scm/guile-strings.c:1930
+#: ../intl-scm/guile-strings.c:2470
+#: ../intl-scm/guile-strings.c:2554
 msgid "Show Asset & Liability bars"
 msgstr "資産と負債の棒グラフを表示"
 
@@ -18200,20 +17661,24 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1848 ../intl-scm/guile-strings.c:1932
-#: ../intl-scm/guile-strings.c:2472 ../intl-scm/guile-strings.c:2556
+#: ../intl-scm/guile-strings.c:1848
+#: ../intl-scm/guile-strings.c:1932
+#: ../intl-scm/guile-strings.c:2472
+#: ../intl-scm/guile-strings.c:2556
 msgid "Show Net Worth bars"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1850 ../intl-scm/guile-strings.c:2474
+#: ../intl-scm/guile-strings.c:1850
+#: ../intl-scm/guile-strings.c:2474
 msgid "Marker"
 msgstr "マーカ"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1852 ../intl-scm/guile-strings.c:2476
+#: ../intl-scm/guile-strings.c:1852
+#: ../intl-scm/guile-strings.c:2476
 msgid "Marker Color"
 msgstr "マーカの色"
 
@@ -18229,13 +17694,20 @@
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1854 ../intl-scm/guile-strings.c:1934
-#: ../intl-scm/guile-strings.c:2394 ../intl-scm/guile-strings.c:2478
-#: ../intl-scm/guile-strings.c:2558 ../intl-scm/guile-strings.c:3018
-#: ../intl-scm/guile-strings.c:4070 ../intl-scm/guile-strings.c:4098
-#: ../intl-scm/guile-strings.c:4134 ../intl-scm/guile-strings.c:4206
-#: ../intl-scm/guile-strings.c:5224 ../intl-scm/guile-strings.c:5252
-#: ../intl-scm/guile-strings.c:5288 ../intl-scm/guile-strings.c:5360
+#: ../intl-scm/guile-strings.c:1854
+#: ../intl-scm/guile-strings.c:1934
+#: ../intl-scm/guile-strings.c:2394
+#: ../intl-scm/guile-strings.c:2478
+#: ../intl-scm/guile-strings.c:2558
+#: ../intl-scm/guile-strings.c:3018
+#: ../intl-scm/guile-strings.c:4070
+#: ../intl-scm/guile-strings.c:4098
+#: ../intl-scm/guile-strings.c:4134
+#: ../intl-scm/guile-strings.c:4206
+#: ../intl-scm/guile-strings.c:5224
+#: ../intl-scm/guile-strings.c:5252
+#: ../intl-scm/guile-strings.c:5288
+#: ../intl-scm/guile-strings.c:5360
 msgid "Plot Width"
 msgstr "プロット幅"
 
@@ -18251,49 +17723,62 @@
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1856 ../intl-scm/guile-strings.c:1936
-#: ../intl-scm/guile-strings.c:2396 ../intl-scm/guile-strings.c:2480
-#: ../intl-scm/guile-strings.c:2560 ../intl-scm/guile-strings.c:3020
-#: ../intl-scm/guile-strings.c:4072 ../intl-scm/guile-strings.c:4100
-#: ../intl-scm/guile-strings.c:4136 ../intl-scm/guile-strings.c:4208
-#: ../intl-scm/guile-strings.c:5226 ../intl-scm/guile-strings.c:5254
-#: ../intl-scm/guile-strings.c:5290 ../intl-scm/guile-strings.c:5362
+#: ../intl-scm/guile-strings.c:1856
+#: ../intl-scm/guile-strings.c:1936
+#: ../intl-scm/guile-strings.c:2396
+#: ../intl-scm/guile-strings.c:2480
+#: ../intl-scm/guile-strings.c:2560
+#: ../intl-scm/guile-strings.c:3020
+#: ../intl-scm/guile-strings.c:4072
+#: ../intl-scm/guile-strings.c:4100
+#: ../intl-scm/guile-strings.c:4136
+#: ../intl-scm/guile-strings.c:4208
+#: ../intl-scm/guile-strings.c:5226
+#: ../intl-scm/guile-strings.c:5254
+#: ../intl-scm/guile-strings.c:5290
+#: ../intl-scm/guile-strings.c:5362
 msgid "Plot Height"
 msgstr "プロット高"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1858 ../intl-scm/guile-strings.c:2482
+#: ../intl-scm/guile-strings.c:1858
+#: ../intl-scm/guile-strings.c:2482
 msgid "Calculate the price of this commodity."
 msgstr "この金融商品の価格を計算する"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1866 ../intl-scm/guile-strings.c:2490
+#: ../intl-scm/guile-strings.c:1866
+#: ../intl-scm/guile-strings.c:2490
 msgid "Actual Transactions"
 msgstr "実際の取引"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1868 ../intl-scm/guile-strings.c:2492
+#: ../intl-scm/guile-strings.c:1868
+#: ../intl-scm/guile-strings.c:2492
 msgid "The instantaneous price of actual currency transactions in the past"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1870 ../intl-scm/guile-strings.c:2494
+#: ../intl-scm/guile-strings.c:1870
+#: ../intl-scm/guile-strings.c:2494
 msgid "Price Database"
 msgstr "価格データベース"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1872 ../intl-scm/guile-strings.c:2496
+#: ../intl-scm/guile-strings.c:1872
+#: ../intl-scm/guile-strings.c:2496
 msgid "The recorded prices"
 msgstr "記録済の価格"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1874 ../intl-scm/guile-strings.c:2498
+#: ../intl-scm/guile-strings.c:1874
+#: ../intl-scm/guile-strings.c:2498
 msgid "Color of the marker"
 msgstr "マーカの色"
 
@@ -18313,97 +17798,107 @@
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1876 ../intl-scm/guile-strings.c:1948
-#: ../intl-scm/guile-strings.c:2150 ../intl-scm/guile-strings.c:2336
-#: ../intl-scm/guile-strings.c:2410 ../intl-scm/guile-strings.c:2500
-#: ../intl-scm/guile-strings.c:2572 ../intl-scm/guile-strings.c:2774
-#: ../intl-scm/guile-strings.c:2960 ../intl-scm/guile-strings.c:3034
-#: ../intl-scm/guile-strings.c:3456 ../intl-scm/guile-strings.c:4162
-#: ../intl-scm/guile-strings.c:4224 ../intl-scm/guile-strings.c:4610
-#: ../intl-scm/guile-strings.c:5316 ../intl-scm/guile-strings.c:5378
+#: ../intl-scm/guile-strings.c:1876
+#: ../intl-scm/guile-strings.c:1948
+#: ../intl-scm/guile-strings.c:2150
+#: ../intl-scm/guile-strings.c:2336
+#: ../intl-scm/guile-strings.c:2410
+#: ../intl-scm/guile-strings.c:2500
+#: ../intl-scm/guile-strings.c:2572
+#: ../intl-scm/guile-strings.c:2774
+#: ../intl-scm/guile-strings.c:2960
+#: ../intl-scm/guile-strings.c:3034
+#: ../intl-scm/guile-strings.c:3456
+#: ../intl-scm/guile-strings.c:4162
+#: ../intl-scm/guile-strings.c:4224
+#: ../intl-scm/guile-strings.c:4610
+#: ../intl-scm/guile-strings.c:5316
+#: ../intl-scm/guile-strings.c:5378
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1882 ../intl-scm/guile-strings.c:2506
+#: ../intl-scm/guile-strings.c:1882
+#: ../intl-scm/guile-strings.c:2506
 msgid "Double-Weeks"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1888 ../intl-scm/guile-strings.c:2512
+#: ../intl-scm/guile-strings.c:1888
+#: ../intl-scm/guile-strings.c:2512
 msgid "All Prices equal"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1890 ../intl-scm/guile-strings.c:2514
-msgid ""
-"All the prices found are equal. This would result in a plot with one "
-"straight line. Unfortunately, the plotting tool can't handle that."
+#: ../intl-scm/guile-strings.c:1890
+#: ../intl-scm/guile-strings.c:2514
+msgid "All the prices found are equal. This would result in a plot with one straight line. Unfortunately, the plotting tool can't handle that."
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1892 ../intl-scm/guile-strings.c:2516
+#: ../intl-scm/guile-strings.c:1892
+#: ../intl-scm/guile-strings.c:2516
 msgid "All Prices at the same date"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1894 ../intl-scm/guile-strings.c:2518
-msgid ""
-"All the prices found are from the same date. This would result in a plot "
-"with one straight line. Unfortunately, the plotting tool can't handle that."
+#: ../intl-scm/guile-strings.c:1894
+#: ../intl-scm/guile-strings.c:2518
+msgid "All the prices found are from the same date. This would result in a plot with one straight line. Unfortunately, the plotting tool can't handle that."
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1896 ../intl-scm/guile-strings.c:2520
+#: ../intl-scm/guile-strings.c:1896
+#: ../intl-scm/guile-strings.c:2520
 msgid "Only one price"
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1898 ../intl-scm/guile-strings.c:2522
-msgid ""
-"There was only one single price found for the selected commodities in the "
-"selected time period. This doesn't give a useful plot."
+#: ../intl-scm/guile-strings.c:1898
+#: ../intl-scm/guile-strings.c:2522
+msgid "There was only one single price found for the selected commodities in the selected time period. This doesn't give a useful plot."
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1902 ../intl-scm/guile-strings.c:2526
-msgid ""
-"There is no price information available for the selected commodities in the "
-"selected time period."
+#: ../intl-scm/guile-strings.c:1902
+#: ../intl-scm/guile-strings.c:2526
+msgid "There is no price information available for the selected commodities in the selected time period."
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1904 ../intl-scm/guile-strings.c:2528
+#: ../intl-scm/guile-strings.c:1904
+#: ../intl-scm/guile-strings.c:2528
 msgid "Identical commodities"
 msgstr "同一の金融商品"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1906 ../intl-scm/guile-strings.c:2530
-msgid ""
-"Your selected commodity and the currency of the report are identical. It "
-"doesn't make sense to show prices for identical commodities."
+#: ../intl-scm/guile-strings.c:1906
+#: ../intl-scm/guile-strings.c:2530
+msgid "Your selected commodity and the currency of the report are identical. It doesn't make sense to show prices for identical commodities."
 msgstr ""
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/gnucash/report/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1910 ../intl-scm/guile-strings.c:2534
+#: ../intl-scm/guile-strings.c:1910
+#: ../intl-scm/guile-strings.c:2534
 msgid "Price Scatterplot"
 msgstr ""
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1912 ../intl-scm/guile-strings.c:2536
+#: ../intl-scm/guile-strings.c:1912
+#: ../intl-scm/guile-strings.c:2536
 msgid "Income/Expense Chart"
 msgstr "所得・費用チャート"
 
@@ -18415,92 +17910,108 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1938 ../intl-scm/guile-strings.c:2400
-#: ../intl-scm/guile-strings.c:2562 ../intl-scm/guile-strings.c:3024
-#: ../intl-scm/guile-strings.c:4142 ../intl-scm/guile-strings.c:4212
-#: ../intl-scm/guile-strings.c:5296 ../intl-scm/guile-strings.c:5366
+#: ../intl-scm/guile-strings.c:1938
+#: ../intl-scm/guile-strings.c:2400
+#: ../intl-scm/guile-strings.c:2562
+#: ../intl-scm/guile-strings.c:3024
+#: ../intl-scm/guile-strings.c:4142
+#: ../intl-scm/guile-strings.c:4212
+#: ../intl-scm/guile-strings.c:5296
+#: ../intl-scm/guile-strings.c:5366
 msgid "Report on these accounts, if chosen account level allows."
 msgstr ""
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1940 ../intl-scm/guile-strings.c:2564
+#: ../intl-scm/guile-strings.c:1940
+#: ../intl-scm/guile-strings.c:2564
 msgid "Show Income and Expenses?"
 msgstr "収益と費用を表示しますか?"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1942 ../intl-scm/guile-strings.c:2566
+#: ../intl-scm/guile-strings.c:1942
+#: ../intl-scm/guile-strings.c:2566
 msgid "Show the Asset and the Liability bars?"
 msgstr "資産と負債の棒グラフを表示しますか?"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1944 ../intl-scm/guile-strings.c:2568
+#: ../intl-scm/guile-strings.c:1944
+#: ../intl-scm/guile-strings.c:2568
 msgid "Show the net profit?"
 msgstr "純利益を表示しますか?"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1946 ../intl-scm/guile-strings.c:2570
+#: ../intl-scm/guile-strings.c:1946
+#: ../intl-scm/guile-strings.c:2570
 msgid "Show a Net Worth bar?"
 msgstr ""
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1958 ../intl-scm/guile-strings.c:2582
+#: ../intl-scm/guile-strings.c:1958
+#: ../intl-scm/guile-strings.c:2582
 msgid "Net Profit"
 msgstr "純利益"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1960 ../intl-scm/guile-strings.c:2584
+#: ../intl-scm/guile-strings.c:1960
+#: ../intl-scm/guile-strings.c:2584
 msgid "Net Worth"
 msgstr ""
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1962 ../intl-scm/guile-strings.c:2586
+#: ../intl-scm/guile-strings.c:1962
+#: ../intl-scm/guile-strings.c:2586
 msgid "Income Chart"
 msgstr "収益チャート"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1964 ../intl-scm/guile-strings.c:2588
+#: ../intl-scm/guile-strings.c:1964
+#: ../intl-scm/guile-strings.c:2588
 msgid "Asset Chart"
 msgstr "資産チャート"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1966 ../intl-scm/guile-strings.c:2590
+#: ../intl-scm/guile-strings.c:1966
+#: ../intl-scm/guile-strings.c:2590
 msgid "Expense Chart"
 msgstr "費用チャート"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1968 ../intl-scm/guile-strings.c:2592
+#: ../intl-scm/guile-strings.c:1968
+#: ../intl-scm/guile-strings.c:2592
 msgid "Liability Chart"
 msgstr "負債チャート"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1970 ../intl-scm/guile-strings.c:2594
+#: ../intl-scm/guile-strings.c:1970
+#: ../intl-scm/guile-strings.c:2594
 msgid "Net Worth Barchart"
 msgstr "純資産棒グラフ"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/gnucash/report/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1972 ../intl-scm/guile-strings.c:2596
+#: ../intl-scm/guile-strings.c:1972
+#: ../intl-scm/guile-strings.c:2596
 #, fuzzy
 msgid "Income & Expense Chart"
 msgstr "所得・費用チャート"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/gnucash/report/general-journal.scm
-#: ../intl-scm/guile-strings.c:1974 ../intl-scm/guile-strings.c:2598
-#, fuzzy
+#: ../intl-scm/guile-strings.c:1974
+#: ../intl-scm/guile-strings.c:2598
 msgid "General Journal"
-msgstr "総勘定元帳の帳票"
+msgstr "一般仕訳帳"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
@@ -18510,11 +18021,16 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:1998 ../intl-scm/guile-strings.c:2212
-#: ../intl-scm/guile-strings.c:2622 ../intl-scm/guile-strings.c:2836
-#: ../intl-scm/guile-strings.c:3546 ../intl-scm/guile-strings.c:3816
-#: ../intl-scm/guile-strings.c:3972 ../intl-scm/guile-strings.c:4700
-#: ../intl-scm/guile-strings.c:4970 ../intl-scm/guile-strings.c:5126
+#: ../intl-scm/guile-strings.c:1998
+#: ../intl-scm/guile-strings.c:2212
+#: ../intl-scm/guile-strings.c:2622
+#: ../intl-scm/guile-strings.c:2836
+#: ../intl-scm/guile-strings.c:3546
+#: ../intl-scm/guile-strings.c:3816
+#: ../intl-scm/guile-strings.c:3972
+#: ../intl-scm/guile-strings.c:4700
+#: ../intl-scm/guile-strings.c:4970
+#: ../intl-scm/guile-strings.c:5126
 msgid "Running Balance"
 msgstr ""
 
@@ -18532,19 +18048,27 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:2000 ../intl-scm/guile-strings.c:2214
-#: ../intl-scm/guile-strings.c:2624 ../intl-scm/guile-strings.c:2838
-#: ../intl-scm/guile-strings.c:3820 ../intl-scm/guile-strings.c:3978
-#: ../intl-scm/guile-strings.c:4974 ../intl-scm/guile-strings.c:5132
-#: ../intl-scm/guile-strings.c:6004 ../intl-scm/guile-strings.c:6340
-#: ../intl-scm/guile-strings.c:6528 ../intl-scm/guile-strings.c:6864
-#: ../intl-scm/guile-strings.c:7106 ../intl-scm/guile-strings.c:7346
+#: ../intl-scm/guile-strings.c:2000
+#: ../intl-scm/guile-strings.c:2214
+#: ../intl-scm/guile-strings.c:2624
+#: ../intl-scm/guile-strings.c:2838
+#: ../intl-scm/guile-strings.c:3820
+#: ../intl-scm/guile-strings.c:3978
+#: ../intl-scm/guile-strings.c:4974
+#: ../intl-scm/guile-strings.c:5132
+#: ../intl-scm/guile-strings.c:6004
+#: ../intl-scm/guile-strings.c:6340
+#: ../intl-scm/guile-strings.c:6528
+#: ../intl-scm/guile-strings.c:6864
+#: ../intl-scm/guile-strings.c:7106
+#: ../intl-scm/guile-strings.c:7346
 msgid "Totals"
 msgstr "合計"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2002 ../intl-scm/guile-strings.c:2626
+#: ../intl-scm/guile-strings.c:2002
+#: ../intl-scm/guile-strings.c:2626
 #, fuzzy
 msgid "Cash Flow"
 msgstr "現金"
@@ -18553,8 +18077,10 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2008 ../intl-scm/guile-strings.c:2632
-#: ../intl-scm/guile-strings.c:4002 ../intl-scm/guile-strings.c:5156
+#: ../intl-scm/guile-strings.c:2008
+#: ../intl-scm/guile-strings.c:2632
+#: ../intl-scm/guile-strings.c:4002
+#: ../intl-scm/guile-strings.c:5156
 msgid "Account Display Depth"
 msgstr ""
 
@@ -18562,8 +18088,10 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2010 ../intl-scm/guile-strings.c:2634
-#: ../intl-scm/guile-strings.c:4004 ../intl-scm/guile-strings.c:5158
+#: ../intl-scm/guile-strings.c:2010
+#: ../intl-scm/guile-strings.c:2634
+#: ../intl-scm/guile-strings.c:4004
+#: ../intl-scm/guile-strings.c:5158
 msgid "Always show sub-accounts"
 msgstr "常に子勘定科目を表示"
 
@@ -18581,13 +18109,20 @@
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2018 ../intl-scm/guile-strings.c:2124
-#: ../intl-scm/guile-strings.c:2312 ../intl-scm/guile-strings.c:2642
-#: ../intl-scm/guile-strings.c:2748 ../intl-scm/guile-strings.c:2936
-#: ../intl-scm/guile-strings.c:3158 ../intl-scm/guile-strings.c:3262
-#: ../intl-scm/guile-strings.c:3428 ../intl-scm/guile-strings.c:4010
-#: ../intl-scm/guile-strings.c:4312 ../intl-scm/guile-strings.c:4416
-#: ../intl-scm/guile-strings.c:4582 ../intl-scm/guile-strings.c:5164
+#: ../intl-scm/guile-strings.c:2018
+#: ../intl-scm/guile-strings.c:2124
+#: ../intl-scm/guile-strings.c:2312
+#: ../intl-scm/guile-strings.c:2642
+#: ../intl-scm/guile-strings.c:2748
+#: ../intl-scm/guile-strings.c:2936
+#: ../intl-scm/guile-strings.c:3158
+#: ../intl-scm/guile-strings.c:3262
+#: ../intl-scm/guile-strings.c:3428
+#: ../intl-scm/guile-strings.c:4010
+#: ../intl-scm/guile-strings.c:4312
+#: ../intl-scm/guile-strings.c:4416
+#: ../intl-scm/guile-strings.c:4582
+#: ../intl-scm/guile-strings.c:5164
 msgid "Show Exchange Rates"
 msgstr "為替レートを表示"
 
@@ -18595,8 +18130,10 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2020 ../intl-scm/guile-strings.c:2644
-#: ../intl-scm/guile-strings.c:4012 ../intl-scm/guile-strings.c:5166
+#: ../intl-scm/guile-strings.c:2020
+#: ../intl-scm/guile-strings.c:2644
+#: ../intl-scm/guile-strings.c:4012
+#: ../intl-scm/guile-strings.c:5166
 #, fuzzy
 msgid "Show Full Account Names"
 msgstr "勘定科目名をすべて使いますか?"
@@ -18613,12 +18150,18 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2022 ../intl-scm/guile-strings.c:2126
-#: ../intl-scm/guile-strings.c:2314 ../intl-scm/guile-strings.c:2646
-#: ../intl-scm/guile-strings.c:2750 ../intl-scm/guile-strings.c:2938
-#: ../intl-scm/guile-strings.c:3160 ../intl-scm/guile-strings.c:3264
-#: ../intl-scm/guile-strings.c:3430 ../intl-scm/guile-strings.c:4314
-#: ../intl-scm/guile-strings.c:4418 ../intl-scm/guile-strings.c:4584
+#: ../intl-scm/guile-strings.c:2022
+#: ../intl-scm/guile-strings.c:2126
+#: ../intl-scm/guile-strings.c:2314
+#: ../intl-scm/guile-strings.c:2646
+#: ../intl-scm/guile-strings.c:2750
+#: ../intl-scm/guile-strings.c:2938
+#: ../intl-scm/guile-strings.c:3160
+#: ../intl-scm/guile-strings.c:3264
+#: ../intl-scm/guile-strings.c:3430
+#: ../intl-scm/guile-strings.c:4314
+#: ../intl-scm/guile-strings.c:4418
+#: ../intl-scm/guile-strings.c:4584
 msgid "Show the exchange rates used"
 msgstr "使用している為替レートを表示"
 
@@ -18626,36 +18169,42 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2024 ../intl-scm/guile-strings.c:2648
-#: ../intl-scm/guile-strings.c:4018 ../intl-scm/guile-strings.c:5172
+#: ../intl-scm/guile-strings.c:2024
+#: ../intl-scm/guile-strings.c:2648
+#: ../intl-scm/guile-strings.c:4018
+#: ../intl-scm/guile-strings.c:5172
 #, fuzzy
 msgid "Show full account names (including parent accounts)"
 msgstr "凡例に長い勘定科目名を表示しますか?"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2026 ../intl-scm/guile-strings.c:2650
+#: ../intl-scm/guile-strings.c:2026
+#: ../intl-scm/guile-strings.c:2650
 #, c-format
 msgid "%s - %s to %s for"
 msgstr ""
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2028 ../intl-scm/guile-strings.c:2652
+#: ../intl-scm/guile-strings.c:2028
+#: ../intl-scm/guile-strings.c:2652
 #, fuzzy, c-format
 msgid "%s and subaccounts"
 msgstr "子勘定科目を含める"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2030 ../intl-scm/guile-strings.c:2654
+#: ../intl-scm/guile-strings.c:2030
+#: ../intl-scm/guile-strings.c:2654
 #, fuzzy, c-format
 msgid "%s and selected subaccounts"
 msgstr "選択された勘定項目:"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2034 ../intl-scm/guile-strings.c:2658
+#: ../intl-scm/guile-strings.c:2034
+#: ../intl-scm/guile-strings.c:2658
 #, fuzzy
 msgid "Money into selected accounts comes from"
 msgstr "選択された勘定科目を照合する"
@@ -18664,15 +18213,18 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2036 ../intl-scm/guile-strings.c:2660
-#: ../intl-scm/guile-strings.c:3380 ../intl-scm/guile-strings.c:4534
+#: ../intl-scm/guile-strings.c:2036
+#: ../intl-scm/guile-strings.c:2660
+#: ../intl-scm/guile-strings.c:3380
+#: ../intl-scm/guile-strings.c:4534
 #, fuzzy
 msgid "Money In"
 msgstr "マネーマーケット"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2038 ../intl-scm/guile-strings.c:2662
+#: ../intl-scm/guile-strings.c:2038
+#: ../intl-scm/guile-strings.c:2662
 #, fuzzy
 msgid "Money out of selected accounts goes to"
 msgstr "選択された勘定科目全ての補助科目を含む"
@@ -18681,23 +18233,28 @@
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2040 ../intl-scm/guile-strings.c:2664
-#: ../intl-scm/guile-strings.c:3382 ../intl-scm/guile-strings.c:4536
+#: ../intl-scm/guile-strings.c:2040
+#: ../intl-scm/guile-strings.c:2664
+#: ../intl-scm/guile-strings.c:3382
+#: ../intl-scm/guile-strings.c:4536
 #, fuzzy
 msgid "Money Out"
 msgstr "マネーマーケット"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/gnucash/report/cash-flow.scm
-#: ../intl-scm/guile-strings.c:2042 ../intl-scm/guile-strings.c:2666
+#: ../intl-scm/guile-strings.c:2042
+#: ../intl-scm/guile-strings.c:2666
 #, fuzzy
 msgid "Difference"
 msgstr "差分:"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2044 ../intl-scm/guile-strings.c:2154
-#: ../intl-scm/guile-strings.c:2668 ../intl-scm/guile-strings.c:2778
+#: ../intl-scm/guile-strings.c:2044
+#: ../intl-scm/guile-strings.c:2154
+#: ../intl-scm/guile-strings.c:2668
+#: ../intl-scm/guile-strings.c:2778
 #, fuzzy
 msgid "Trial Balance"
 msgstr "平均残高"
@@ -18712,11 +18269,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2046 ../intl-scm/guile-strings.c:2242
-#: ../intl-scm/guile-strings.c:2670 ../intl-scm/guile-strings.c:2866
-#: ../intl-scm/guile-strings.c:3078 ../intl-scm/guile-strings.c:3190
-#: ../intl-scm/guile-strings.c:3398 ../intl-scm/guile-strings.c:4232
-#: ../intl-scm/guile-strings.c:4344 ../intl-scm/guile-strings.c:4552
+#: ../intl-scm/guile-strings.c:2046
+#: ../intl-scm/guile-strings.c:2242
+#: ../intl-scm/guile-strings.c:2670
+#: ../intl-scm/guile-strings.c:2866
+#: ../intl-scm/guile-strings.c:3078
+#: ../intl-scm/guile-strings.c:3190
+#: ../intl-scm/guile-strings.c:3398
+#: ../intl-scm/guile-strings.c:4232
+#: ../intl-scm/guile-strings.c:4344
+#: ../intl-scm/guile-strings.c:4552
 #, fuzzy
 msgid "Report Title"
 msgstr "帳票のスタイル"
@@ -18731,11 +18293,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2048 ../intl-scm/guile-strings.c:2244
-#: ../intl-scm/guile-strings.c:2672 ../intl-scm/guile-strings.c:2868
-#: ../intl-scm/guile-strings.c:3080 ../intl-scm/guile-strings.c:3192
-#: ../intl-scm/guile-strings.c:3400 ../intl-scm/guile-strings.c:4234
-#: ../intl-scm/guile-strings.c:4346 ../intl-scm/guile-strings.c:4554
+#: ../intl-scm/guile-strings.c:2048
+#: ../intl-scm/guile-strings.c:2244
+#: ../intl-scm/guile-strings.c:2672
+#: ../intl-scm/guile-strings.c:2868
+#: ../intl-scm/guile-strings.c:3080
+#: ../intl-scm/guile-strings.c:3192
+#: ../intl-scm/guile-strings.c:3400
+#: ../intl-scm/guile-strings.c:4234
+#: ../intl-scm/guile-strings.c:4346
+#: ../intl-scm/guile-strings.c:4554
 #, fuzzy
 msgid "Title for this report"
 msgstr "帳票のタイトル"
@@ -18750,11 +18317,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2050 ../intl-scm/guile-strings.c:2246
-#: ../intl-scm/guile-strings.c:2674 ../intl-scm/guile-strings.c:2870
-#: ../intl-scm/guile-strings.c:3082 ../intl-scm/guile-strings.c:3194
-#: ../intl-scm/guile-strings.c:3402 ../intl-scm/guile-strings.c:4236
-#: ../intl-scm/guile-strings.c:4348 ../intl-scm/guile-strings.c:4556
+#: ../intl-scm/guile-strings.c:2050
+#: ../intl-scm/guile-strings.c:2246
+#: ../intl-scm/guile-strings.c:2674
+#: ../intl-scm/guile-strings.c:2870
+#: ../intl-scm/guile-strings.c:3082
+#: ../intl-scm/guile-strings.c:3194
+#: ../intl-scm/guile-strings.c:3402
+#: ../intl-scm/guile-strings.c:4236
+#: ../intl-scm/guile-strings.c:4348
+#: ../intl-scm/guile-strings.c:4556
 #, fuzzy
 msgid "Company name"
 msgstr "会社のロゴ画像"
@@ -18769,37 +18341,46 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2052 ../intl-scm/guile-strings.c:2248
-#: ../intl-scm/guile-strings.c:2676 ../intl-scm/guile-strings.c:2872
-#: ../intl-scm/guile-strings.c:3084 ../intl-scm/guile-strings.c:3196
-#: ../intl-scm/guile-strings.c:3404 ../intl-scm/guile-strings.c:4238
-#: ../intl-scm/guile-strings.c:4350 ../intl-scm/guile-strings.c:4558
+#: ../intl-scm/guile-strings.c:2052
+#: ../intl-scm/guile-strings.c:2248
+#: ../intl-scm/guile-strings.c:2676
+#: ../intl-scm/guile-strings.c:2872
+#: ../intl-scm/guile-strings.c:3084
+#: ../intl-scm/guile-strings.c:3196
+#: ../intl-scm/guile-strings.c:3404
+#: ../intl-scm/guile-strings.c:4238
+#: ../intl-scm/guile-strings.c:4350
+#: ../intl-scm/guile-strings.c:4558
 #, fuzzy
 msgid "Name of company/individual"
 msgstr "列数"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2054 ../intl-scm/guile-strings.c:2678
+#: ../intl-scm/guile-strings.c:2054
+#: ../intl-scm/guile-strings.c:2678
 msgid "Start of Adjusting/Closing"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2056 ../intl-scm/guile-strings.c:2680
+#: ../intl-scm/guile-strings.c:2056
+#: ../intl-scm/guile-strings.c:2680
 msgid "Date of Report"
 msgstr "帳票の日付"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2058 ../intl-scm/guile-strings.c:2682
+#: ../intl-scm/guile-strings.c:2058
+#: ../intl-scm/guile-strings.c:2682
 #, fuzzy
 msgid "Report variation"
 msgstr "帳票名"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2060 ../intl-scm/guile-strings.c:2684
+#: ../intl-scm/guile-strings.c:2060
+#: ../intl-scm/guile-strings.c:2684
 msgid "Kind of trial balance to generate"
 msgstr ""
 
@@ -18813,11 +18394,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2062 ../intl-scm/guile-strings.c:2254
-#: ../intl-scm/guile-strings.c:2686 ../intl-scm/guile-strings.c:2878
-#: ../intl-scm/guile-strings.c:3092 ../intl-scm/guile-strings.c:3200
-#: ../intl-scm/guile-strings.c:3410 ../intl-scm/guile-strings.c:4246
-#: ../intl-scm/guile-strings.c:4354 ../intl-scm/guile-strings.c:4564
+#: ../intl-scm/guile-strings.c:2062
+#: ../intl-scm/guile-strings.c:2254
+#: ../intl-scm/guile-strings.c:2686
+#: ../intl-scm/guile-strings.c:2878
+#: ../intl-scm/guile-strings.c:3092
+#: ../intl-scm/guile-strings.c:3200
+#: ../intl-scm/guile-strings.c:3410
+#: ../intl-scm/guile-strings.c:4246
+#: ../intl-scm/guile-strings.c:4354
+#: ../intl-scm/guile-strings.c:4564
 #, fuzzy
 msgid "Accounts to include"
 msgstr "勘定科目コード"
@@ -18826,8 +18412,10 @@
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2064 ../intl-scm/guile-strings.c:2688
-#: ../intl-scm/guile-strings.c:3624 ../intl-scm/guile-strings.c:4778
+#: ../intl-scm/guile-strings.c:2064
+#: ../intl-scm/guile-strings.c:2688
+#: ../intl-scm/guile-strings.c:3624
+#: ../intl-scm/guile-strings.c:4778
 #, fuzzy
 msgid "Report on these accounts"
 msgstr "この勘定科目について取引帳票を実行する"
@@ -18840,10 +18428,14 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2066 ../intl-scm/guile-strings.c:2258
-#: ../intl-scm/guile-strings.c:2690 ../intl-scm/guile-strings.c:2882
-#: ../intl-scm/guile-strings.c:3096 ../intl-scm/guile-strings.c:3204
-#: ../intl-scm/guile-strings.c:4250 ../intl-scm/guile-strings.c:4358
+#: ../intl-scm/guile-strings.c:2066
+#: ../intl-scm/guile-strings.c:2258
+#: ../intl-scm/guile-strings.c:2690
+#: ../intl-scm/guile-strings.c:2882
+#: ../intl-scm/guile-strings.c:3096
+#: ../intl-scm/guile-strings.c:3204
+#: ../intl-scm/guile-strings.c:4250
+#: ../intl-scm/guile-strings.c:4358
 msgid "Levels of Subaccounts"
 msgstr "子勘定科目のレベル"
 
@@ -18855,50 +18447,54 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2068 ../intl-scm/guile-strings.c:2260
-#: ../intl-scm/guile-strings.c:2692 ../intl-scm/guile-strings.c:2884
-#: ../intl-scm/guile-strings.c:3098 ../intl-scm/guile-strings.c:3206
-#: ../intl-scm/guile-strings.c:4252 ../intl-scm/guile-strings.c:4360
+#: ../intl-scm/guile-strings.c:2068
+#: ../intl-scm/guile-strings.c:2260
+#: ../intl-scm/guile-strings.c:2692
+#: ../intl-scm/guile-strings.c:2884
+#: ../intl-scm/guile-strings.c:3098
+#: ../intl-scm/guile-strings.c:3206
+#: ../intl-scm/guile-strings.c:4252
+#: ../intl-scm/guile-strings.c:4360
 #, fuzzy
 msgid "Maximum number of levels in the account tree displayed"
 msgstr "棒グラフ内の棒の最大数"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2070 ../intl-scm/guile-strings.c:2694
+#: ../intl-scm/guile-strings.c:2070
+#: ../intl-scm/guile-strings.c:2694
 #, fuzzy
 msgid "Merchandising"
 msgstr "メカニズム:"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2072 ../intl-scm/guile-strings.c:2696
+#: ../intl-scm/guile-strings.c:2072
+#: ../intl-scm/guile-strings.c:2696
 #, fuzzy
 msgid "Gross adjustment accounts"
 msgstr "勘定科目のグループ化"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2074 ../intl-scm/guile-strings.c:2698
-msgid ""
-"Do not net, but show gross debit/credit adjustments to these accounts. "
-"Merchandising businesses will normally select their inventory accounts here."
+#: ../intl-scm/guile-strings.c:2074
+#: ../intl-scm/guile-strings.c:2698
+msgid "Do not net, but show gross debit/credit adjustments to these accounts. Merchandising businesses will normally select their inventory accounts here."
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2076 ../intl-scm/guile-strings.c:2700
+#: ../intl-scm/guile-strings.c:2076
+#: ../intl-scm/guile-strings.c:2700
 #, fuzzy
 msgid "Income summary accounts"
 msgstr "所得勘定科目"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2078 ../intl-scm/guile-strings.c:2702
-msgid ""
-"Adjustments made to these accounts are gross adjusted (see above) in the "
-"Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
-"useful for merchandising businesses."
+#: ../intl-scm/guile-strings.c:2078
+#: ../intl-scm/guile-strings.c:2702
+msgid "Adjustments made to these accounts are gross adjusted (see above) in the Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly useful for merchandising businesses."
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
@@ -18907,48 +18503,56 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2080 ../intl-scm/guile-strings.c:2316
-#: ../intl-scm/guile-strings.c:2704 ../intl-scm/guile-strings.c:2940
-#: ../intl-scm/guile-strings.c:3432 ../intl-scm/guile-strings.c:4586
+#: ../intl-scm/guile-strings.c:2080
+#: ../intl-scm/guile-strings.c:2316
+#: ../intl-scm/guile-strings.c:2704
+#: ../intl-scm/guile-strings.c:2940
+#: ../intl-scm/guile-strings.c:3432
+#: ../intl-scm/guile-strings.c:4586
 #, fuzzy
 msgid "Entries"
 msgstr "予算項目"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2082 ../intl-scm/guile-strings.c:2706
+#: ../intl-scm/guile-strings.c:2082
+#: ../intl-scm/guile-strings.c:2706
 msgid "Adjusting Entries pattern"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2708
+#: ../intl-scm/guile-strings.c:2084
+#: ../intl-scm/guile-strings.c:2708
 msgid "Any text in the Description column which identifies adjusting entries"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2086 ../intl-scm/guile-strings.c:2710
+#: ../intl-scm/guile-strings.c:2086
+#: ../intl-scm/guile-strings.c:2710
 msgid "Adjusting Entries pattern is case-sensitive"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2088 ../intl-scm/guile-strings.c:2712
+#: ../intl-scm/guile-strings.c:2088
+#: ../intl-scm/guile-strings.c:2712
 msgid "Causes the Adjusting Entries Pattern match to be case-sensitive"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2090 ../intl-scm/guile-strings.c:2714
+#: ../intl-scm/guile-strings.c:2090
+#: ../intl-scm/guile-strings.c:2714
 msgid "Adjusting Entries Pattern is regular expression"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2092 ../intl-scm/guile-strings.c:2716
-msgid ""
-"Causes the Adjusting Entries Pattern to be treated as a regular expression"
+#: ../intl-scm/guile-strings.c:2092
+#: ../intl-scm/guile-strings.c:2716
+msgid "Causes the Adjusting Entries Pattern to be treated as a regular expression"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
@@ -18957,9 +18561,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2094 ../intl-scm/guile-strings.c:2318
-#: ../intl-scm/guile-strings.c:2718 ../intl-scm/guile-strings.c:2942
-#: ../intl-scm/guile-strings.c:3434 ../intl-scm/guile-strings.c:4588
+#: ../intl-scm/guile-strings.c:2094
+#: ../intl-scm/guile-strings.c:2318
+#: ../intl-scm/guile-strings.c:2718
+#: ../intl-scm/guile-strings.c:2942
+#: ../intl-scm/guile-strings.c:3434
+#: ../intl-scm/guile-strings.c:4588
 msgid "Closing Entries pattern"
 msgstr ""
 
@@ -18969,9 +18576,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2096 ../intl-scm/guile-strings.c:2320
-#: ../intl-scm/guile-strings.c:2720 ../intl-scm/guile-strings.c:2944
-#: ../intl-scm/guile-strings.c:3436 ../intl-scm/guile-strings.c:4590
+#: ../intl-scm/guile-strings.c:2096
+#: ../intl-scm/guile-strings.c:2320
+#: ../intl-scm/guile-strings.c:2720
+#: ../intl-scm/guile-strings.c:2944
+#: ../intl-scm/guile-strings.c:3436
+#: ../intl-scm/guile-strings.c:4590
 msgid "Any text in the Description column which identifies closing entries"
 msgstr ""
 
@@ -18981,9 +18591,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2098 ../intl-scm/guile-strings.c:2322
-#: ../intl-scm/guile-strings.c:2722 ../intl-scm/guile-strings.c:2946
-#: ../intl-scm/guile-strings.c:3438 ../intl-scm/guile-strings.c:4592
+#: ../intl-scm/guile-strings.c:2098
+#: ../intl-scm/guile-strings.c:2322
+#: ../intl-scm/guile-strings.c:2722
+#: ../intl-scm/guile-strings.c:2946
+#: ../intl-scm/guile-strings.c:3438
+#: ../intl-scm/guile-strings.c:4592
 msgid "Closing Entries pattern is case-sensitive"
 msgstr ""
 
@@ -18993,9 +18606,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2100 ../intl-scm/guile-strings.c:2324
-#: ../intl-scm/guile-strings.c:2724 ../intl-scm/guile-strings.c:2948
-#: ../intl-scm/guile-strings.c:3440 ../intl-scm/guile-strings.c:4594
+#: ../intl-scm/guile-strings.c:2100
+#: ../intl-scm/guile-strings.c:2324
+#: ../intl-scm/guile-strings.c:2724
+#: ../intl-scm/guile-strings.c:2948
+#: ../intl-scm/guile-strings.c:3440
+#: ../intl-scm/guile-strings.c:4594
 msgid "Causes the Closing Entries Pattern match to be case-sensitive"
 msgstr ""
 
@@ -19005,9 +18621,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2102 ../intl-scm/guile-strings.c:2326
-#: ../intl-scm/guile-strings.c:2726 ../intl-scm/guile-strings.c:2950
-#: ../intl-scm/guile-strings.c:3442 ../intl-scm/guile-strings.c:4596
+#: ../intl-scm/guile-strings.c:2102
+#: ../intl-scm/guile-strings.c:2326
+#: ../intl-scm/guile-strings.c:2726
+#: ../intl-scm/guile-strings.c:2950
+#: ../intl-scm/guile-strings.c:3442
+#: ../intl-scm/guile-strings.c:4596
 msgid "Closing Entries Pattern is regular expression"
 msgstr ""
 
@@ -19017,11 +18636,13 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2104 ../intl-scm/guile-strings.c:2328
-#: ../intl-scm/guile-strings.c:2728 ../intl-scm/guile-strings.c:2952
-#: ../intl-scm/guile-strings.c:3444 ../intl-scm/guile-strings.c:4598
-msgid ""
-"Causes the Closing Entries Pattern to be treated as a regular expression"
+#: ../intl-scm/guile-strings.c:2104
+#: ../intl-scm/guile-strings.c:2328
+#: ../intl-scm/guile-strings.c:2728
+#: ../intl-scm/guile-strings.c:2952
+#: ../intl-scm/guile-strings.c:3444
+#: ../intl-scm/guile-strings.c:4598
+msgid "Causes the Closing Entries Pattern to be treated as a regular expression"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
@@ -19032,10 +18653,14 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2106 ../intl-scm/guile-strings.c:2270
-#: ../intl-scm/guile-strings.c:2730 ../intl-scm/guile-strings.c:2894
-#: ../intl-scm/guile-strings.c:3108 ../intl-scm/guile-strings.c:3216
-#: ../intl-scm/guile-strings.c:4262 ../intl-scm/guile-strings.c:4370
+#: ../intl-scm/guile-strings.c:2106
+#: ../intl-scm/guile-strings.c:2270
+#: ../intl-scm/guile-strings.c:2730
+#: ../intl-scm/guile-strings.c:2894
+#: ../intl-scm/guile-strings.c:3108
+#: ../intl-scm/guile-strings.c:3216
+#: ../intl-scm/guile-strings.c:4262
+#: ../intl-scm/guile-strings.c:4370
 #, fuzzy
 msgid "Include accounts with zero total balances"
 msgstr "印刷される残高に子勘定科目の残高を含めますか?"
@@ -19048,10 +18673,14 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2108 ../intl-scm/guile-strings.c:2272
-#: ../intl-scm/guile-strings.c:2732 ../intl-scm/guile-strings.c:2896
-#: ../intl-scm/guile-strings.c:3110 ../intl-scm/guile-strings.c:3218
-#: ../intl-scm/guile-strings.c:4264 ../intl-scm/guile-strings.c:4372
+#: ../intl-scm/guile-strings.c:2108
+#: ../intl-scm/guile-strings.c:2272
+#: ../intl-scm/guile-strings.c:2732
+#: ../intl-scm/guile-strings.c:2896
+#: ../intl-scm/guile-strings.c:3110
+#: ../intl-scm/guile-strings.c:3218
+#: ../intl-scm/guile-strings.c:4264
+#: ../intl-scm/guile-strings.c:4372
 #, fuzzy
 msgid "Include accounts with zero total (recursive) balances in this report"
 msgstr "印刷される残高に子勘定科目の残高を含めますか?"
@@ -19064,10 +18693,14 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2110 ../intl-scm/guile-strings.c:2282
-#: ../intl-scm/guile-strings.c:2734 ../intl-scm/guile-strings.c:2906
-#: ../intl-scm/guile-strings.c:3120 ../intl-scm/guile-strings.c:3228
-#: ../intl-scm/guile-strings.c:4274 ../intl-scm/guile-strings.c:4382
+#: ../intl-scm/guile-strings.c:2110
+#: ../intl-scm/guile-strings.c:2282
+#: ../intl-scm/guile-strings.c:2734
+#: ../intl-scm/guile-strings.c:2906
+#: ../intl-scm/guile-strings.c:3120
+#: ../intl-scm/guile-strings.c:3228
+#: ../intl-scm/guile-strings.c:4274
+#: ../intl-scm/guile-strings.c:4382
 #, fuzzy
 msgid "Display accounts as hyperlinks"
 msgstr "勘定科目名をフルに表示する"
@@ -19080,10 +18713,14 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2112 ../intl-scm/guile-strings.c:2284
-#: ../intl-scm/guile-strings.c:2736 ../intl-scm/guile-strings.c:2908
-#: ../intl-scm/guile-strings.c:3122 ../intl-scm/guile-strings.c:3230
-#: ../intl-scm/guile-strings.c:4276 ../intl-scm/guile-strings.c:4384
+#: ../intl-scm/guile-strings.c:2112
+#: ../intl-scm/guile-strings.c:2284
+#: ../intl-scm/guile-strings.c:2736
+#: ../intl-scm/guile-strings.c:2908
+#: ../intl-scm/guile-strings.c:3122
+#: ../intl-scm/guile-strings.c:3230
+#: ../intl-scm/guile-strings.c:4276
+#: ../intl-scm/guile-strings.c:4384
 msgid "Shows each account in the table as a hyperlink to its register window"
 msgstr ""
 
@@ -19097,11 +18734,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2114 ../intl-scm/guile-strings.c:2302
-#: ../intl-scm/guile-strings.c:2738 ../intl-scm/guile-strings.c:2926
-#: ../intl-scm/guile-strings.c:3148 ../intl-scm/guile-strings.c:3252
-#: ../intl-scm/guile-strings.c:3418 ../intl-scm/guile-strings.c:4302
-#: ../intl-scm/guile-strings.c:4406 ../intl-scm/guile-strings.c:4572
+#: ../intl-scm/guile-strings.c:2114
+#: ../intl-scm/guile-strings.c:2302
+#: ../intl-scm/guile-strings.c:2738
+#: ../intl-scm/guile-strings.c:2926
+#: ../intl-scm/guile-strings.c:3148
+#: ../intl-scm/guile-strings.c:3252
+#: ../intl-scm/guile-strings.c:3418
+#: ../intl-scm/guile-strings.c:4302
+#: ../intl-scm/guile-strings.c:4406
+#: ../intl-scm/guile-strings.c:4572
 msgid "Commodities"
 msgstr "金融商品"
 
@@ -19115,11 +18757,16 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2120 ../intl-scm/guile-strings.c:2308
-#: ../intl-scm/guile-strings.c:2744 ../intl-scm/guile-strings.c:2932
-#: ../intl-scm/guile-strings.c:3154 ../intl-scm/guile-strings.c:3258
-#: ../intl-scm/guile-strings.c:3424 ../intl-scm/guile-strings.c:4308
-#: ../intl-scm/guile-strings.c:4412 ../intl-scm/guile-strings.c:4578
+#: ../intl-scm/guile-strings.c:2120
+#: ../intl-scm/guile-strings.c:2308
+#: ../intl-scm/guile-strings.c:2744
+#: ../intl-scm/guile-strings.c:2932
+#: ../intl-scm/guile-strings.c:3154
+#: ../intl-scm/guile-strings.c:3258
+#: ../intl-scm/guile-strings.c:3424
+#: ../intl-scm/guile-strings.c:4308
+#: ../intl-scm/guile-strings.c:4412
+#: ../intl-scm/guile-strings.c:4578
 msgid "Show Foreign Currencies"
 msgstr "海外通貨を表示"
 
@@ -19133,50 +18780,61 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2122 ../intl-scm/guile-strings.c:2310
-#: ../intl-scm/guile-strings.c:2746 ../intl-scm/guile-strings.c:2934
-#: ../intl-scm/guile-strings.c:3156 ../intl-scm/guile-strings.c:3260
-#: ../intl-scm/guile-strings.c:3426 ../intl-scm/guile-strings.c:4310
-#: ../intl-scm/guile-strings.c:4414 ../intl-scm/guile-strings.c:4580
+#: ../intl-scm/guile-strings.c:2122
+#: ../intl-scm/guile-strings.c:2310
+#: ../intl-scm/guile-strings.c:2746
+#: ../intl-scm/guile-strings.c:2934
+#: ../intl-scm/guile-strings.c:3156
+#: ../intl-scm/guile-strings.c:3260
+#: ../intl-scm/guile-strings.c:3426
+#: ../intl-scm/guile-strings.c:4310
+#: ../intl-scm/guile-strings.c:4414
+#: ../intl-scm/guile-strings.c:4580
 #, fuzzy
 msgid "Display any foreign currency amount in an account"
 msgstr "科目の海外通貨の合計金額を表示しますか?"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2132 ../intl-scm/guile-strings.c:2756
+#: ../intl-scm/guile-strings.c:2132
+#: ../intl-scm/guile-strings.c:2756
 #, fuzzy
 msgid "Current Trial Balance"
 msgstr "現在価値"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2134 ../intl-scm/guile-strings.c:2758
+#: ../intl-scm/guile-strings.c:2134
+#: ../intl-scm/guile-strings.c:2758
 msgid "Uses the exact balances in the general ledger"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2136 ../intl-scm/guile-strings.c:2760
+#: ../intl-scm/guile-strings.c:2136
+#: ../intl-scm/guile-strings.c:2760
 #, fuzzy
 msgid "Pre-adjustment Trial Balance"
 msgstr "現在価値"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2138 ../intl-scm/guile-strings.c:2762
+#: ../intl-scm/guile-strings.c:2138
+#: ../intl-scm/guile-strings.c:2762
 msgid "Ignores Adjusting/Closing entries"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2140 ../intl-scm/guile-strings.c:2764
+#: ../intl-scm/guile-strings.c:2140
+#: ../intl-scm/guile-strings.c:2764
 msgid "Work Sheet"
 msgstr ""
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2142 ../intl-scm/guile-strings.c:2766
+#: ../intl-scm/guile-strings.c:2142
+#: ../intl-scm/guile-strings.c:2766
 msgid "Creates a complete end-of-period work sheet"
 msgstr ""
 
@@ -19186,9 +18844,12 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2148 ../intl-scm/guile-strings.c:2334
-#: ../intl-scm/guile-strings.c:2772 ../intl-scm/guile-strings.c:2958
-#: ../intl-scm/guile-strings.c:3454 ../intl-scm/guile-strings.c:4608
+#: ../intl-scm/guile-strings.c:2148
+#: ../intl-scm/guile-strings.c:2334
+#: ../intl-scm/guile-strings.c:2772
+#: ../intl-scm/guile-strings.c:2958
+#: ../intl-scm/guile-strings.c:3454
+#: ../intl-scm/guile-strings.c:4608
 #, fuzzy
 msgid "for Period"
 msgstr "期間:"
@@ -19199,23 +18860,28 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2152 ../intl-scm/guile-strings.c:2332
-#: ../intl-scm/guile-strings.c:2776 ../intl-scm/guile-strings.c:2956
-#: ../intl-scm/guile-strings.c:3452 ../intl-scm/guile-strings.c:4606
+#: ../intl-scm/guile-strings.c:2152
+#: ../intl-scm/guile-strings.c:2332
+#: ../intl-scm/guile-strings.c:2776
+#: ../intl-scm/guile-strings.c:2956
+#: ../intl-scm/guile-strings.c:3452
+#: ../intl-scm/guile-strings.c:4606
 #, fuzzy, c-format
 msgid "For Period Covering %s to %s"
 msgstr "期間の終了日"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2156 ../intl-scm/guile-strings.c:2780
+#: ../intl-scm/guile-strings.c:2156
+#: ../intl-scm/guile-strings.c:2780
 #, fuzzy
 msgid "Adjustments"
 msgstr "予算項目"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2158 ../intl-scm/guile-strings.c:2782
+#: ../intl-scm/guile-strings.c:2158
+#: ../intl-scm/guile-strings.c:2782
 #, fuzzy
 msgid "Adjusted Trial Balance"
 msgstr "現在価値"
@@ -19224,8 +18890,10 @@
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2160 ../intl-scm/guile-strings.c:2240
-#: ../intl-scm/guile-strings.c:2784 ../intl-scm/guile-strings.c:2864
+#: ../intl-scm/guile-strings.c:2160
+#: ../intl-scm/guile-strings.c:2240
+#: ../intl-scm/guile-strings.c:2784
+#: ../intl-scm/guile-strings.c:2864
 #, fuzzy
 msgid "Income Statement"
 msgstr "所得チャート"
@@ -19234,8 +18902,10 @@
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:2162 ../intl-scm/guile-strings.c:2786
-#: ../intl-scm/guile-strings.c:3076 ../intl-scm/guile-strings.c:4230
+#: ../intl-scm/guile-strings.c:2162
+#: ../intl-scm/guile-strings.c:2786
+#: ../intl-scm/guile-strings.c:3076
+#: ../intl-scm/guile-strings.c:4230
 msgid "Balance Sheet"
 msgstr "貸借対照表"
 
@@ -19245,23 +18915,28 @@
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2170 ../intl-scm/guile-strings.c:2794
-#: ../intl-scm/guile-strings.c:3180 ../intl-scm/guile-strings.c:3468
-#: ../intl-scm/guile-strings.c:4334 ../intl-scm/guile-strings.c:4622
+#: ../intl-scm/guile-strings.c:2170
+#: ../intl-scm/guile-strings.c:2794
+#: ../intl-scm/guile-strings.c:3180
+#: ../intl-scm/guile-strings.c:3468
+#: ../intl-scm/guile-strings.c:4334
+#: ../intl-scm/guile-strings.c:4622
 #, fuzzy
 msgid "Unrealized Gains"
 msgstr "内部留保"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2172 ../intl-scm/guile-strings.c:2796
+#: ../intl-scm/guile-strings.c:2172
+#: ../intl-scm/guile-strings.c:2796
 #, fuzzy
 msgid "Net Income"
 msgstr "収益"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/gnucash/report/trial-balance.scm
-#: ../intl-scm/guile-strings.c:2174 ../intl-scm/guile-strings.c:2798
+#: ../intl-scm/guile-strings.c:2174
+#: ../intl-scm/guile-strings.c:2798
 #, fuzzy
 msgid "Net Loss"
 msgstr "損失"
@@ -19270,10 +18945,14 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2178 ../intl-scm/guile-strings.c:2802
-#: ../intl-scm/guile-strings.c:3480 ../intl-scm/guile-strings.c:3568
-#: ../intl-scm/guile-strings.c:3572 ../intl-scm/guile-strings.c:4634
-#: ../intl-scm/guile-strings.c:4722 ../intl-scm/guile-strings.c:4726
+#: ../intl-scm/guile-strings.c:2178
+#: ../intl-scm/guile-strings.c:2802
+#: ../intl-scm/guile-strings.c:3480
+#: ../intl-scm/guile-strings.c:3568
+#: ../intl-scm/guile-strings.c:3572
+#: ../intl-scm/guile-strings.c:4634
+#: ../intl-scm/guile-strings.c:4722
+#: ../intl-scm/guile-strings.c:4726
 msgid "Sorting"
 msgstr "ソート中"
 
@@ -19281,8 +18960,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2180 ../intl-scm/guile-strings.c:2804
-#: ../intl-scm/guile-strings.c:3630 ../intl-scm/guile-strings.c:4784
+#: ../intl-scm/guile-strings.c:2180
+#: ../intl-scm/guile-strings.c:2804
+#: ../intl-scm/guile-strings.c:3630
+#: ../intl-scm/guile-strings.c:4784
 #, fuzzy
 msgid "Filter Type"
 msgstr "プロット形式"
@@ -19291,8 +18972,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2182 ../intl-scm/guile-strings.c:2806
-#: ../intl-scm/guile-strings.c:3494 ../intl-scm/guile-strings.c:4648
+#: ../intl-scm/guile-strings.c:2182
+#: ../intl-scm/guile-strings.c:2806
+#: ../intl-scm/guile-strings.c:3494
+#: ../intl-scm/guile-strings.c:4648
 #, fuzzy
 msgid "Void Transactions?"
 msgstr "取引を検索"
@@ -19301,11 +18984,16 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2186 ../intl-scm/guile-strings.c:2810
-#: ../intl-scm/guile-strings.c:3514 ../intl-scm/guile-strings.c:3578
-#: ../intl-scm/guile-strings.c:3680 ../intl-scm/guile-strings.c:3768
-#: ../intl-scm/guile-strings.c:4668 ../intl-scm/guile-strings.c:4732
-#: ../intl-scm/guile-strings.c:4834 ../intl-scm/guile-strings.c:4922
+#: ../intl-scm/guile-strings.c:2186
+#: ../intl-scm/guile-strings.c:2810
+#: ../intl-scm/guile-strings.c:3514
+#: ../intl-scm/guile-strings.c:3578
+#: ../intl-scm/guile-strings.c:3680
+#: ../intl-scm/guile-strings.c:3768
+#: ../intl-scm/guile-strings.c:4668
+#: ../intl-scm/guile-strings.c:4732
+#: ../intl-scm/guile-strings.c:4834
+#: ../intl-scm/guile-strings.c:4922
 #, fuzzy
 msgid "Reconciled Date"
 msgstr "調整済:"
@@ -19314,9 +19002,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2196 ../intl-scm/guile-strings.c:2820
-#: ../intl-scm/guile-strings.c:3550 ../intl-scm/guile-strings.c:3788
-#: ../intl-scm/guile-strings.c:4704 ../intl-scm/guile-strings.c:4942
+#: ../intl-scm/guile-strings.c:2196
+#: ../intl-scm/guile-strings.c:2820
+#: ../intl-scm/guile-strings.c:3550
+#: ../intl-scm/guile-strings.c:3788
+#: ../intl-scm/guile-strings.c:4704
+#: ../intl-scm/guile-strings.c:4942
 msgid "Use Full Account Name?"
 msgstr "勘定科目名をすべて使いますか?"
 
@@ -19324,10 +19015,14 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2200 ../intl-scm/guile-strings.c:2824
-#: ../intl-scm/guile-strings.c:3530 ../intl-scm/guile-strings.c:3688
-#: ../intl-scm/guile-strings.c:3796 ../intl-scm/guile-strings.c:4684
-#: ../intl-scm/guile-strings.c:4842 ../intl-scm/guile-strings.c:4950
+#: ../intl-scm/guile-strings.c:2200
+#: ../intl-scm/guile-strings.c:2824
+#: ../intl-scm/guile-strings.c:3530
+#: ../intl-scm/guile-strings.c:3688
+#: ../intl-scm/guile-strings.c:3796
+#: ../intl-scm/guile-strings.c:4684
+#: ../intl-scm/guile-strings.c:4842
+#: ../intl-scm/guile-strings.c:4950
 msgid "Other Account Name"
 msgstr "その他の勘定科目名"
 
@@ -19335,9 +19030,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2202 ../intl-scm/guile-strings.c:2826
-#: ../intl-scm/guile-strings.c:3566 ../intl-scm/guile-strings.c:3800
-#: ../intl-scm/guile-strings.c:4720 ../intl-scm/guile-strings.c:4954
+#: ../intl-scm/guile-strings.c:2202
+#: ../intl-scm/guile-strings.c:2826
+#: ../intl-scm/guile-strings.c:3566
+#: ../intl-scm/guile-strings.c:3800
+#: ../intl-scm/guile-strings.c:4720
+#: ../intl-scm/guile-strings.c:4954
 #, fuzzy
 msgid "Use Full Other Account Name?"
 msgstr "勘定科目名をすべて使いますか?"
@@ -19346,10 +19044,14 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2204 ../intl-scm/guile-strings.c:2828
-#: ../intl-scm/guile-strings.c:3562 ../intl-scm/guile-strings.c:3692
-#: ../intl-scm/guile-strings.c:3804 ../intl-scm/guile-strings.c:4716
-#: ../intl-scm/guile-strings.c:4846 ../intl-scm/guile-strings.c:4958
+#: ../intl-scm/guile-strings.c:2204
+#: ../intl-scm/guile-strings.c:2828
+#: ../intl-scm/guile-strings.c:3562
+#: ../intl-scm/guile-strings.c:3692
+#: ../intl-scm/guile-strings.c:3804
+#: ../intl-scm/guile-strings.c:4716
+#: ../intl-scm/guile-strings.c:4846
+#: ../intl-scm/guile-strings.c:4958
 msgid "Other Account Code"
 msgstr "その他の勘定科目コード"
 
@@ -19357,9 +19059,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2216 ../intl-scm/guile-strings.c:2840
-#: ../intl-scm/guile-strings.c:3840 ../intl-scm/guile-strings.c:3880
-#: ../intl-scm/guile-strings.c:4994 ../intl-scm/guile-strings.c:5034
+#: ../intl-scm/guile-strings.c:2216
+#: ../intl-scm/guile-strings.c:2840
+#: ../intl-scm/guile-strings.c:3840
+#: ../intl-scm/guile-strings.c:3880
+#: ../intl-scm/guile-strings.c:4994
+#: ../intl-scm/guile-strings.c:5034
 msgid "Sign Reverses?"
 msgstr ""
 
@@ -19367,9 +19072,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2218 ../intl-scm/guile-strings.c:2842
-#: ../intl-scm/guile-strings.c:3606 ../intl-scm/guile-strings.c:3882
-#: ../intl-scm/guile-strings.c:4760 ../intl-scm/guile-strings.c:5036
+#: ../intl-scm/guile-strings.c:2218
+#: ../intl-scm/guile-strings.c:2842
+#: ../intl-scm/guile-strings.c:3606
+#: ../intl-scm/guile-strings.c:3882
+#: ../intl-scm/guile-strings.c:4760
+#: ../intl-scm/guile-strings.c:5036
 msgid "Style"
 msgstr "スタイル"
 
@@ -19377,8 +19085,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2220 ../intl-scm/guile-strings.c:2844
-#: ../intl-scm/guile-strings.c:3482 ../intl-scm/guile-strings.c:4636
+#: ../intl-scm/guile-strings.c:2220
+#: ../intl-scm/guile-strings.c:2844
+#: ../intl-scm/guile-strings.c:3482
+#: ../intl-scm/guile-strings.c:4636
 msgid "Primary Key"
 msgstr "第一のキー"
 
@@ -19386,9 +19096,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2222 ../intl-scm/guile-strings.c:2846
-#: ../intl-scm/guile-strings.c:3574 ../intl-scm/guile-strings.c:3738
-#: ../intl-scm/guile-strings.c:4728 ../intl-scm/guile-strings.c:4892
+#: ../intl-scm/guile-strings.c:2222
+#: ../intl-scm/guile-strings.c:2846
+#: ../intl-scm/guile-strings.c:3574
+#: ../intl-scm/guile-strings.c:3738
+#: ../intl-scm/guile-strings.c:4728
+#: ../intl-scm/guile-strings.c:4892
 #, fuzzy
 msgid "Show Full Account Name?"
 msgstr "勘定科目名をすべて使いますか?"
@@ -19397,9 +19110,12 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2224 ../intl-scm/guile-strings.c:2848
-#: ../intl-scm/guile-strings.c:3570 ../intl-scm/guile-strings.c:3742
-#: ../intl-scm/guile-strings.c:4724 ../intl-scm/guile-strings.c:4896
+#: ../intl-scm/guile-strings.c:2224
+#: ../intl-scm/guile-strings.c:2848
+#: ../intl-scm/guile-strings.c:3570
+#: ../intl-scm/guile-strings.c:3742
+#: ../intl-scm/guile-strings.c:4724
+#: ../intl-scm/guile-strings.c:4896
 #, fuzzy
 msgid "Show Account Code?"
 msgstr "勘定科目コード"
@@ -19408,8 +19124,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2226 ../intl-scm/guile-strings.c:2850
-#: ../intl-scm/guile-strings.c:3484 ../intl-scm/guile-strings.c:4638
+#: ../intl-scm/guile-strings.c:2226
+#: ../intl-scm/guile-strings.c:2850
+#: ../intl-scm/guile-strings.c:3484
+#: ../intl-scm/guile-strings.c:4638
 msgid "Primary Subtotal"
 msgstr "第一キーによる小計"
 
@@ -19417,8 +19135,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2228 ../intl-scm/guile-strings.c:2852
-#: ../intl-scm/guile-strings.c:3486 ../intl-scm/guile-strings.c:4640
+#: ../intl-scm/guile-strings.c:2228
+#: ../intl-scm/guile-strings.c:2852
+#: ../intl-scm/guile-strings.c:3486
+#: ../intl-scm/guile-strings.c:4640
 msgid "Primary Subtotal for Date Key"
 msgstr "日付キーに対する第一の小計"
 
@@ -19426,8 +19146,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2230 ../intl-scm/guile-strings.c:2854
-#: ../intl-scm/guile-strings.c:3750 ../intl-scm/guile-strings.c:4904
+#: ../intl-scm/guile-strings.c:2230
+#: ../intl-scm/guile-strings.c:2854
+#: ../intl-scm/guile-strings.c:3750
+#: ../intl-scm/guile-strings.c:4904
 msgid "Primary Sort Order"
 msgstr "一次ソート順"
 
@@ -19435,8 +19157,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2232 ../intl-scm/guile-strings.c:2856
-#: ../intl-scm/guile-strings.c:3488 ../intl-scm/guile-strings.c:4642
+#: ../intl-scm/guile-strings.c:2232
+#: ../intl-scm/guile-strings.c:2856
+#: ../intl-scm/guile-strings.c:3488
+#: ../intl-scm/guile-strings.c:4642
 msgid "Secondary Key"
 msgstr "第二のキー"
 
@@ -19444,8 +19168,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2234 ../intl-scm/guile-strings.c:2858
-#: ../intl-scm/guile-strings.c:3490 ../intl-scm/guile-strings.c:4644
+#: ../intl-scm/guile-strings.c:2234
+#: ../intl-scm/guile-strings.c:2858
+#: ../intl-scm/guile-strings.c:3490
+#: ../intl-scm/guile-strings.c:4644
 msgid "Secondary Subtotal"
 msgstr "第二キーによる小計"
 
@@ -19453,8 +19179,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2236 ../intl-scm/guile-strings.c:2860
-#: ../intl-scm/guile-strings.c:3492 ../intl-scm/guile-strings.c:4646
+#: ../intl-scm/guile-strings.c:2236
+#: ../intl-scm/guile-strings.c:2860
+#: ../intl-scm/guile-strings.c:3492
+#: ../intl-scm/guile-strings.c:4646
 msgid "Secondary Subtotal for Date Key"
 msgstr "日付キーに対する第二の小計"
 
@@ -19462,8 +19190,10 @@
 #. src/report/standard-reports/gnucash/report/general-ledger.scm
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2238 ../intl-scm/guile-strings.c:2862
-#: ../intl-scm/guile-strings.c:3760 ../intl-scm/guile-strings.c:4914
+#: ../intl-scm/guile-strings.c:2238
+#: ../intl-scm/guile-strings.c:2862
+#: ../intl-scm/guile-strings.c:3760
+#: ../intl-scm/guile-strings.c:4914
 msgid "Secondary Sort Order"
 msgstr "二次ソート順"
 
@@ -19471,8 +19201,10 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2250 ../intl-scm/guile-strings.c:2874
-#: ../intl-scm/guile-strings.c:3406 ../intl-scm/guile-strings.c:4560
+#: ../intl-scm/guile-strings.c:2250
+#: ../intl-scm/guile-strings.c:2874
+#: ../intl-scm/guile-strings.c:3406
+#: ../intl-scm/guile-strings.c:4560
 #, fuzzy
 msgid "Start Date"
 msgstr "開始日付"
@@ -19481,8 +19213,10 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2252 ../intl-scm/guile-strings.c:2876
-#: ../intl-scm/guile-strings.c:3408 ../intl-scm/guile-strings.c:4562
+#: ../intl-scm/guile-strings.c:2252
+#: ../intl-scm/guile-strings.c:2876
+#: ../intl-scm/guile-strings.c:3408
+#: ../intl-scm/guile-strings.c:4562
 #, fuzzy
 msgid "End Date"
 msgstr "終了日付"
@@ -19491,8 +19225,10 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:2262 ../intl-scm/guile-strings.c:2886
-#: ../intl-scm/guile-strings.c:3100 ../intl-scm/guile-strings.c:4254
+#: ../intl-scm/guile-strings.c:2262
+#: ../intl-scm/guile-strings.c:2886
+#: ../intl-scm/guile-strings.c:3100
+#: ../intl-scm/guile-strings.c:4254
 msgid "Flatten list to depth limit"
 msgstr ""
 
@@ -19500,8 +19236,10 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:2264 ../intl-scm/guile-strings.c:2888
-#: ../intl-scm/guile-strings.c:3102 ../intl-scm/guile-strings.c:4256
+#: ../intl-scm/guile-strings.c:2264
+#: ../intl-scm/guile-strings.c:2888
+#: ../intl-scm/guile-strings.c:3102
+#: ../intl-scm/guile-strings.c:4256
 msgid "Displays accounts which exceed the depth limit at the depth limit"
 msgstr ""
 
@@ -19511,9 +19249,12 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2266 ../intl-scm/guile-strings.c:2890
-#: ../intl-scm/guile-strings.c:3104 ../intl-scm/guile-strings.c:3212
-#: ../intl-scm/guile-strings.c:4258 ../intl-scm/guile-strings.c:4366
+#: ../intl-scm/guile-strings.c:2266
+#: ../intl-scm/guile-strings.c:2890
+#: ../intl-scm/guile-strings.c:3104
+#: ../intl-scm/guile-strings.c:3212
+#: ../intl-scm/guile-strings.c:4258
+#: ../intl-scm/guile-strings.c:4366
 #, fuzzy
 msgid "Parent account balances"
 msgstr "親勘定科目"
@@ -19524,9 +19265,12 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2268 ../intl-scm/guile-strings.c:2892
-#: ../intl-scm/guile-strings.c:3106 ../intl-scm/guile-strings.c:3214
-#: ../intl-scm/guile-strings.c:4260 ../intl-scm/guile-strings.c:4368
+#: ../intl-scm/guile-strings.c:2268
+#: ../intl-scm/guile-strings.c:2892
+#: ../intl-scm/guile-strings.c:3106
+#: ../intl-scm/guile-strings.c:3214
+#: ../intl-scm/guile-strings.c:4260
+#: ../intl-scm/guile-strings.c:4368
 msgid "Parent account subtotals"
 msgstr "親勘定科目小計"
 
@@ -19536,9 +19280,12 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2274 ../intl-scm/guile-strings.c:2898
-#: ../intl-scm/guile-strings.c:3112 ../intl-scm/guile-strings.c:3220
-#: ../intl-scm/guile-strings.c:4266 ../intl-scm/guile-strings.c:4374
+#: ../intl-scm/guile-strings.c:2274
+#: ../intl-scm/guile-strings.c:2898
+#: ../intl-scm/guile-strings.c:3112
+#: ../intl-scm/guile-strings.c:3220
+#: ../intl-scm/guile-strings.c:4266
+#: ../intl-scm/guile-strings.c:4374
 msgid "Omit zero balance figures"
 msgstr ""
 
@@ -19548,9 +19295,12 @@
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:2276 ../intl-scm/guile-strings.c:2900
-#: ../intl-scm/guile-strings.c:3114 ../intl-scm/guile-strings.c:3222
-#: ../intl-scm/guile-strings.c:4268 ../intl-scm/guile-strings.c:4376
+#: ../intl-scm/guile-strings.c:2276
+#: ../intl-scm/guile-strings.c:2900
+#: ../intl-scm/guile-strings.c:3114
+#: ../intl-scm/guile-strings.c:3222
+#: ../intl-scm/guile-strings.c:4268
+#: ../intl-scm/guile-strings.c:4376
 msgid "Show blank space in place of any zero balances which would be shown"
 msgstr ""
 
@@ -19562,10 +19312,14 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2278 ../intl-scm/guile-strings.c:2902
-#: ../intl-scm/guile-strings.c:3116 ../intl-scm/guile-strings.c:3224
-#: ../intl-scm/guile-strings.c:3414 ../intl-scm/guile-strings.c:4270
-#: ../intl-scm/guile-strings.c:4378 ../intl-scm/guile-strings.c:4568
+#: ../intl-scm/guile-strings.c:2278
+#: ../intl-scm/guile-strings.c:2902
+#: ../intl-scm/guile-strings.c:3116
+#: ../intl-scm/guile-strings.c:3224
+#: ../intl-scm/guile-strings.c:3414
+#: ../intl-scm/guile-strings.c:4270
+#: ../intl-scm/guile-strings.c:4378
+#: ../intl-scm/guile-strings.c:4568
 #, fuzzy
 msgid "Show accounting-style rules"
 msgstr "勘定ラベルを使う"
@@ -19578,79 +19332,94 @@
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2280 ../intl-scm/guile-strings.c:2904
-#: ../intl-scm/guile-strings.c:3118 ../intl-scm/guile-strings.c:3226
-#: ../intl-scm/guile-strings.c:3416 ../intl-scm/guile-strings.c:4272
-#: ../intl-scm/guile-strings.c:4380 ../intl-scm/guile-strings.c:4570
+#: ../intl-scm/guile-strings.c:2280
+#: ../intl-scm/guile-strings.c:2904
+#: ../intl-scm/guile-strings.c:3118
+#: ../intl-scm/guile-strings.c:3226
+#: ../intl-scm/guile-strings.c:3416
+#: ../intl-scm/guile-strings.c:4272
+#: ../intl-scm/guile-strings.c:4380
+#: ../intl-scm/guile-strings.c:4570
 msgid "Use rules beneath columns of added numbers like accountants do"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2286 ../intl-scm/guile-strings.c:2910
+#: ../intl-scm/guile-strings.c:2286
+#: ../intl-scm/guile-strings.c:2910
 #, fuzzy
 msgid "Label the revenue section"
 msgstr "この取引をキャンセルする"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2288 ../intl-scm/guile-strings.c:2912
+#: ../intl-scm/guile-strings.c:2288
+#: ../intl-scm/guile-strings.c:2912
 msgid "Whether or not to include a label for the revenue section"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2290 ../intl-scm/guile-strings.c:2914
+#: ../intl-scm/guile-strings.c:2290
+#: ../intl-scm/guile-strings.c:2914
 msgid "Include revenue total"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2292 ../intl-scm/guile-strings.c:2916
+#: ../intl-scm/guile-strings.c:2292
+#: ../intl-scm/guile-strings.c:2916
 msgid "Whether or not to include a line indicating total revenue"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2294 ../intl-scm/guile-strings.c:2918
+#: ../intl-scm/guile-strings.c:2294
+#: ../intl-scm/guile-strings.c:2918
 #, fuzzy
 msgid "Label the expense section"
 msgstr "この取引をキャンセルする"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2296 ../intl-scm/guile-strings.c:2920
+#: ../intl-scm/guile-strings.c:2296
+#: ../intl-scm/guile-strings.c:2920
 msgid "Whether or not to include a label for the expense section"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2298 ../intl-scm/guile-strings.c:2922
+#: ../intl-scm/guile-strings.c:2298
+#: ../intl-scm/guile-strings.c:2922
 #, fuzzy
 msgid "Include expense total"
 msgstr "所得・費用チャート"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2300 ../intl-scm/guile-strings.c:2924
+#: ../intl-scm/guile-strings.c:2300
+#: ../intl-scm/guile-strings.c:2924
 msgid "Whether or not to include a line indicating total expense"
 msgstr ""
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2338 ../intl-scm/guile-strings.c:2962
+#: ../intl-scm/guile-strings.c:2338
+#: ../intl-scm/guile-strings.c:2962
 msgid "Revenues"
 msgstr "収益"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2340 ../intl-scm/guile-strings.c:2964
+#: ../intl-scm/guile-strings.c:2340
+#: ../intl-scm/guile-strings.c:2964
 msgid "Total Revenue"
 msgstr "合計収益"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/gnucash/report/income-statement.scm
-#: ../intl-scm/guile-strings.c:2344 ../intl-scm/guile-strings.c:2968
+#: ../intl-scm/guile-strings.c:2344
+#: ../intl-scm/guile-strings.c:2968
 msgid "Total Expenses"
 msgstr "合計費用"
 
@@ -19658,8 +19427,10 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2346 ../intl-scm/guile-strings.c:2970
-#: ../intl-scm/guile-strings.c:3460 ../intl-scm/guile-strings.c:4614
+#: ../intl-scm/guile-strings.c:2346
+#: ../intl-scm/guile-strings.c:2970
+#: ../intl-scm/guile-strings.c:3460
+#: ../intl-scm/guile-strings.c:4614
 #, fuzzy
 msgid "Net income"
 msgstr "時間的にもっとも近い"
@@ -19668,81 +19439,95 @@
 #. src/report/standard-reports/gnucash/report/income-statement.scm
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2348 ../intl-scm/guile-strings.c:2972
-#: ../intl-scm/guile-strings.c:3462 ../intl-scm/guile-strings.c:4616
+#: ../intl-scm/guile-strings.c:2348
+#: ../intl-scm/guile-strings.c:2972
+#: ../intl-scm/guile-strings.c:3462
+#: ../intl-scm/guile-strings.c:4616
 #, fuzzy
 msgid "Net loss"
 msgstr "純資産:"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2350 ../intl-scm/guile-strings.c:2974
+#: ../intl-scm/guile-strings.c:2350
+#: ../intl-scm/guile-strings.c:2974
 msgid "Income Barchart"
 msgstr "収益棒グラフ"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2352 ../intl-scm/guile-strings.c:2976
+#: ../intl-scm/guile-strings.c:2352
+#: ../intl-scm/guile-strings.c:2976
 msgid "Expense Barchart"
 msgstr "費用棒グラフ"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2354 ../intl-scm/guile-strings.c:2978
+#: ../intl-scm/guile-strings.c:2354
+#: ../intl-scm/guile-strings.c:2978
 msgid "Asset Barchart"
 msgstr "資産棒グラフ"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2356 ../intl-scm/guile-strings.c:2980
+#: ../intl-scm/guile-strings.c:2356
+#: ../intl-scm/guile-strings.c:2980
 msgid "Liability Barchart"
 msgstr "負債棒グラフ"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2358 ../intl-scm/guile-strings.c:2982
+#: ../intl-scm/guile-strings.c:2358
+#: ../intl-scm/guile-strings.c:2982
 msgid "Shows a barchart with the Income per interval developing over time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2360 ../intl-scm/guile-strings.c:2984
+#: ../intl-scm/guile-strings.c:2360
+#: ../intl-scm/guile-strings.c:2984
 msgid "Shows a barchart with the Expenses per interval developing over time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2362 ../intl-scm/guile-strings.c:2986
+#: ../intl-scm/guile-strings.c:2362
+#: ../intl-scm/guile-strings.c:2986
 msgid "Shows a barchart with the Assets developing over time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2364 ../intl-scm/guile-strings.c:2988
+#: ../intl-scm/guile-strings.c:2364
+#: ../intl-scm/guile-strings.c:2988
 msgid "Shows a barchart with the Liabilities developing over time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2366 ../intl-scm/guile-strings.c:2990
+#: ../intl-scm/guile-strings.c:2366
+#: ../intl-scm/guile-strings.c:2990
 msgid "Income Over Time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2368 ../intl-scm/guile-strings.c:2992
+#: ../intl-scm/guile-strings.c:2368
+#: ../intl-scm/guile-strings.c:2992
 msgid "Expense Over Time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2370 ../intl-scm/guile-strings.c:2994
+#: ../intl-scm/guile-strings.c:2370
+#: ../intl-scm/guile-strings.c:2994
 msgid "Assets Over Time"
 msgstr ""
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2372 ../intl-scm/guile-strings.c:2996
+#: ../intl-scm/guile-strings.c:2372
+#: ../intl-scm/guile-strings.c:2996
 msgid "Liabilities Over Time"
 msgstr ""
 
@@ -19752,9 +19537,12 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2386 ../intl-scm/guile-strings.c:3010
-#: ../intl-scm/guile-strings.c:4124 ../intl-scm/guile-strings.c:4198
-#: ../intl-scm/guile-strings.c:5278 ../intl-scm/guile-strings.c:5352
+#: ../intl-scm/guile-strings.c:2386
+#: ../intl-scm/guile-strings.c:3010
+#: ../intl-scm/guile-strings.c:4124
+#: ../intl-scm/guile-strings.c:4198
+#: ../intl-scm/guile-strings.c:5278
+#: ../intl-scm/guile-strings.c:5352
 msgid "Show Accounts until level"
 msgstr ""
 
@@ -19764,21 +19552,26 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2388 ../intl-scm/guile-strings.c:3012
-#: ../intl-scm/guile-strings.c:4128 ../intl-scm/guile-strings.c:4200
-#: ../intl-scm/guile-strings.c:5282 ../intl-scm/guile-strings.c:5354
+#: ../intl-scm/guile-strings.c:2388
+#: ../intl-scm/guile-strings.c:3012
+#: ../intl-scm/guile-strings.c:4128
+#: ../intl-scm/guile-strings.c:4200
+#: ../intl-scm/guile-strings.c:5282
+#: ../intl-scm/guile-strings.c:5354
 msgid "Show long account names"
 msgstr "長い勘定科目名を表示する"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2390 ../intl-scm/guile-strings.c:3014
+#: ../intl-scm/guile-strings.c:2390
+#: ../intl-scm/guile-strings.c:3014
 msgid "Use Stacked Bars"
 msgstr "横向きの棒グラフを使う"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2392 ../intl-scm/guile-strings.c:3016
+#: ../intl-scm/guile-strings.c:2392
+#: ../intl-scm/guile-strings.c:3016
 msgid "Maximum Bars"
 msgstr "棒グラフの最大数"
 
@@ -19788,9 +19581,12 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2398 ../intl-scm/guile-strings.c:3022
-#: ../intl-scm/guile-strings.c:4138 ../intl-scm/guile-strings.c:4210
-#: ../intl-scm/guile-strings.c:5292 ../intl-scm/guile-strings.c:5364
+#: ../intl-scm/guile-strings.c:2398
+#: ../intl-scm/guile-strings.c:3022
+#: ../intl-scm/guile-strings.c:4138
+#: ../intl-scm/guile-strings.c:4210
+#: ../intl-scm/guile-strings.c:5292
+#: ../intl-scm/guile-strings.c:5364
 #, fuzzy
 msgid "Sort Method"
 msgstr "摘要順に並べる"
@@ -19801,9 +19597,12 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2402 ../intl-scm/guile-strings.c:3026
-#: ../intl-scm/guile-strings.c:4144 ../intl-scm/guile-strings.c:4214
-#: ../intl-scm/guile-strings.c:5298 ../intl-scm/guile-strings.c:5368
+#: ../intl-scm/guile-strings.c:2402
+#: ../intl-scm/guile-strings.c:3026
+#: ../intl-scm/guile-strings.c:4144
+#: ../intl-scm/guile-strings.c:4214
+#: ../intl-scm/guile-strings.c:5298
+#: ../intl-scm/guile-strings.c:5368
 msgid "Show accounts to this depth and not further"
 msgstr ""
 
@@ -19811,26 +19610,31 @@
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2404 ../intl-scm/guile-strings.c:3028
-#: ../intl-scm/guile-strings.c:4216 ../intl-scm/guile-strings.c:5370
+#: ../intl-scm/guile-strings.c:2404
+#: ../intl-scm/guile-strings.c:3028
+#: ../intl-scm/guile-strings.c:4216
+#: ../intl-scm/guile-strings.c:5370
 msgid "Show the full account name in legend?"
 msgstr "凡例に長い勘定科目名を表示しますか?"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2406 ../intl-scm/guile-strings.c:3030
+#: ../intl-scm/guile-strings.c:2406
+#: ../intl-scm/guile-strings.c:3030
 msgid "Show barchart as stacked barchart? (Guppi>=0.35.4 required)"
 msgstr "横向きの棒グラフを表示しますか?(Guppi>=0.35.4が必要)"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2408 ../intl-scm/guile-strings.c:3032
+#: ../intl-scm/guile-strings.c:2408
+#: ../intl-scm/guile-strings.c:3032
 msgid "Maximum number of bars in the chart"
 msgstr "棒グラフ内の棒の最大数"
 
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
-#: ../intl-scm/guile-strings.c:2412 ../intl-scm/guile-strings.c:3036
+#: ../intl-scm/guile-strings.c:2412
+#: ../intl-scm/guile-strings.c:3036
 #, c-format
 msgid "Balances %s to %s"
 msgstr ""
@@ -19839,15 +19643,18 @@
 #. src/report/standard-reports/gnucash/report/category-barchart.scm
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2416 ../intl-scm/guile-strings.c:3040
-#: ../intl-scm/guile-strings.c:4228 ../intl-scm/guile-strings.c:5382
+#: ../intl-scm/guile-strings.c:2416
+#: ../intl-scm/guile-strings.c:3040
+#: ../intl-scm/guile-strings.c:4228
+#: ../intl-scm/guile-strings.c:5382
 #, fuzzy
 msgid "and"
 msgstr "検索終了日"
 
 #. src/report/standard-reports/portfolio.scm
 #. src/report/standard-reports/gnucash/report/portfolio.scm
-#: ../intl-scm/guile-strings.c:2418 ../intl-scm/guile-strings.c:3042
+#: ../intl-scm/guile-strings.c:2418
+#: ../intl-scm/guile-strings.c:3042
 msgid "Investment Portfolio"
 msgstr "投資ポートフォリオ"
 
@@ -19855,8 +19662,10 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2422 ../intl-scm/guile-strings.c:3046
-#: ../intl-scm/guile-strings.c:3294 ../intl-scm/guile-strings.c:4448
+#: ../intl-scm/guile-strings.c:2422
+#: ../intl-scm/guile-strings.c:3046
+#: ../intl-scm/guile-strings.c:3294
+#: ../intl-scm/guile-strings.c:4448
 #, fuzzy
 msgid "Share decimal places"
 msgstr "株式残高"
@@ -19865,8 +19674,10 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2424 ../intl-scm/guile-strings.c:3048
-#: ../intl-scm/guile-strings.c:3296 ../intl-scm/guile-strings.c:4450
+#: ../intl-scm/guile-strings.c:2424
+#: ../intl-scm/guile-strings.c:3048
+#: ../intl-scm/guile-strings.c:3296
+#: ../intl-scm/guile-strings.c:4450
 msgid "Include accounts with no shares"
 msgstr ""
 
@@ -19876,9 +19687,12 @@
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2428 ../intl-scm/guile-strings.c:3052
-#: ../intl-scm/guile-strings.c:3314 ../intl-scm/guile-strings.c:3500
-#: ../intl-scm/guile-strings.c:4468 ../intl-scm/guile-strings.c:4654
+#: ../intl-scm/guile-strings.c:2428
+#: ../intl-scm/guile-strings.c:3052
+#: ../intl-scm/guile-strings.c:3314
+#: ../intl-scm/guile-strings.c:3500
+#: ../intl-scm/guile-strings.c:4468
+#: ../intl-scm/guile-strings.c:4654
 msgid "Report Currency"
 msgstr "帳票の通貨"
 
@@ -19886,8 +19700,10 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2430 ../intl-scm/guile-strings.c:3054
-#: ../intl-scm/guile-strings.c:3354 ../intl-scm/guile-strings.c:4508
+#: ../intl-scm/guile-strings.c:2430
+#: ../intl-scm/guile-strings.c:3054
+#: ../intl-scm/guile-strings.c:3354
+#: ../intl-scm/guile-strings.c:4508
 msgid "The number of decimal places to use for share numbers"
 msgstr ""
 
@@ -19895,8 +19711,10 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2434 ../intl-scm/guile-strings.c:3058
-#: ../intl-scm/guile-strings.c:3360 ../intl-scm/guile-strings.c:4514
+#: ../intl-scm/guile-strings.c:2434
+#: ../intl-scm/guile-strings.c:3058
+#: ../intl-scm/guile-strings.c:3360
+#: ../intl-scm/guile-strings.c:4514
 msgid "Stock Accounts to report on"
 msgstr ""
 
@@ -19904,8 +19722,10 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2436 ../intl-scm/guile-strings.c:3060
-#: ../intl-scm/guile-strings.c:3362 ../intl-scm/guile-strings.c:4516
+#: ../intl-scm/guile-strings.c:2436
+#: ../intl-scm/guile-strings.c:3060
+#: ../intl-scm/guile-strings.c:3362
+#: ../intl-scm/guile-strings.c:4516
 #, fuzzy
 msgid "Include accounts that have a zero share balances."
 msgstr "印刷される残高に子勘定科目の残高を含めますか?"
@@ -19914,145 +19734,164 @@
 #. src/report/standard-reports/gnucash/report/portfolio.scm
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2442 ../intl-scm/guile-strings.c:3066
-#: ../intl-scm/guile-strings.c:3370 ../intl-scm/guile-strings.c:4524
+#: ../intl-scm/guile-strings.c:2442
+#: ../intl-scm/guile-strings.c:3066
+#: ../intl-scm/guile-strings.c:3370
+#: ../intl-scm/guile-strings.c:4524
 msgid "Listing"
 msgstr "一覧作成中"
 
 #. src/report/standard-reports/portfolio.scm
 #. src/report/standard-reports/gnucash/report/portfolio.scm
-#: ../intl-scm/guile-strings.c:2444 ../intl-scm/guile-strings.c:3068
+#: ../intl-scm/guile-strings.c:2444
+#: ../intl-scm/guile-strings.c:3068
 msgid "Units"
 msgstr "単位"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3086 ../intl-scm/guile-strings.c:4240
+#: ../intl-scm/guile-strings.c:3086
+#: ../intl-scm/guile-strings.c:4240
 #, fuzzy
 msgid "Balance Sheet Date"
 msgstr "貸借対照表"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3088 ../intl-scm/guile-strings.c:4242
+#: ../intl-scm/guile-strings.c:3088
+#: ../intl-scm/guile-strings.c:4242
 #, fuzzy
 msgid "Single column Balance Sheet"
 msgstr "貸借対照表"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3090 ../intl-scm/guile-strings.c:4244
-msgid ""
-"Print liability/equity section in the same column under the assets section "
-"as opposed to a second column right of the assets section"
+#: ../intl-scm/guile-strings.c:3090
+#: ../intl-scm/guile-strings.c:4244
+msgid "Print liability/equity section in the same column under the assets section as opposed to a second column right of the assets section"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3124 ../intl-scm/guile-strings.c:4278
+#: ../intl-scm/guile-strings.c:3124
+#: ../intl-scm/guile-strings.c:4278
 #, fuzzy
 msgid "Label the assets section"
 msgstr "この取引をキャンセルする"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3126 ../intl-scm/guile-strings.c:4280
+#: ../intl-scm/guile-strings.c:3126
+#: ../intl-scm/guile-strings.c:4280
 msgid "Whether or not to include a label for the assets section"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3128 ../intl-scm/guile-strings.c:4282
+#: ../intl-scm/guile-strings.c:3128
+#: ../intl-scm/guile-strings.c:4282
 #, fuzzy
 msgid "Include assets total"
 msgstr "純資産価値"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3130 ../intl-scm/guile-strings.c:4284
+#: ../intl-scm/guile-strings.c:3130
+#: ../intl-scm/guile-strings.c:4284
 msgid "Whether or not to include a line indicating total assets"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3132 ../intl-scm/guile-strings.c:4286
+#: ../intl-scm/guile-strings.c:3132
+#: ../intl-scm/guile-strings.c:4286
 msgid "Label the liabilities section"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3134 ../intl-scm/guile-strings.c:4288
+#: ../intl-scm/guile-strings.c:3134
+#: ../intl-scm/guile-strings.c:4288
 msgid "Whether or not to include a label for the liabilities section"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3136 ../intl-scm/guile-strings.c:4290
+#: ../intl-scm/guile-strings.c:3136
+#: ../intl-scm/guile-strings.c:4290
 msgid "Include liabilities total"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3138 ../intl-scm/guile-strings.c:4292
+#: ../intl-scm/guile-strings.c:3138
+#: ../intl-scm/guile-strings.c:4292
 msgid "Whether or not to include a line indicating total liabilities"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3140 ../intl-scm/guile-strings.c:4294
+#: ../intl-scm/guile-strings.c:3140
+#: ../intl-scm/guile-strings.c:4294
 #, fuzzy
 msgid "Label the equity section"
 msgstr "この取引をキャンセルする"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3142 ../intl-scm/guile-strings.c:4296
+#: ../intl-scm/guile-strings.c:3142
+#: ../intl-scm/guile-strings.c:4296
 msgid "Whether or not to include a label for the equity section"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3144 ../intl-scm/guile-strings.c:4298
+#: ../intl-scm/guile-strings.c:3144
+#: ../intl-scm/guile-strings.c:4298
 msgid "Include equity total"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3146 ../intl-scm/guile-strings.c:4300
+#: ../intl-scm/guile-strings.c:3146
+#: ../intl-scm/guile-strings.c:4300
 msgid "Whether or not to include a line indicating total equity"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3162 ../intl-scm/guile-strings.c:4316
+#: ../intl-scm/guile-strings.c:3162
+#: ../intl-scm/guile-strings.c:4316
 msgid "Compute unrealized gains and losses"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3164 ../intl-scm/guile-strings.c:4318
-msgid ""
-"Include unrealized gains and losses in the computation.  Will produce "
-"incorrect results if the current file uses commodity trading accounts"
+#: ../intl-scm/guile-strings.c:3164
+#: ../intl-scm/guile-strings.c:4318
+msgid "Include unrealized gains and losses in the computation.  Will produce incorrect results if the current file uses commodity trading accounts"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3168 ../intl-scm/guile-strings.c:4322
+#: ../intl-scm/guile-strings.c:3168
+#: ../intl-scm/guile-strings.c:4322
 #, fuzzy
 msgid "Total Assets"
 msgstr "借方合計"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3172 ../intl-scm/guile-strings.c:4326
+#: ../intl-scm/guile-strings.c:3172
+#: ../intl-scm/guile-strings.c:4326
 #, fuzzy
 msgid "Total Liabilities"
 msgstr "負債"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3178 ../intl-scm/guile-strings.c:4332
+#: ../intl-scm/guile-strings.c:3178
+#: ../intl-scm/guile-strings.c:4332
 #, fuzzy
 msgid "Retained Losses"
 msgstr "利益および損失"
@@ -20061,211 +19900,242 @@
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3182 ../intl-scm/guile-strings.c:3470
-#: ../intl-scm/guile-strings.c:4336 ../intl-scm/guile-strings.c:4624
+#: ../intl-scm/guile-strings.c:3182
+#: ../intl-scm/guile-strings.c:3470
+#: ../intl-scm/guile-strings.c:4336
+#: ../intl-scm/guile-strings.c:4624
 #, fuzzy
 msgid "Unrealized Losses"
 msgstr "内部留保"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3184 ../intl-scm/guile-strings.c:4338
+#: ../intl-scm/guile-strings.c:3184
+#: ../intl-scm/guile-strings.c:4338
 msgid "Total Equity"
 msgstr "総資本"
 
 #. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:3186 ../intl-scm/guile-strings.c:4340
+#: ../intl-scm/guile-strings.c:3186
+#: ../intl-scm/guile-strings.c:4340
 #, fuzzy
 msgid "Total Liabilities & Equity"
 msgstr "負債/資本"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3188 ../intl-scm/guile-strings.c:4342
+#: ../intl-scm/guile-strings.c:3188
+#: ../intl-scm/guile-strings.c:4342
 msgid "Account Summary"
 msgstr "勘定科目集計"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3208 ../intl-scm/guile-strings.c:4362
+#: ../intl-scm/guile-strings.c:3208
+#: ../intl-scm/guile-strings.c:4362
 msgid "Depth limit behavior"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3210 ../intl-scm/guile-strings.c:4364
+#: ../intl-scm/guile-strings.c:3210
+#: ../intl-scm/guile-strings.c:4364
 msgid "How to treat accounts which exceed the specified depth limit (if any)"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3234 ../intl-scm/guile-strings.c:4388
+#: ../intl-scm/guile-strings.c:3234
+#: ../intl-scm/guile-strings.c:4388
 #, fuzzy
 msgid "Show an account's balance"
 msgstr "印刷される残高に子勘定科目の残高を含めますか?"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3238 ../intl-scm/guile-strings.c:4392
+#: ../intl-scm/guile-strings.c:3238
+#: ../intl-scm/guile-strings.c:4392
 #, fuzzy
 msgid "Show an account's account code"
 msgstr "長い勘定科目名を表示する"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3242 ../intl-scm/guile-strings.c:4396
+#: ../intl-scm/guile-strings.c:3242
+#: ../intl-scm/guile-strings.c:4396
 #, fuzzy
 msgid "Show an account's account type"
 msgstr "長い勘定科目名を表示する"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3244 ../intl-scm/guile-strings.c:4398
+#: ../intl-scm/guile-strings.c:3244
+#: ../intl-scm/guile-strings.c:4398
 #, fuzzy
 msgid "Account Description"
 msgstr "四番目のオプション"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3246 ../intl-scm/guile-strings.c:4400
+#: ../intl-scm/guile-strings.c:3246
+#: ../intl-scm/guile-strings.c:4400
 #, fuzzy
 msgid "Show an account's description"
 msgstr "長い勘定科目名を表示する"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3248 ../intl-scm/guile-strings.c:4402
+#: ../intl-scm/guile-strings.c:3248
+#: ../intl-scm/guile-strings.c:4402
 #, fuzzy
 msgid "Account Notes"
 msgstr "勘定科目名"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3250 ../intl-scm/guile-strings.c:4404
+#: ../intl-scm/guile-strings.c:3250
+#: ../intl-scm/guile-strings.c:4404
 #, fuzzy
 msgid "Show an account's notes"
 msgstr "長い勘定科目名を表示する"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3266 ../intl-scm/guile-strings.c:4420
+#: ../intl-scm/guile-strings.c:3266
+#: ../intl-scm/guile-strings.c:4420
 #, fuzzy
 msgid "Recursive Balance"
 msgstr "照合済みの貸借:"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3268 ../intl-scm/guile-strings.c:4422
-msgid ""
-"Show the total balance, including balances in subaccounts, of any account at "
-"the depth limit"
+#: ../intl-scm/guile-strings.c:3268
+#: ../intl-scm/guile-strings.c:4422
+msgid "Show the total balance, including balances in subaccounts, of any account at the depth limit"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3270 ../intl-scm/guile-strings.c:4424
+#: ../intl-scm/guile-strings.c:3270
+#: ../intl-scm/guile-strings.c:4424
 #, fuzzy
 msgid "Raise Accounts"
 msgstr "他の勘定科目"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3272 ../intl-scm/guile-strings.c:4426
+#: ../intl-scm/guile-strings.c:3272
+#: ../intl-scm/guile-strings.c:4426
 #, fuzzy
 msgid "Shows accounts deeper than the depth limit at the depth limit"
 msgstr "他のすべてのオプションを無視して、この深さまで科目を表示する"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3274 ../intl-scm/guile-strings.c:4428
+#: ../intl-scm/guile-strings.c:3274
+#: ../intl-scm/guile-strings.c:4428
 #, fuzzy
 msgid "Omit Accounts"
 msgstr "勘定科目を編集"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3276 ../intl-scm/guile-strings.c:4430
+#: ../intl-scm/guile-strings.c:3276
+#: ../intl-scm/guile-strings.c:4430
 msgid "Disregard completely any accounts deeper than the depth limit"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3278 ../intl-scm/guile-strings.c:4432
+#: ../intl-scm/guile-strings.c:3278
+#: ../intl-scm/guile-strings.c:4432
 msgid "Code"
 msgstr "コード"
 
 #. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:3284 ../intl-scm/guile-strings.c:4438
+#: ../intl-scm/guile-strings.c:3284
+#: ../intl-scm/guile-strings.c:4438
 #, fuzzy
 msgid "Account title"
 msgstr "勘定科目名"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3290 ../intl-scm/guile-strings.c:4444
+#: ../intl-scm/guile-strings.c:3290
+#: ../intl-scm/guile-strings.c:4444
 #, fuzzy
 msgid "Advanced Portfolio"
 msgstr "株式ポートフォリオ"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3298 ../intl-scm/guile-strings.c:4452
+#: ../intl-scm/guile-strings.c:3298
+#: ../intl-scm/guile-strings.c:4452
 msgid "Include gains and losses"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3300 ../intl-scm/guile-strings.c:4454
+#: ../intl-scm/guile-strings.c:3300
+#: ../intl-scm/guile-strings.c:4454
 #, fuzzy
 msgid "Show ticker symbols"
 msgstr "小計を表示"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3302 ../intl-scm/guile-strings.c:4456
+#: ../intl-scm/guile-strings.c:3302
+#: ../intl-scm/guile-strings.c:4456
 #, fuzzy
 msgid "Show listings"
 msgstr "全取引を表示"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3304 ../intl-scm/guile-strings.c:4458
+#: ../intl-scm/guile-strings.c:3304
+#: ../intl-scm/guile-strings.c:4458
 #, fuzzy
 msgid "Show prices"
 msgstr "摘要順にソート"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3306 ../intl-scm/guile-strings.c:4460
+#: ../intl-scm/guile-strings.c:3306
+#: ../intl-scm/guile-strings.c:4460
 #, fuzzy
 msgid "Show number of shares"
 msgstr "株数の一致による検索"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3308 ../intl-scm/guile-strings.c:3330
-#: ../intl-scm/guile-strings.c:4462 ../intl-scm/guile-strings.c:4484
+#: ../intl-scm/guile-strings.c:3308
+#: ../intl-scm/guile-strings.c:3330
+#: ../intl-scm/guile-strings.c:4462
+#: ../intl-scm/guile-strings.c:4484
 msgid "Basis calculation method"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3310 ../intl-scm/guile-strings.c:4464
+#: ../intl-scm/guile-strings.c:3310
+#: ../intl-scm/guile-strings.c:4464
 msgid "Set preference for price list data"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3326 ../intl-scm/guile-strings.c:4480
+#: ../intl-scm/guile-strings.c:3326
+#: ../intl-scm/guile-strings.c:4480
 #, fuzzy
 msgid "Most recent to report"
 msgstr "もっとも最近"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3328 ../intl-scm/guile-strings.c:4482
+#: ../intl-scm/guile-strings.c:3328
+#: ../intl-scm/guile-strings.c:4482
 #, fuzzy
 msgid "The most recent recorded price before report date"
 msgstr "もっとも最近に記録された価格"
@@ -20274,234 +20144,270 @@
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:3332 ../intl-scm/guile-strings.c:4058
-#: ../intl-scm/guile-strings.c:4078 ../intl-scm/guile-strings.c:4486
-#: ../intl-scm/guile-strings.c:5212 ../intl-scm/guile-strings.c:5232
+#: ../intl-scm/guile-strings.c:3332
+#: ../intl-scm/guile-strings.c:4058
+#: ../intl-scm/guile-strings.c:4078
+#: ../intl-scm/guile-strings.c:4486
+#: ../intl-scm/guile-strings.c:5212
+#: ../intl-scm/guile-strings.c:5232
 msgid "Average"
 msgstr "平均"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3334 ../intl-scm/guile-strings.c:4488
+#: ../intl-scm/guile-strings.c:3334
+#: ../intl-scm/guile-strings.c:4488
 msgid "Use average cost of all shares for basis"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3336 ../intl-scm/guile-strings.c:4490
+#: ../intl-scm/guile-strings.c:3336
+#: ../intl-scm/guile-strings.c:4490
 msgid "FIFO"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3338 ../intl-scm/guile-strings.c:4492
+#: ../intl-scm/guile-strings.c:3338
+#: ../intl-scm/guile-strings.c:4492
 msgid "Use first-in first-out method for basis"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3340 ../intl-scm/guile-strings.c:4494
+#: ../intl-scm/guile-strings.c:3340
+#: ../intl-scm/guile-strings.c:4494
 msgid "FILO"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3342 ../intl-scm/guile-strings.c:4496
+#: ../intl-scm/guile-strings.c:3342
+#: ../intl-scm/guile-strings.c:4496
 msgid "Use first-in last-out method for basis"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3344 ../intl-scm/guile-strings.c:4498
+#: ../intl-scm/guile-strings.c:3344
+#: ../intl-scm/guile-strings.c:4498
 msgid "Prefer use of price editor pricing over transactions, where applicable."
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3346 ../intl-scm/guile-strings.c:4500
+#: ../intl-scm/guile-strings.c:3346
+#: ../intl-scm/guile-strings.c:4500
 msgid "Include splits with no shares for calculating money-in and money-out"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3348 ../intl-scm/guile-strings.c:4502
+#: ../intl-scm/guile-strings.c:3348
+#: ../intl-scm/guile-strings.c:4502
 #, fuzzy
 msgid "Display the ticker symbols"
 msgstr "合計を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3350 ../intl-scm/guile-strings.c:4504
+#: ../intl-scm/guile-strings.c:3350
+#: ../intl-scm/guile-strings.c:4504
 #, fuzzy
 msgid "Display exchange listings"
 msgstr "N行表示"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3352 ../intl-scm/guile-strings.c:4506
+#: ../intl-scm/guile-strings.c:3352
+#: ../intl-scm/guile-strings.c:4506
 #, fuzzy
 msgid "Display numbers of shares in accounts"
 msgstr "株数を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3356 ../intl-scm/guile-strings.c:4510
+#: ../intl-scm/guile-strings.c:3356
+#: ../intl-scm/guile-strings.c:4510
 #, fuzzy
 msgid "Display share prices"
 msgstr "%s 帳票を表示。"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3376 ../intl-scm/guile-strings.c:4530
+#: ../intl-scm/guile-strings.c:3376
+#: ../intl-scm/guile-strings.c:4530
 #, fuzzy
 msgid "Basis"
 msgstr "ためにならないもの"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3384 ../intl-scm/guile-strings.c:4538
+#: ../intl-scm/guile-strings.c:3384
+#: ../intl-scm/guile-strings.c:4538
 #, fuzzy
 msgid "Realized Gain"
 msgstr "内部留保"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3386 ../intl-scm/guile-strings.c:4540
+#: ../intl-scm/guile-strings.c:3386
+#: ../intl-scm/guile-strings.c:4540
 #, fuzzy
 msgid "Unrealized Gain"
 msgstr "内部留保"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3388 ../intl-scm/guile-strings.c:4542
+#: ../intl-scm/guile-strings.c:3388
+#: ../intl-scm/guile-strings.c:4542
 #, fuzzy
 msgid "Total Gain"
 msgstr "合計"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3390 ../intl-scm/guile-strings.c:4544
+#: ../intl-scm/guile-strings.c:3390
+#: ../intl-scm/guile-strings.c:4544
 #, fuzzy
 msgid "Total Return"
 msgstr "合計"
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3392 ../intl-scm/guile-strings.c:4546
-msgid ""
-"* this commodity data was built using transaction pricing instead of the "
-"price list."
+#: ../intl-scm/guile-strings.c:3392
+#: ../intl-scm/guile-strings.c:4546
+msgid "* this commodity data was built using transaction pricing instead of the price list."
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:3394 ../intl-scm/guile-strings.c:4548
-msgid ""
-"If you are in a multi-currency situation, the exchanges may not be correct."
+#: ../intl-scm/guile-strings.c:3394
+#: ../intl-scm/guile-strings.c:4548
+msgid "If you are in a multi-currency situation, the exchanges may not be correct."
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3396 ../intl-scm/guile-strings.c:4550
+#: ../intl-scm/guile-strings.c:3396
+#: ../intl-scm/guile-strings.c:4550
 msgid "Equity Statement"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3412 ../intl-scm/guile-strings.c:4566
+#: ../intl-scm/guile-strings.c:3412
+#: ../intl-scm/guile-strings.c:4566
 #, fuzzy
 msgid "Report only on these accounts"
 msgstr "この勘定科目について取引帳票を実行する"
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3458 ../intl-scm/guile-strings.c:3476
-#: ../intl-scm/guile-strings.c:4612 ../intl-scm/guile-strings.c:4630
+#: ../intl-scm/guile-strings.c:3458
+#: ../intl-scm/guile-strings.c:3476
+#: ../intl-scm/guile-strings.c:4612
+#: ../intl-scm/guile-strings.c:4630
 #, fuzzy
 msgid "Capital"
 msgstr "キャピタルゲイン"
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3464 ../intl-scm/guile-strings.c:4618
+#: ../intl-scm/guile-strings.c:3464
+#: ../intl-scm/guile-strings.c:4618
 #, fuzzy
 msgid "Investments"
 msgstr "金利"
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3466 ../intl-scm/guile-strings.c:4620
+#: ../intl-scm/guile-strings.c:3466
+#: ../intl-scm/guile-strings.c:4620
 #, fuzzy
 msgid "Withdrawals"
 msgstr "引出し"
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3472 ../intl-scm/guile-strings.c:4626
+#: ../intl-scm/guile-strings.c:3472
+#: ../intl-scm/guile-strings.c:4626
 #, fuzzy
 msgid "Increase in capital"
 msgstr "増加"
 
 #. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:3474 ../intl-scm/guile-strings.c:4628
+#: ../intl-scm/guile-strings.c:3474
+#: ../intl-scm/guile-strings.c:4628
 #, fuzzy
 msgid "Decrease in capital"
 msgstr "減少"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3478 ../intl-scm/guile-strings.c:4632
+#: ../intl-scm/guile-strings.c:3478
+#: ../intl-scm/guile-strings.c:4632
 msgid "Transaction Report"
 msgstr "取引出納帳"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3496 ../intl-scm/guile-strings.c:4650
+#: ../intl-scm/guile-strings.c:3496
+#: ../intl-scm/guile-strings.c:4650
 msgid "Table for Exporting"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3498 ../intl-scm/guile-strings.c:4652
+#: ../intl-scm/guile-strings.c:3498
+#: ../intl-scm/guile-strings.c:4652
 #, fuzzy
 msgid "Common Currency"
 msgstr "通貨を選択"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3504 ../intl-scm/guile-strings.c:4658
+#: ../intl-scm/guile-strings.c:3504
+#: ../intl-scm/guile-strings.c:4658
 msgid "Total For "
 msgstr "合計"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3506 ../intl-scm/guile-strings.c:3868
-#: ../intl-scm/guile-strings.c:4660 ../intl-scm/guile-strings.c:5022
+#: ../intl-scm/guile-strings.c:3506
+#: ../intl-scm/guile-strings.c:3868
+#: ../intl-scm/guile-strings.c:4660
+#: ../intl-scm/guile-strings.c:5022
 msgid "Grand Total"
 msgstr "総合計"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3588 ../intl-scm/guile-strings.c:4742
+#: ../intl-scm/guile-strings.c:3588
+#: ../intl-scm/guile-strings.c:4742
 msgid "Transfer from/to"
 msgstr "転送元/先"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3608 ../intl-scm/guile-strings.c:4762
+#: ../intl-scm/guile-strings.c:3608
+#: ../intl-scm/guile-strings.c:4762
 msgid "Report style"
 msgstr "帳票のスタイル"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3610 ../intl-scm/guile-strings.c:4764
+#: ../intl-scm/guile-strings.c:3610
+#: ../intl-scm/guile-strings.c:4764
 msgid "Multi-Line"
 msgstr "複数行"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3612 ../intl-scm/guile-strings.c:4766
+#: ../intl-scm/guile-strings.c:3612
+#: ../intl-scm/guile-strings.c:4766
 msgid "Display N lines"
 msgstr "N行表示"
 
@@ -20509,287 +20415,334 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3614 ../intl-scm/guile-strings.c:3832
-#: ../intl-scm/guile-strings.c:3962 ../intl-scm/guile-strings.c:4768
-#: ../intl-scm/guile-strings.c:4986 ../intl-scm/guile-strings.c:5116
+#: ../intl-scm/guile-strings.c:3614
+#: ../intl-scm/guile-strings.c:3832
+#: ../intl-scm/guile-strings.c:3962
+#: ../intl-scm/guile-strings.c:4768
+#: ../intl-scm/guile-strings.c:4986
+#: ../intl-scm/guile-strings.c:5116
 msgid "Single"
 msgstr "1列"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3616 ../intl-scm/guile-strings.c:4770
+#: ../intl-scm/guile-strings.c:3616
+#: ../intl-scm/guile-strings.c:4770
 msgid "Display 1 line"
 msgstr "1行表示"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3618 ../intl-scm/guile-strings.c:4772
+#: ../intl-scm/guile-strings.c:3618
+#: ../intl-scm/guile-strings.c:4772
 msgid "Convert all transactions into a common currency"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3620 ../intl-scm/guile-strings.c:4774
+#: ../intl-scm/guile-strings.c:3620
+#: ../intl-scm/guile-strings.c:4774
 msgid "Formats the table suitable for cut & paste exporting with extra cells"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3622 ../intl-scm/guile-strings.c:4776
+#: ../intl-scm/guile-strings.c:3622
+#: ../intl-scm/guile-strings.c:4776
 #, fuzzy
 msgid "Report Accounts"
 msgstr "勘定科目を書き出し..."
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3626 ../intl-scm/guile-strings.c:4780
+#: ../intl-scm/guile-strings.c:3626
+#: ../intl-scm/guile-strings.c:4780
 #, fuzzy
 msgid "Filter Accounts"
 msgstr "他の勘定科目"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3628 ../intl-scm/guile-strings.c:4782
+#: ../intl-scm/guile-strings.c:3628
+#: ../intl-scm/guile-strings.c:4782
 #, fuzzy
 msgid "Filter on these accounts"
 msgstr "勘定科目のグループ化"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3632 ../intl-scm/guile-strings.c:4786
+#: ../intl-scm/guile-strings.c:3632
+#: ../intl-scm/guile-strings.c:4786
 #, fuzzy
 msgid "Filter account"
 msgstr "他の勘定科目"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3636 ../intl-scm/guile-strings.c:4790
+#: ../intl-scm/guile-strings.c:3636
+#: ../intl-scm/guile-strings.c:4790
 msgid "Do not do any filtering"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3638 ../intl-scm/guile-strings.c:4792
+#: ../intl-scm/guile-strings.c:3638
+#: ../intl-scm/guile-strings.c:4792
 #, fuzzy
 msgid "Include Transactions to/from Filter Accounts"
 msgstr "選択された勘定科目全ての補助科目を含む"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3640 ../intl-scm/guile-strings.c:4794
+#: ../intl-scm/guile-strings.c:3640
+#: ../intl-scm/guile-strings.c:4794
 #, fuzzy
 msgid "Include transactions to/from filter accounts only"
 msgstr "勘定科目に新しい取引を追加"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3642 ../intl-scm/guile-strings.c:4796
+#: ../intl-scm/guile-strings.c:3642
+#: ../intl-scm/guile-strings.c:4796
 #, fuzzy
 msgid "Exclude Transactions to/from Filter Accounts"
 msgstr "勘定科目に新しい取引を追加"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3644 ../intl-scm/guile-strings.c:4798
+#: ../intl-scm/guile-strings.c:3644
+#: ../intl-scm/guile-strings.c:4798
 #, fuzzy
 msgid "Exclude transactions to/from all filter accounts"
 msgstr "選択された勘定科目全ての補助科目を含む"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3646 ../intl-scm/guile-strings.c:4800
+#: ../intl-scm/guile-strings.c:3646
+#: ../intl-scm/guile-strings.c:4800
 #, fuzzy
 msgid "How to handle void transactions"
 msgstr "選択された取引をコピーする"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3648 ../intl-scm/guile-strings.c:4802
+#: ../intl-scm/guile-strings.c:3648
+#: ../intl-scm/guile-strings.c:4802
 #, fuzzy
 msgid "Non-void only"
 msgstr "アイコンのみ"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3650 ../intl-scm/guile-strings.c:4804
+#: ../intl-scm/guile-strings.c:3650
+#: ../intl-scm/guile-strings.c:4804
 #, fuzzy
 msgid "Show only non-voided transactions"
 msgstr "全取引を表示"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3652 ../intl-scm/guile-strings.c:4806
+#: ../intl-scm/guile-strings.c:3652
+#: ../intl-scm/guile-strings.c:4806
 #, fuzzy
 msgid "Void only"
 msgstr "アイコンのみ"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3654 ../intl-scm/guile-strings.c:4808
+#: ../intl-scm/guile-strings.c:3654
+#: ../intl-scm/guile-strings.c:4808
 #, fuzzy
 msgid "Show only voided transactions"
 msgstr "全取引を表示"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3656 ../intl-scm/guile-strings.c:4810
+#: ../intl-scm/guile-strings.c:3656
+#: ../intl-scm/guile-strings.c:4810
 #, fuzzy
 msgid "Both"
 msgstr "月"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3658 ../intl-scm/guile-strings.c:4812
+#: ../intl-scm/guile-strings.c:3658
+#: ../intl-scm/guile-strings.c:4812
 #, fuzzy
 msgid "Show both (and include void transactions in totals)"
 msgstr "すべての諸口と共に拡張された取引を表示"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3662 ../intl-scm/guile-strings.c:4816
+#: ../intl-scm/guile-strings.c:3662
+#: ../intl-scm/guile-strings.c:4816
 msgid "Do not sort"
 msgstr "ソートしない"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3666 ../intl-scm/guile-strings.c:4820
+#: ../intl-scm/guile-strings.c:3666
+#: ../intl-scm/guile-strings.c:4820
 msgid "Sort & subtotal by account name"
 msgstr "ソートし勘定科目別に小計"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3670 ../intl-scm/guile-strings.c:4824
+#: ../intl-scm/guile-strings.c:3670
+#: ../intl-scm/guile-strings.c:4824
 msgid "Sort & subtotal by account code"
 msgstr "ソートし勘定コード別に小計"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3676 ../intl-scm/guile-strings.c:4830
+#: ../intl-scm/guile-strings.c:3676
+#: ../intl-scm/guile-strings.c:4830
 msgid "Exact Time"
 msgstr "正確な時間"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3678 ../intl-scm/guile-strings.c:4832
+#: ../intl-scm/guile-strings.c:3678
+#: ../intl-scm/guile-strings.c:4832
 msgid "Sort by exact time"
 msgstr "正確な時間順にソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3682 ../intl-scm/guile-strings.c:4836
+#: ../intl-scm/guile-strings.c:3682
+#: ../intl-scm/guile-strings.c:4836
 #, fuzzy
 msgid "Sort by the Reconciled Date"
 msgstr "請求書の日付順で並べる"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3684 ../intl-scm/guile-strings.c:4838
+#: ../intl-scm/guile-strings.c:3684
+#: ../intl-scm/guile-strings.c:4838
 #, fuzzy
 msgid "Register Order"
 msgstr "帳票"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3686 ../intl-scm/guile-strings.c:4840
+#: ../intl-scm/guile-strings.c:3686
+#: ../intl-scm/guile-strings.c:4840
 #, fuzzy
 msgid "Sort as with the register"
 msgstr "帳簿ウィンドウで使用するフォント"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3690 ../intl-scm/guile-strings.c:4844
+#: ../intl-scm/guile-strings.c:3690
+#: ../intl-scm/guile-strings.c:4844
 msgid "Sort by account transferred from/to's name"
 msgstr "転送元/先の勘定科目名でソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3694 ../intl-scm/guile-strings.c:4848
+#: ../intl-scm/guile-strings.c:3694
+#: ../intl-scm/guile-strings.c:4848
 msgid "Sort by account transferred from/to's code"
 msgstr "転送元/先の勘定コードでソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3706 ../intl-scm/guile-strings.c:4860
+#: ../intl-scm/guile-strings.c:3706
+#: ../intl-scm/guile-strings.c:4860
 msgid "Sort by check/transaction number"
 msgstr "小切手番号/取引番号でソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3712 ../intl-scm/guile-strings.c:4866
+#: ../intl-scm/guile-strings.c:3712
+#: ../intl-scm/guile-strings.c:4866
 msgid "Ascending"
 msgstr "昇順"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3714 ../intl-scm/guile-strings.c:4868
+#: ../intl-scm/guile-strings.c:3714
+#: ../intl-scm/guile-strings.c:4868
 msgid "smallest to largest, earliest to latest"
 msgstr "小さい方から大きい方へ、古い方から新しい方へ"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3716 ../intl-scm/guile-strings.c:4870
+#: ../intl-scm/guile-strings.c:3716
+#: ../intl-scm/guile-strings.c:4870
 msgid "Descending"
 msgstr "降順"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3718 ../intl-scm/guile-strings.c:4872
+#: ../intl-scm/guile-strings.c:3718
+#: ../intl-scm/guile-strings.c:4872
 msgid "largest to smallest, latest to earliest"
 msgstr "大きい方から小さい方へ、新しい方から古い方へ"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3736 ../intl-scm/guile-strings.c:4890
+#: ../intl-scm/guile-strings.c:3736
+#: ../intl-scm/guile-strings.c:4890
 msgid "Sort by this criterion first"
 msgstr "最初にこのクライテリアでソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3740 ../intl-scm/guile-strings.c:4894
+#: ../intl-scm/guile-strings.c:3740
+#: ../intl-scm/guile-strings.c:4894
 #, fuzzy
 msgid "Show the full account name for subtotals and subtitles?"
 msgstr "凡例に長い勘定科目名を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3744 ../intl-scm/guile-strings.c:4898
+#: ../intl-scm/guile-strings.c:3744
+#: ../intl-scm/guile-strings.c:4898
 msgid "Show the account code for subtotals and subtitles?"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3746 ../intl-scm/guile-strings.c:4900
+#: ../intl-scm/guile-strings.c:3746
+#: ../intl-scm/guile-strings.c:4900
 msgid "Subtotal according to the primary key?"
 msgstr "一次キーにしたがって小計を行いますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3748 ../intl-scm/guile-strings.c:3758
-#: ../intl-scm/guile-strings.c:4902 ../intl-scm/guile-strings.c:4912
+#: ../intl-scm/guile-strings.c:3748
+#: ../intl-scm/guile-strings.c:3758
+#: ../intl-scm/guile-strings.c:4902
+#: ../intl-scm/guile-strings.c:4912
 msgid "Do a date subtotal"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3752 ../intl-scm/guile-strings.c:4906
+#: ../intl-scm/guile-strings.c:3752
+#: ../intl-scm/guile-strings.c:4906
 msgid "Order of primary sorting"
 msgstr "一次ソート順"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3754 ../intl-scm/guile-strings.c:4908
+#: ../intl-scm/guile-strings.c:3754
+#: ../intl-scm/guile-strings.c:4908
 msgid "Sort by this criterion second"
 msgstr "このクライテリアを二番目に使ってソート"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3756 ../intl-scm/guile-strings.c:4910
+#: ../intl-scm/guile-strings.c:3756
+#: ../intl-scm/guile-strings.c:4910
 msgid "Subtotal according to the secondary key?"
 msgstr "二番目のキーにしたがって小計を行いますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3762 ../intl-scm/guile-strings.c:4916
+#: ../intl-scm/guile-strings.c:3762
+#: ../intl-scm/guile-strings.c:4916
 msgid "Order of Secondary sorting"
 msgstr "二次ソート順"
 
@@ -20803,17 +20756,23 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3766 ../intl-scm/guile-strings.c:3924
-#: ../intl-scm/guile-strings.c:4920 ../intl-scm/guile-strings.c:5078
-#: ../intl-scm/guile-strings.c:5946 ../intl-scm/guile-strings.c:6264
-#: ../intl-scm/guile-strings.c:6470 ../intl-scm/guile-strings.c:6788
-#: ../intl-scm/guile-strings.c:7048 ../intl-scm/guile-strings.c:7288
+#: ../intl-scm/guile-strings.c:3766
+#: ../intl-scm/guile-strings.c:3924
+#: ../intl-scm/guile-strings.c:4920
+#: ../intl-scm/guile-strings.c:5078
+#: ../intl-scm/guile-strings.c:5946
+#: ../intl-scm/guile-strings.c:6264
+#: ../intl-scm/guile-strings.c:6470
+#: ../intl-scm/guile-strings.c:6788
+#: ../intl-scm/guile-strings.c:7048
+#: ../intl-scm/guile-strings.c:7288
 msgid "Display the date?"
 msgstr "日付を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3770 ../intl-scm/guile-strings.c:4924
+#: ../intl-scm/guile-strings.c:3770
+#: ../intl-scm/guile-strings.c:4924
 #, fuzzy
 msgid "Display the reconciled date?"
 msgstr "日付を表示しますか?"
@@ -20822,8 +20781,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3774 ../intl-scm/guile-strings.c:3930
-#: ../intl-scm/guile-strings.c:4928 ../intl-scm/guile-strings.c:5084
+#: ../intl-scm/guile-strings.c:3774
+#: ../intl-scm/guile-strings.c:3930
+#: ../intl-scm/guile-strings.c:4928
+#: ../intl-scm/guile-strings.c:5084
 msgid "Display the check number?"
 msgstr "小切手番号を表示しますか?"
 
@@ -20837,55 +20798,63 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3778 ../intl-scm/guile-strings.c:3936
-#: ../intl-scm/guile-strings.c:4932 ../intl-scm/guile-strings.c:5090
-#: ../intl-scm/guile-strings.c:5952 ../intl-scm/guile-strings.c:6270
-#: ../intl-scm/guile-strings.c:6476 ../intl-scm/guile-strings.c:6794
-#: ../intl-scm/guile-strings.c:7054 ../intl-scm/guile-strings.c:7294
+#: ../intl-scm/guile-strings.c:3778
+#: ../intl-scm/guile-strings.c:3936
+#: ../intl-scm/guile-strings.c:4932
+#: ../intl-scm/guile-strings.c:5090
+#: ../intl-scm/guile-strings.c:5952
+#: ../intl-scm/guile-strings.c:6270
+#: ../intl-scm/guile-strings.c:6476
+#: ../intl-scm/guile-strings.c:6794
+#: ../intl-scm/guile-strings.c:7054
+#: ../intl-scm/guile-strings.c:7294
 msgid "Display the description?"
 msgstr "説明を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3782 ../intl-scm/guile-strings.c:4936
+#: ../intl-scm/guile-strings.c:3782
+#: ../intl-scm/guile-strings.c:4936
 msgid "Display the memo?"
 msgstr "摘要を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3786 ../intl-scm/guile-strings.c:4940
+#: ../intl-scm/guile-strings.c:3786
+#: ../intl-scm/guile-strings.c:4940
 #, fuzzy
 msgid "Display the account name?"
 msgstr "勘定科目名をフルに表示する"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3790 ../intl-scm/guile-strings.c:3802
-#: ../intl-scm/guile-strings.c:4944 ../intl-scm/guile-strings.c:4956
+#: ../intl-scm/guile-strings.c:3790
+#: ../intl-scm/guile-strings.c:3802
+#: ../intl-scm/guile-strings.c:4944
+#: ../intl-scm/guile-strings.c:4956
 msgid "Display the full account name"
 msgstr "勘定科目名をフルに表示する"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3794 ../intl-scm/guile-strings.c:4948
+#: ../intl-scm/guile-strings.c:3794
+#: ../intl-scm/guile-strings.c:4948
 #, fuzzy
 msgid "Display the account code"
 msgstr "勘定科目を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3798 ../intl-scm/guile-strings.c:4952
+#: ../intl-scm/guile-strings.c:3798
+#: ../intl-scm/guile-strings.c:4952
 #, fuzzy
-msgid ""
-"Display the other account name? (if this is a split transaction, this "
-"parameter is guessed)."
-msgstr ""
-"他の科目を表示しますか?(もしこれが諸口の取引の場合には、パラメータを推測しま"
-"す)"
+msgid "Display the other account name? (if this is a split transaction, this parameter is guessed)."
+msgstr "他の科目を表示しますか?(もしこれが諸口の取引の場合には、パラメータを推測します)"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3806 ../intl-scm/guile-strings.c:4960
+#: ../intl-scm/guile-strings.c:3806
+#: ../intl-scm/guile-strings.c:4960
 #, fuzzy
 msgid "Display the other account code"
 msgstr "勘定科目を表示しますか?"
@@ -20894,8 +20863,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3810 ../intl-scm/guile-strings.c:3948
-#: ../intl-scm/guile-strings.c:4964 ../intl-scm/guile-strings.c:5102
+#: ../intl-scm/guile-strings.c:3810
+#: ../intl-scm/guile-strings.c:3948
+#: ../intl-scm/guile-strings.c:4964
+#: ../intl-scm/guile-strings.c:5102
 msgid "Display the number of shares?"
 msgstr "株数を表示しますか?"
 
@@ -20903,8 +20874,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3814 ../intl-scm/guile-strings.c:3954
-#: ../intl-scm/guile-strings.c:4968 ../intl-scm/guile-strings.c:5108
+#: ../intl-scm/guile-strings.c:3814
+#: ../intl-scm/guile-strings.c:3954
+#: ../intl-scm/guile-strings.c:4968
+#: ../intl-scm/guile-strings.c:5108
 #, fuzzy
 msgid "Display the shares price?"
 msgstr "%s 帳票を表示。"
@@ -20913,8 +20886,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3818 ../intl-scm/guile-strings.c:3974
-#: ../intl-scm/guile-strings.c:4972 ../intl-scm/guile-strings.c:5128
+#: ../intl-scm/guile-strings.c:3818
+#: ../intl-scm/guile-strings.c:3974
+#: ../intl-scm/guile-strings.c:4972
+#: ../intl-scm/guile-strings.c:5128
 msgid "Display a running balance"
 msgstr ""
 
@@ -20928,11 +20903,16 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3822 ../intl-scm/guile-strings.c:3980
-#: ../intl-scm/guile-strings.c:4976 ../intl-scm/guile-strings.c:5134
-#: ../intl-scm/guile-strings.c:6006 ../intl-scm/guile-strings.c:6342
-#: ../intl-scm/guile-strings.c:6530 ../intl-scm/guile-strings.c:6866
-#: ../intl-scm/guile-strings.c:7108 ../intl-scm/guile-strings.c:7348
+#: ../intl-scm/guile-strings.c:3822
+#: ../intl-scm/guile-strings.c:3980
+#: ../intl-scm/guile-strings.c:4976
+#: ../intl-scm/guile-strings.c:5134
+#: ../intl-scm/guile-strings.c:6006
+#: ../intl-scm/guile-strings.c:6342
+#: ../intl-scm/guile-strings.c:6530
+#: ../intl-scm/guile-strings.c:6866
+#: ../intl-scm/guile-strings.c:7108
+#: ../intl-scm/guile-strings.c:7348
 msgid "Display the totals?"
 msgstr "合計を表示しますか?"
 
@@ -20940,14 +20920,17 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3826 ../intl-scm/guile-strings.c:3960
-#: ../intl-scm/guile-strings.c:4980 ../intl-scm/guile-strings.c:5114
+#: ../intl-scm/guile-strings.c:3826
+#: ../intl-scm/guile-strings.c:3960
+#: ../intl-scm/guile-strings.c:4980
+#: ../intl-scm/guile-strings.c:5114
 msgid "Display the amount?"
 msgstr "金額を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3830 ../intl-scm/guile-strings.c:4984
+#: ../intl-scm/guile-strings.c:3830
+#: ../intl-scm/guile-strings.c:4984
 msgid "No amount display"
 msgstr "金額表示なし"
 
@@ -20955,8 +20938,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3834 ../intl-scm/guile-strings.c:3964
-#: ../intl-scm/guile-strings.c:4988 ../intl-scm/guile-strings.c:5118
+#: ../intl-scm/guile-strings.c:3834
+#: ../intl-scm/guile-strings.c:3964
+#: ../intl-scm/guile-strings.c:4988
+#: ../intl-scm/guile-strings.c:5118
 msgid "Single Column Display"
 msgstr "1列表示"
 
@@ -20964,8 +20949,10 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3836 ../intl-scm/guile-strings.c:3966
-#: ../intl-scm/guile-strings.c:4990 ../intl-scm/guile-strings.c:5120
+#: ../intl-scm/guile-strings.c:3836
+#: ../intl-scm/guile-strings.c:3966
+#: ../intl-scm/guile-strings.c:4990
+#: ../intl-scm/guile-strings.c:5120
 msgid "Double"
 msgstr "2列"
 
@@ -20973,169 +20960,191 @@
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3838 ../intl-scm/guile-strings.c:3968
-#: ../intl-scm/guile-strings.c:4992 ../intl-scm/guile-strings.c:5122
+#: ../intl-scm/guile-strings.c:3838
+#: ../intl-scm/guile-strings.c:3968
+#: ../intl-scm/guile-strings.c:4992
+#: ../intl-scm/guile-strings.c:5122
 msgid "Two Column Display"
 msgstr "2列表示"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3842 ../intl-scm/guile-strings.c:4996
+#: ../intl-scm/guile-strings.c:3842
+#: ../intl-scm/guile-strings.c:4996
 #, fuzzy
 msgid "Reverse amount display for certain account types"
 msgstr "所得と費用の金額の表示を逆にする"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3846 ../intl-scm/guile-strings.c:5000
+#: ../intl-scm/guile-strings.c:3846
+#: ../intl-scm/guile-strings.c:5000
 msgid "Don't change any displayed amounts"
 msgstr "どの表示された金額も変更してはいけません"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3848 ../intl-scm/guile-strings.c:5002
+#: ../intl-scm/guile-strings.c:3848
+#: ../intl-scm/guile-strings.c:5002
 msgid "Income and Expense"
 msgstr "所得および費用"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3850 ../intl-scm/guile-strings.c:5004
+#: ../intl-scm/guile-strings.c:3850
+#: ../intl-scm/guile-strings.c:5004
 msgid "Reverse amount display for Income and Expense Accounts"
 msgstr "所得と費用の金額の表示を逆にする"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3852 ../intl-scm/guile-strings.c:5006
+#: ../intl-scm/guile-strings.c:3852
+#: ../intl-scm/guile-strings.c:5006
 msgid "Credit Accounts"
 msgstr "貸方勘定科目"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3854 ../intl-scm/guile-strings.c:5008
+#: ../intl-scm/guile-strings.c:3854
+#: ../intl-scm/guile-strings.c:5008
 #, fuzzy
-msgid ""
-"Reverse amount display for Liability, Payable, Equity, Credit Card, and "
-"Income accounts"
+msgid "Reverse amount display for Liability, Payable, Equity, Credit Card, and Income accounts"
 msgstr "クレジットカード、負債、資本、所得の各勘定科目をそれぞれ逆にする"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3856 ../intl-scm/guile-strings.c:5010
+#: ../intl-scm/guile-strings.c:3856
+#: ../intl-scm/guile-strings.c:5010
 #, c-format
 msgid "From %s To %s"
 msgstr "%s から %s まで"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3860 ../intl-scm/guile-strings.c:5014
+#: ../intl-scm/guile-strings.c:3860
+#: ../intl-scm/guile-strings.c:5014
 msgid "Primary Subtotals/headings"
 msgstr "第一の小計/見出し"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3864 ../intl-scm/guile-strings.c:5018
+#: ../intl-scm/guile-strings.c:3864
+#: ../intl-scm/guile-strings.c:5018
 msgid "Secondary Subtotals/headings"
 msgstr "第二の小計/見出し"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3872 ../intl-scm/guile-strings.c:5026
+#: ../intl-scm/guile-strings.c:3872
+#: ../intl-scm/guile-strings.c:5026
 msgid "Split Odd"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3876 ../intl-scm/guile-strings.c:5030
+#: ../intl-scm/guile-strings.c:3876
+#: ../intl-scm/guile-strings.c:5030
 msgid "Split Even"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3886 ../intl-scm/guile-strings.c:5040
+#: ../intl-scm/guile-strings.c:3886
+#: ../intl-scm/guile-strings.c:5040
 msgid "No matching transactions found"
 msgstr "一致する取引はありませんでした"
 
 #. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:3888 ../intl-scm/guile-strings.c:5042
+#: ../intl-scm/guile-strings.c:3888
+#: ../intl-scm/guile-strings.c:5042
 #, fuzzy
-msgid ""
-"No transactions were found that match the time interval and account "
-"selection specified in the Options panel."
-msgstr ""
-"指定されたインターバル時間および科目選択に一致する取引は見つかりませんでした"
+msgid "No transactions were found that match the time interval and account selection specified in the Options panel."
+msgstr "指定されたインターバル時間および科目選択に一致する取引は見つかりませんでした"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3916 ../intl-scm/guile-strings.c:5070
+#: ../intl-scm/guile-strings.c:3916
+#: ../intl-scm/guile-strings.c:5070
 msgid "The title of the report"
 msgstr "帳票のタイトル"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3942 ../intl-scm/guile-strings.c:5096
+#: ../intl-scm/guile-strings.c:3942
+#: ../intl-scm/guile-strings.c:5096
 msgid "Display the account?"
 msgstr "勘定科目を表示しますか?"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3982 ../intl-scm/guile-strings.c:5136
+#: ../intl-scm/guile-strings.c:3982
+#: ../intl-scm/guile-strings.c:5136
 #, fuzzy
 msgid "Total Debits"
 msgstr "借方合計"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3984 ../intl-scm/guile-strings.c:5138
+#: ../intl-scm/guile-strings.c:3984
+#: ../intl-scm/guile-strings.c:5138
 #, fuzzy
 msgid "Total Credits"
 msgstr "貸方合計"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3986 ../intl-scm/guile-strings.c:5140
+#: ../intl-scm/guile-strings.c:3986
+#: ../intl-scm/guile-strings.c:5140
 #, fuzzy
 msgid "Net Change"
 msgstr "変更済"
 
 #. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:3988 ../intl-scm/guile-strings.c:5142
+#: ../intl-scm/guile-strings.c:3988
+#: ../intl-scm/guile-strings.c:5142
 msgid "Client"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:4000 ../intl-scm/guile-strings.c:5154
+#: ../intl-scm/guile-strings.c:4000
+#: ../intl-scm/guile-strings.c:5154
 #, fuzzy
 msgid "Budget Report"
 msgstr "帳票"
 
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:4020 ../intl-scm/guile-strings.c:5174
+#: ../intl-scm/guile-strings.c:4020
+#: ../intl-scm/guile-strings.c:5174
 #, fuzzy
 msgid "Bgt"
 msgstr "予算"
 
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:4022 ../intl-scm/guile-strings.c:5176
+#: ../intl-scm/guile-strings.c:4022
+#: ../intl-scm/guile-strings.c:5176
 #, fuzzy
 msgid "Act"
 msgstr "取引内容"
 
 #. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:4024 ../intl-scm/guile-strings.c:5178
+#: ../intl-scm/guile-strings.c:4024
+#: ../intl-scm/guile-strings.c:5178
 #, fuzzy, c-format
 msgid "%s: %s"
 msgstr "%s から %s まで"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4026 ../intl-scm/guile-strings.c:4060
-#: ../intl-scm/guile-strings.c:5180 ../intl-scm/guile-strings.c:5214
+#: ../intl-scm/guile-strings.c:4026
+#: ../intl-scm/guile-strings.c:4060
+#: ../intl-scm/guile-strings.c:5180
+#: ../intl-scm/guile-strings.c:5214
 msgid "Average Balance"
 msgstr "平均残高"
 
@@ -21143,8 +21152,10 @@
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4038 ../intl-scm/guile-strings.c:4126
-#: ../intl-scm/guile-strings.c:5192 ../intl-scm/guile-strings.c:5280
+#: ../intl-scm/guile-strings.c:4038
+#: ../intl-scm/guile-strings.c:4126
+#: ../intl-scm/guile-strings.c:5192
+#: ../intl-scm/guile-strings.c:5280
 msgid "Include Sub-Accounts"
 msgstr "子勘定科目を含める"
 
@@ -21152,134 +21163,162 @@
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4040 ../intl-scm/guile-strings.c:4140
-#: ../intl-scm/guile-strings.c:5194 ../intl-scm/guile-strings.c:5294
+#: ../intl-scm/guile-strings.c:4040
+#: ../intl-scm/guile-strings.c:4140
+#: ../intl-scm/guile-strings.c:5194
+#: ../intl-scm/guile-strings.c:5294
 msgid "Include sub-accounts of all selected accounts"
 msgstr "選択された勘定科目全ての補助科目を含む"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4044 ../intl-scm/guile-strings.c:5198
+#: ../intl-scm/guile-strings.c:4044
+#: ../intl-scm/guile-strings.c:5198
 msgid "Do transaction report on this account"
 msgstr "この勘定科目について取引帳票を実行する"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4046 ../intl-scm/guile-strings.c:4096
-#: ../intl-scm/guile-strings.c:5200 ../intl-scm/guile-strings.c:5250
+#: ../intl-scm/guile-strings.c:4046
+#: ../intl-scm/guile-strings.c:4096
+#: ../intl-scm/guile-strings.c:5200
+#: ../intl-scm/guile-strings.c:5250
 msgid "Show table"
 msgstr "表を表示する"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4048 ../intl-scm/guile-strings.c:5202
+#: ../intl-scm/guile-strings.c:4048
+#: ../intl-scm/guile-strings.c:5202
 msgid "Display a table of the selected data."
 msgstr "選択されたデータの表を表示する"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4050 ../intl-scm/guile-strings.c:4094
-#: ../intl-scm/guile-strings.c:5204 ../intl-scm/guile-strings.c:5248
+#: ../intl-scm/guile-strings.c:4050
+#: ../intl-scm/guile-strings.c:4094
+#: ../intl-scm/guile-strings.c:5204
+#: ../intl-scm/guile-strings.c:5248
 msgid "Show plot"
 msgstr "プロットを表示する"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4052 ../intl-scm/guile-strings.c:5206
+#: ../intl-scm/guile-strings.c:4052
+#: ../intl-scm/guile-strings.c:5206
 msgid "Display a graph of the selected data."
 msgstr "選択されたデータのグラフを表示する"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4054 ../intl-scm/guile-strings.c:4092
-#: ../intl-scm/guile-strings.c:5208 ../intl-scm/guile-strings.c:5246
+#: ../intl-scm/guile-strings.c:4054
+#: ../intl-scm/guile-strings.c:4092
+#: ../intl-scm/guile-strings.c:5208
+#: ../intl-scm/guile-strings.c:5246
 msgid "Plot Type"
 msgstr "プロット形式"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4056 ../intl-scm/guile-strings.c:5210
+#: ../intl-scm/guile-strings.c:4056
+#: ../intl-scm/guile-strings.c:5210
 msgid "The type of graph to generate"
-msgstr "生成するグラフの型"
+msgstr "生成するグラフのタイプ"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4062 ../intl-scm/guile-strings.c:4088
-#: ../intl-scm/guile-strings.c:5216 ../intl-scm/guile-strings.c:5242
+#: ../intl-scm/guile-strings.c:4062
+#: ../intl-scm/guile-strings.c:4088
+#: ../intl-scm/guile-strings.c:5216
+#: ../intl-scm/guile-strings.c:5242
 msgid "Profit"
 msgstr "利益"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4064 ../intl-scm/guile-strings.c:5218
+#: ../intl-scm/guile-strings.c:4064
+#: ../intl-scm/guile-strings.c:5218
 msgid "Profit (Gain minus Loss)"
 msgstr "利益(所得-損失)"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4068 ../intl-scm/guile-strings.c:5222
+#: ../intl-scm/guile-strings.c:4068
+#: ../intl-scm/guile-strings.c:5222
 msgid "Gain And Loss"
 msgstr "利益および損失"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4074 ../intl-scm/guile-strings.c:5228
+#: ../intl-scm/guile-strings.c:4074
+#: ../intl-scm/guile-strings.c:5228
 msgid "Period start"
 msgstr "期間の開始日"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4076 ../intl-scm/guile-strings.c:5230
+#: ../intl-scm/guile-strings.c:4076
+#: ../intl-scm/guile-strings.c:5230
 msgid "Period end"
 msgstr "期間の終了日"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4080 ../intl-scm/guile-strings.c:5234
+#: ../intl-scm/guile-strings.c:4080
+#: ../intl-scm/guile-strings.c:5234
 msgid "Maximum"
 msgstr "最大"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4082 ../intl-scm/guile-strings.c:5236
+#: ../intl-scm/guile-strings.c:4082
+#: ../intl-scm/guile-strings.c:5236
 msgid "Minimum"
 msgstr "最小"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4084 ../intl-scm/guile-strings.c:5238
+#: ../intl-scm/guile-strings.c:4084
+#: ../intl-scm/guile-strings.c:5238
 msgid "Gain"
 msgstr "所得"
 
 #. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:4086 ../intl-scm/guile-strings.c:5240
+#: ../intl-scm/guile-strings.c:4086
+#: ../intl-scm/guile-strings.c:5240
 msgid "Loss"
 msgstr "損失"
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4102 ../intl-scm/guile-strings.c:4110
-#: ../intl-scm/guile-strings.c:5256 ../intl-scm/guile-strings.c:5264
+#: ../intl-scm/guile-strings.c:4102
+#: ../intl-scm/guile-strings.c:4110
+#: ../intl-scm/guile-strings.c:5256
+#: ../intl-scm/guile-strings.c:5264
 msgid "Income vs. Day of Week"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4104 ../intl-scm/guile-strings.c:4112
-#: ../intl-scm/guile-strings.c:5258 ../intl-scm/guile-strings.c:5266
+#: ../intl-scm/guile-strings.c:4104
+#: ../intl-scm/guile-strings.c:4112
+#: ../intl-scm/guile-strings.c:5258
+#: ../intl-scm/guile-strings.c:5266
 msgid "Expenses vs. Day of Week"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4106 ../intl-scm/guile-strings.c:5260
+#: ../intl-scm/guile-strings.c:4106
+#: ../intl-scm/guile-strings.c:5260
 msgid "Shows a piechart with the total income for each day of the week"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:4108 ../intl-scm/guile-strings.c:5262
+#: ../intl-scm/guile-strings.c:4108
+#: ../intl-scm/guile-strings.c:5262
 msgid "Shows a piechart with the total expenses for each day of the week"
 msgstr ""
 
@@ -21287,8 +21326,10 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4130 ../intl-scm/guile-strings.c:4202
-#: ../intl-scm/guile-strings.c:5284 ../intl-scm/guile-strings.c:5356
+#: ../intl-scm/guile-strings.c:4130
+#: ../intl-scm/guile-strings.c:4202
+#: ../intl-scm/guile-strings.c:5284
+#: ../intl-scm/guile-strings.c:5356
 msgid "Show Totals"
 msgstr "合計を表示する"
 
@@ -21296,8 +21337,10 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4132 ../intl-scm/guile-strings.c:4204
-#: ../intl-scm/guile-strings.c:5286 ../intl-scm/guile-strings.c:5358
+#: ../intl-scm/guile-strings.c:4132
+#: ../intl-scm/guile-strings.c:4204
+#: ../intl-scm/guile-strings.c:5286
+#: ../intl-scm/guile-strings.c:5358
 msgid "Maximum Slices"
 msgstr ""
 
@@ -21305,80 +21348,94 @@
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4146 ../intl-scm/guile-strings.c:4218
-#: ../intl-scm/guile-strings.c:5300 ../intl-scm/guile-strings.c:5372
+#: ../intl-scm/guile-strings.c:4146
+#: ../intl-scm/guile-strings.c:4218
+#: ../intl-scm/guile-strings.c:5300
+#: ../intl-scm/guile-strings.c:5372
 msgid "Show the total balance in legend?"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4164 ../intl-scm/guile-strings.c:5318
+#: ../intl-scm/guile-strings.c:4164
+#: ../intl-scm/guile-strings.c:5318
 msgid "Income Piechart"
 msgstr "収益円グラフ"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4166 ../intl-scm/guile-strings.c:5320
+#: ../intl-scm/guile-strings.c:4166
+#: ../intl-scm/guile-strings.c:5320
 msgid "Expense Piechart"
 msgstr "費用円グラフ"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4168 ../intl-scm/guile-strings.c:5322
+#: ../intl-scm/guile-strings.c:4168
+#: ../intl-scm/guile-strings.c:5322
 msgid "Asset Piechart"
 msgstr "資産円グラフ"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4170 ../intl-scm/guile-strings.c:5324
+#: ../intl-scm/guile-strings.c:4170
+#: ../intl-scm/guile-strings.c:5324
 msgid "Liability Piechart"
 msgstr "負債円グラフ"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4172 ../intl-scm/guile-strings.c:5326
+#: ../intl-scm/guile-strings.c:4172
+#: ../intl-scm/guile-strings.c:5326
 msgid "Shows a piechart with the Income per given time interval"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4174 ../intl-scm/guile-strings.c:5328
+#: ../intl-scm/guile-strings.c:4174
+#: ../intl-scm/guile-strings.c:5328
 msgid "Shows a piechart with the Expenses per given time interval"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4176 ../intl-scm/guile-strings.c:5330
+#: ../intl-scm/guile-strings.c:4176
+#: ../intl-scm/guile-strings.c:5330
 msgid "Shows a piechart with the Assets balance at a given time"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4178 ../intl-scm/guile-strings.c:5332
+#: ../intl-scm/guile-strings.c:4178
+#: ../intl-scm/guile-strings.c:5332
 msgid "Shows a piechart with the Liabilities balance at a given time"
 msgstr ""
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4180 ../intl-scm/guile-strings.c:5334
+#: ../intl-scm/guile-strings.c:4180
+#: ../intl-scm/guile-strings.c:5334
 msgid "Income Accounts"
 msgstr "所得勘定科目"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4182 ../intl-scm/guile-strings.c:5336
+#: ../intl-scm/guile-strings.c:4182
+#: ../intl-scm/guile-strings.c:5336
 msgid "Expense Accounts"
 msgstr "費用勘定科目"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4220 ../intl-scm/guile-strings.c:5374
+#: ../intl-scm/guile-strings.c:4220
+#: ../intl-scm/guile-strings.c:5374
 msgid "Maximum number of slices in pie"
 msgstr "円グラフ内に表示可能な扇型の最大数"
 
 #. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:4226 ../intl-scm/guile-strings.c:5380
+#: ../intl-scm/guile-strings.c:4226
+#: ../intl-scm/guile-strings.c:5380
 #, c-format
 msgid "Balance at %s"
 msgstr ""
@@ -21387,8 +21444,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5384 ../intl-scm/guile-strings.c:5474
-#: ../intl-scm/guile-strings.c:5564 ../intl-scm/guile-strings.c:5654
+#: ../intl-scm/guile-strings.c:5384
+#: ../intl-scm/guile-strings.c:5474
+#: ../intl-scm/guile-strings.c:5564
+#: ../intl-scm/guile-strings.c:5654
 msgid "Tax Report / TXF Export"
 msgstr "税金レポート / TXFファイルへの出力"
 
@@ -21396,8 +21455,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5390 ../intl-scm/guile-strings.c:5480
-#: ../intl-scm/guile-strings.c:5570 ../intl-scm/guile-strings.c:5660
+#: ../intl-scm/guile-strings.c:5390
+#: ../intl-scm/guile-strings.c:5480
+#: ../intl-scm/guile-strings.c:5570
+#: ../intl-scm/guile-strings.c:5660
 msgid "Alternate Period"
 msgstr ""
 
@@ -21405,8 +21466,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5392 ../intl-scm/guile-strings.c:5482
-#: ../intl-scm/guile-strings.c:5572 ../intl-scm/guile-strings.c:5662
+#: ../intl-scm/guile-strings.c:5392
+#: ../intl-scm/guile-strings.c:5482
+#: ../intl-scm/guile-strings.c:5572
+#: ../intl-scm/guile-strings.c:5662
 msgid "Override or modify From: & To:"
 msgstr ""
 
@@ -21414,8 +21477,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5394 ../intl-scm/guile-strings.c:5484
-#: ../intl-scm/guile-strings.c:5574 ../intl-scm/guile-strings.c:5664
+#: ../intl-scm/guile-strings.c:5394
+#: ../intl-scm/guile-strings.c:5484
+#: ../intl-scm/guile-strings.c:5574
+#: ../intl-scm/guile-strings.c:5664
 msgid "Use From - To"
 msgstr ""
 
@@ -21423,8 +21488,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5396 ../intl-scm/guile-strings.c:5486
-#: ../intl-scm/guile-strings.c:5576 ../intl-scm/guile-strings.c:5666
+#: ../intl-scm/guile-strings.c:5396
+#: ../intl-scm/guile-strings.c:5486
+#: ../intl-scm/guile-strings.c:5576
+#: ../intl-scm/guile-strings.c:5666
 msgid "Use From - To period"
 msgstr ""
 
@@ -21432,8 +21499,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5398 ../intl-scm/guile-strings.c:5488
-#: ../intl-scm/guile-strings.c:5578 ../intl-scm/guile-strings.c:5668
+#: ../intl-scm/guile-strings.c:5398
+#: ../intl-scm/guile-strings.c:5488
+#: ../intl-scm/guile-strings.c:5578
+#: ../intl-scm/guile-strings.c:5668
 msgid "1st Est Tax Quarter"
 msgstr ""
 
@@ -21441,8 +21510,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5400 ../intl-scm/guile-strings.c:5490
-#: ../intl-scm/guile-strings.c:5580 ../intl-scm/guile-strings.c:5670
+#: ../intl-scm/guile-strings.c:5400
+#: ../intl-scm/guile-strings.c:5490
+#: ../intl-scm/guile-strings.c:5580
+#: ../intl-scm/guile-strings.c:5670
 msgid "Jan 1 - Mar 31"
 msgstr ""
 
@@ -21450,8 +21521,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5402 ../intl-scm/guile-strings.c:5492
-#: ../intl-scm/guile-strings.c:5582 ../intl-scm/guile-strings.c:5672
+#: ../intl-scm/guile-strings.c:5402
+#: ../intl-scm/guile-strings.c:5492
+#: ../intl-scm/guile-strings.c:5582
+#: ../intl-scm/guile-strings.c:5672
 msgid "2nd Est Tax Quarter"
 msgstr ""
 
@@ -21459,8 +21532,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5404 ../intl-scm/guile-strings.c:5494
-#: ../intl-scm/guile-strings.c:5584 ../intl-scm/guile-strings.c:5674
+#: ../intl-scm/guile-strings.c:5404
+#: ../intl-scm/guile-strings.c:5494
+#: ../intl-scm/guile-strings.c:5584
+#: ../intl-scm/guile-strings.c:5674
 msgid "Apr 1 - May 31"
 msgstr ""
 
@@ -21468,8 +21543,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5406 ../intl-scm/guile-strings.c:5496
-#: ../intl-scm/guile-strings.c:5586 ../intl-scm/guile-strings.c:5676
+#: ../intl-scm/guile-strings.c:5406
+#: ../intl-scm/guile-strings.c:5496
+#: ../intl-scm/guile-strings.c:5586
+#: ../intl-scm/guile-strings.c:5676
 msgid "3rd Est Tax Quarter"
 msgstr ""
 
@@ -21477,8 +21554,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5408 ../intl-scm/guile-strings.c:5498
-#: ../intl-scm/guile-strings.c:5588 ../intl-scm/guile-strings.c:5678
+#: ../intl-scm/guile-strings.c:5408
+#: ../intl-scm/guile-strings.c:5498
+#: ../intl-scm/guile-strings.c:5588
+#: ../intl-scm/guile-strings.c:5678
 msgid "Jun 1 - Aug 31"
 msgstr ""
 
@@ -21486,8 +21565,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5410 ../intl-scm/guile-strings.c:5500
-#: ../intl-scm/guile-strings.c:5590 ../intl-scm/guile-strings.c:5680
+#: ../intl-scm/guile-strings.c:5410
+#: ../intl-scm/guile-strings.c:5500
+#: ../intl-scm/guile-strings.c:5590
+#: ../intl-scm/guile-strings.c:5680
 msgid "4th Est Tax Quarter"
 msgstr ""
 
@@ -21495,8 +21576,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5412 ../intl-scm/guile-strings.c:5502
-#: ../intl-scm/guile-strings.c:5592 ../intl-scm/guile-strings.c:5682
+#: ../intl-scm/guile-strings.c:5412
+#: ../intl-scm/guile-strings.c:5502
+#: ../intl-scm/guile-strings.c:5592
+#: ../intl-scm/guile-strings.c:5682
 msgid "Sep 1 - Dec 31"
 msgstr ""
 
@@ -21504,10 +21587,14 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5414 ../intl-scm/guile-strings.c:5416
-#: ../intl-scm/guile-strings.c:5504 ../intl-scm/guile-strings.c:5506
-#: ../intl-scm/guile-strings.c:5594 ../intl-scm/guile-strings.c:5596
-#: ../intl-scm/guile-strings.c:5684 ../intl-scm/guile-strings.c:5686
+#: ../intl-scm/guile-strings.c:5414
+#: ../intl-scm/guile-strings.c:5416
+#: ../intl-scm/guile-strings.c:5504
+#: ../intl-scm/guile-strings.c:5506
+#: ../intl-scm/guile-strings.c:5594
+#: ../intl-scm/guile-strings.c:5596
+#: ../intl-scm/guile-strings.c:5684
+#: ../intl-scm/guile-strings.c:5686
 msgid "Last Year"
 msgstr ""
 
@@ -21515,8 +21602,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5418 ../intl-scm/guile-strings.c:5508
-#: ../intl-scm/guile-strings.c:5598 ../intl-scm/guile-strings.c:5688
+#: ../intl-scm/guile-strings.c:5418
+#: ../intl-scm/guile-strings.c:5508
+#: ../intl-scm/guile-strings.c:5598
+#: ../intl-scm/guile-strings.c:5688
 msgid "Last Yr 1st Est Tax Qtr"
 msgstr ""
 
@@ -21524,8 +21613,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5420 ../intl-scm/guile-strings.c:5510
-#: ../intl-scm/guile-strings.c:5600 ../intl-scm/guile-strings.c:5690
+#: ../intl-scm/guile-strings.c:5420
+#: ../intl-scm/guile-strings.c:5510
+#: ../intl-scm/guile-strings.c:5600
+#: ../intl-scm/guile-strings.c:5690
 msgid "Jan 1 - Mar 31, Last year"
 msgstr ""
 
@@ -21533,8 +21624,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5422 ../intl-scm/guile-strings.c:5512
-#: ../intl-scm/guile-strings.c:5602 ../intl-scm/guile-strings.c:5692
+#: ../intl-scm/guile-strings.c:5422
+#: ../intl-scm/guile-strings.c:5512
+#: ../intl-scm/guile-strings.c:5602
+#: ../intl-scm/guile-strings.c:5692
 msgid "Last Yr 2nd Est Tax Qtr"
 msgstr ""
 
@@ -21542,8 +21635,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5424 ../intl-scm/guile-strings.c:5514
-#: ../intl-scm/guile-strings.c:5604 ../intl-scm/guile-strings.c:5694
+#: ../intl-scm/guile-strings.c:5424
+#: ../intl-scm/guile-strings.c:5514
+#: ../intl-scm/guile-strings.c:5604
+#: ../intl-scm/guile-strings.c:5694
 msgid "Apr 1 - May 31, Last year"
 msgstr ""
 
@@ -21551,8 +21646,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5426 ../intl-scm/guile-strings.c:5516
-#: ../intl-scm/guile-strings.c:5606 ../intl-scm/guile-strings.c:5696
+#: ../intl-scm/guile-strings.c:5426
+#: ../intl-scm/guile-strings.c:5516
+#: ../intl-scm/guile-strings.c:5606
+#: ../intl-scm/guile-strings.c:5696
 msgid "Last Yr 3rd Est Tax Qtr"
 msgstr ""
 
@@ -21560,8 +21657,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5428 ../intl-scm/guile-strings.c:5518
-#: ../intl-scm/guile-strings.c:5608 ../intl-scm/guile-strings.c:5698
+#: ../intl-scm/guile-strings.c:5428
+#: ../intl-scm/guile-strings.c:5518
+#: ../intl-scm/guile-strings.c:5608
+#: ../intl-scm/guile-strings.c:5698
 msgid "Jun 1 - Aug 31, Last year"
 msgstr ""
 
@@ -21569,8 +21668,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5430 ../intl-scm/guile-strings.c:5520
-#: ../intl-scm/guile-strings.c:5610 ../intl-scm/guile-strings.c:5700
+#: ../intl-scm/guile-strings.c:5430
+#: ../intl-scm/guile-strings.c:5520
+#: ../intl-scm/guile-strings.c:5610
+#: ../intl-scm/guile-strings.c:5700
 msgid "Last Yr 4th Est Tax Qtr"
 msgstr ""
 
@@ -21578,8 +21679,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5432 ../intl-scm/guile-strings.c:5522
-#: ../intl-scm/guile-strings.c:5612 ../intl-scm/guile-strings.c:5702
+#: ../intl-scm/guile-strings.c:5432
+#: ../intl-scm/guile-strings.c:5522
+#: ../intl-scm/guile-strings.c:5612
+#: ../intl-scm/guile-strings.c:5702
 msgid "Sep 1 - Dec 31, Last year"
 msgstr ""
 
@@ -21587,8 +21690,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5434 ../intl-scm/guile-strings.c:5524
-#: ../intl-scm/guile-strings.c:5614 ../intl-scm/guile-strings.c:5704
+#: ../intl-scm/guile-strings.c:5434
+#: ../intl-scm/guile-strings.c:5524
+#: ../intl-scm/guile-strings.c:5614
+#: ../intl-scm/guile-strings.c:5704
 msgid "Select Accounts (none = all)"
 msgstr "勘定科目を選択(なし=すべて)"
 
@@ -21596,8 +21701,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5436 ../intl-scm/guile-strings.c:5526
-#: ../intl-scm/guile-strings.c:5616 ../intl-scm/guile-strings.c:5706
+#: ../intl-scm/guile-strings.c:5436
+#: ../intl-scm/guile-strings.c:5526
+#: ../intl-scm/guile-strings.c:5616
+#: ../intl-scm/guile-strings.c:5706
 msgid "Select accounts"
 msgstr "勘定科目を選択"
 
@@ -21605,8 +21712,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5438 ../intl-scm/guile-strings.c:5528
-#: ../intl-scm/guile-strings.c:5618 ../intl-scm/guile-strings.c:5708
+#: ../intl-scm/guile-strings.c:5438
+#: ../intl-scm/guile-strings.c:5528
+#: ../intl-scm/guile-strings.c:5618
+#: ../intl-scm/guile-strings.c:5708
 msgid "Suppress $0.00 values"
 msgstr ""
 
@@ -21614,8 +21723,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5440 ../intl-scm/guile-strings.c:5530
-#: ../intl-scm/guile-strings.c:5620 ../intl-scm/guile-strings.c:5710
+#: ../intl-scm/guile-strings.c:5440
+#: ../intl-scm/guile-strings.c:5530
+#: ../intl-scm/guile-strings.c:5620
+#: ../intl-scm/guile-strings.c:5710
 msgid "$0.00 valued Accounts won't be printed."
 msgstr ""
 
@@ -21623,8 +21734,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5442 ../intl-scm/guile-strings.c:5532
-#: ../intl-scm/guile-strings.c:5622 ../intl-scm/guile-strings.c:5712
+#: ../intl-scm/guile-strings.c:5442
+#: ../intl-scm/guile-strings.c:5532
+#: ../intl-scm/guile-strings.c:5622
+#: ../intl-scm/guile-strings.c:5712
 msgid "Print Full account names"
 msgstr "完全な勘定科目名を印刷"
 
@@ -21632,8 +21745,10 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5444 ../intl-scm/guile-strings.c:5534
-#: ../intl-scm/guile-strings.c:5624 ../intl-scm/guile-strings.c:5714
+#: ../intl-scm/guile-strings.c:5444
+#: ../intl-scm/guile-strings.c:5534
+#: ../intl-scm/guile-strings.c:5624
+#: ../intl-scm/guile-strings.c:5714
 msgid "Print all Parent account names"
 msgstr "すべての親勘定科目名を印刷"
 
@@ -21641,19 +21756,21 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5446 ../intl-scm/guile-strings.c:5536
-#: ../intl-scm/guile-strings.c:5626 ../intl-scm/guile-strings.c:5716
-msgid ""
-"WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF "
-"codes with payer sources may be repeated."
+#: ../intl-scm/guile-strings.c:5446
+#: ../intl-scm/guile-strings.c:5536
+#: ../intl-scm/guile-strings.c:5626
+#: ../intl-scm/guile-strings.c:5716
+msgid "WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF codes with payer sources may be repeated."
 msgstr ""
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5452 ../intl-scm/guile-strings.c:5542
-#: ../intl-scm/guile-strings.c:5632 ../intl-scm/guile-strings.c:5722
+#: ../intl-scm/guile-strings.c:5452
+#: ../intl-scm/guile-strings.c:5542
+#: ../intl-scm/guile-strings.c:5632
+#: ../intl-scm/guile-strings.c:5722
 msgid "Sub-"
 msgstr ""
 
@@ -21661,15 +21778,18 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5454 ../intl-scm/guile-strings.c:5544
-#: ../intl-scm/guile-strings.c:5634 ../intl-scm/guile-strings.c:5724
+#: ../intl-scm/guile-strings.c:5454
+#: ../intl-scm/guile-strings.c:5544
+#: ../intl-scm/guile-strings.c:5634
+#: ../intl-scm/guile-strings.c:5724
 #, c-format
 msgid "Period from %s to %s"
 msgstr "期間 %s から %s まで"
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
-#: ../intl-scm/guile-strings.c:5456 ../intl-scm/guile-strings.c:5636
+#: ../intl-scm/guile-strings.c:5456
+#: ../intl-scm/guile-strings.c:5636
 msgid "Blue items are exportable to a .TXF file."
 msgstr "青色の項目は.TXFファイルに出力することができます。"
 
@@ -21677,23 +21797,25 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5458 ../intl-scm/guile-strings.c:5548
-#: ../intl-scm/guile-strings.c:5638 ../intl-scm/guile-strings.c:5728
-msgid ""
-"No Tax Related accounts were found.  Go to the Edit->Tax Options dialog to "
-"set up tax-related accounts."
+#: ../intl-scm/guile-strings.c:5458
+#: ../intl-scm/guile-strings.c:5548
+#: ../intl-scm/guile-strings.c:5638
+#: ../intl-scm/guile-strings.c:5728
+msgid "No Tax Related accounts were found.  Go to the Edit->Tax Options dialog to set up tax-related accounts."
 msgstr ""
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
-#: ../intl-scm/guile-strings.c:5460 ../intl-scm/guile-strings.c:5640
+#: ../intl-scm/guile-strings.c:5460
+#: ../intl-scm/guile-strings.c:5640
 #, fuzzy
 msgid "Tax Report & TXF Export"
 msgstr "税金レポート / TXFファイルへの出力"
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
-#: ../intl-scm/guile-strings.c:5462 ../intl-scm/guile-strings.c:5642
+#: ../intl-scm/guile-strings.c:5462
+#: ../intl-scm/guile-strings.c:5642
 msgid "Taxable Income / Deductible Expenses / Export to .TXF file"
 msgstr "課税所得      / 控除可能な費用      / .TXFファイルへ出力"
 
@@ -21701,10 +21823,14 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5464 ../intl-scm/guile-strings.c:5470
-#: ../intl-scm/guile-strings.c:5554 ../intl-scm/guile-strings.c:5560
-#: ../intl-scm/guile-strings.c:5644 ../intl-scm/guile-strings.c:5650
-#: ../intl-scm/guile-strings.c:5734 ../intl-scm/guile-strings.c:5740
+#: ../intl-scm/guile-strings.c:5464
+#: ../intl-scm/guile-strings.c:5470
+#: ../intl-scm/guile-strings.c:5554
+#: ../intl-scm/guile-strings.c:5560
+#: ../intl-scm/guile-strings.c:5644
+#: ../intl-scm/guile-strings.c:5650
+#: ../intl-scm/guile-strings.c:5734
+#: ../intl-scm/guile-strings.c:5740
 msgid "Taxable Income / Deductible Expenses"
 msgstr "課税所得      / 控除可能な費用"
 
@@ -21712,14 +21838,17 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5466 ../intl-scm/guile-strings.c:5556
-#: ../intl-scm/guile-strings.c:5646 ../intl-scm/guile-strings.c:5736
+#: ../intl-scm/guile-strings.c:5466
+#: ../intl-scm/guile-strings.c:5556
+#: ../intl-scm/guile-strings.c:5646
+#: ../intl-scm/guile-strings.c:5736
 msgid "This report shows your Taxable Income and Deductible Expenses."
 msgstr "このレポートは課税対象所得と控除可能な費用を表示します。"
 
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
-#: ../intl-scm/guile-strings.c:5468 ../intl-scm/guile-strings.c:5648
+#: ../intl-scm/guile-strings.c:5468
+#: ../intl-scm/guile-strings.c:5648
 msgid "TXF"
 msgstr "TXF"
 
@@ -21727,91 +21856,98 @@
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5472 ../intl-scm/guile-strings.c:5562
-#: ../intl-scm/guile-strings.c:5652 ../intl-scm/guile-strings.c:5742
+#: ../intl-scm/guile-strings.c:5472
+#: ../intl-scm/guile-strings.c:5562
+#: ../intl-scm/guile-strings.c:5652
+#: ../intl-scm/guile-strings.c:5742
 msgid "This page shows your Taxable Income and Deductible Expenses."
 msgstr "このページは課税対象所得と控除可能な費用を表示します。"
 
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5546 ../intl-scm/guile-strings.c:5726
+#: ../intl-scm/guile-strings.c:5546
+#: ../intl-scm/guile-strings.c:5726
 #, fuzzy
-msgid ""
-"Blue items are exportable to a German Tax XML file. Press Export to actually "
-"export them."
+msgid "Blue items are exportable to a German Tax XML file. Press Export to actually export them."
 msgstr "青色の項目は.TXFファイルに出力することができます。"
 
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5550 ../intl-scm/guile-strings.c:5730
+#: ../intl-scm/guile-strings.c:5550
+#: ../intl-scm/guile-strings.c:5730
 #, fuzzy
 msgid "Tax Report & XML Export"
 msgstr "税金レポート / TXFファイルへの出力"
 
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5552 ../intl-scm/guile-strings.c:5732
+#: ../intl-scm/guile-strings.c:5552
+#: ../intl-scm/guile-strings.c:5732
 #, fuzzy
 msgid "Taxable Income / Deductible Expenses / Export to .XML file"
 msgstr "課税所得      / 控除可能な費用      / .TXFファイルへ出力"
 
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
 #. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:5558 ../intl-scm/guile-strings.c:5738
+#: ../intl-scm/guile-strings.c:5558
+#: ../intl-scm/guile-strings.c:5738
 msgid "XML"
 msgstr ""
 
 #. src/import-export/qif-import/qif-import/qif-file.scm
 #. src/import-export/qif-import/qif-file.scm
-#: ../intl-scm/guile-strings.c:5812 ../intl-scm/guile-strings.c:5830
+#: ../intl-scm/guile-strings.c:5812
+#: ../intl-scm/guile-strings.c:5830
 #, fuzzy
 msgid "Loading QIF file..."
 msgstr "照合(_R)..."
 
 #. src/import-export/qif-import/qif-import/qif-to-gnc.scm
 #. src/import-export/qif-import/qif-to-gnc.scm
-#: ../intl-scm/guile-strings.c:5814 ../intl-scm/guile-strings.c:5832
+#: ../intl-scm/guile-strings.c:5814
+#: ../intl-scm/guile-strings.c:5832
 msgid "QIF import: Name conflict with another account."
 msgstr "QIFインポート: 科目名が他の科目とぶつかっています"
 
 #. src/import-export/qif-import/qif-import/qif-to-gnc.scm
 #. src/import-export/qif-import/qif-to-gnc.scm
-#: ../intl-scm/guile-strings.c:5818 ../intl-scm/guile-strings.c:5836
+#: ../intl-scm/guile-strings.c:5818
+#: ../intl-scm/guile-strings.c:5836
 #, fuzzy
 msgid "Importing transactions..."
 msgstr "一致している取引..."
 
 #. src/import-export/qif-import/qif-import/qif-parse.scm
 #. src/import-export/qif-import/qif-parse.scm
-#: ../intl-scm/guile-strings.c:5820 ../intl-scm/guile-strings.c:5838
+#: ../intl-scm/guile-strings.c:5820
+#: ../intl-scm/guile-strings.c:5838
 #, c-format
 msgid "The file contains an unknown Action '%s'."
 msgstr ""
 
 #. src/import-export/qif-import/qif-import/qif-parse.scm
 #. src/import-export/qif-import/qif-parse.scm
-#: ../intl-scm/guile-strings.c:5822 ../intl-scm/guile-strings.c:5840
-#, fuzzy
+#: ../intl-scm/guile-strings.c:5822
+#: ../intl-scm/guile-strings.c:5840
 msgid "Some transactions may be discarded."
-msgstr "複製とともに読み込まれた取引"
+msgstr "いくつかの取引が破棄されるかもしれません。"
 
 #. src/import-export/qif-import/qif-import/qif-merge-groups.scm
 #. src/import-export/qif-import/qif-merge-groups.scm
-#: ../intl-scm/guile-strings.c:5826 ../intl-scm/guile-strings.c:5844
-#, fuzzy
+#: ../intl-scm/guile-strings.c:5826
+#: ../intl-scm/guile-strings.c:5844
 msgid "Finding duplicate transactions..."
-msgstr "取引の複製"
+msgstr "重複取引を検索中..."
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5846
-#, fuzzy
 msgid "The name of your business"
-msgstr "この予算の名前"
+msgstr "あなたのビジネスの名前"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5848
 msgid "The address of your business"
-msgstr ""
+msgstr "あなたのビジネスの住所"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5850
@@ -21821,27 +21957,23 @@
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5852
-#, fuzzy
 msgid "The phone number of your business"
-msgstr "この予算の名前"
+msgstr "あなたのビジネスの電話番号"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5854
-#, fuzzy
 msgid "The fax number of your business"
-msgstr "この予算の名前"
+msgstr "あなたのビジネスのFAX番号"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5856
-#, fuzzy
 msgid "The email address of your business"
-msgstr "この予算の名前"
+msgstr "あなたのビジネスのメールアドレス"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5858
-#, fuzzy
 msgid "The URL address of your website"
-msgstr "この予算の名前"
+msgstr "あなたのWEBサイトのURLアドレス"
 
 #. src/business/business-utils/business-prefs.scm
 #: ../intl-scm/guile-strings.c:5860
@@ -21881,64 +22013,75 @@
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5878 ../intl-scm/guile-strings.c:5896
+#: ../intl-scm/guile-strings.c:5878
+#: ../intl-scm/guile-strings.c:5896
 msgid "Company Address"
 msgstr "会社住所"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5880 ../intl-scm/guile-strings.c:5898
+#: ../intl-scm/guile-strings.c:5880
+#: ../intl-scm/guile-strings.c:5898
 msgid "Company ID"
 msgstr "会社ID"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5882 ../intl-scm/guile-strings.c:5900
+#: ../intl-scm/guile-strings.c:5882
+#: ../intl-scm/guile-strings.c:5900
 msgid "Company Phone Number"
 msgstr "会社電話番号"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5884 ../intl-scm/guile-strings.c:5902
+#: ../intl-scm/guile-strings.c:5884
+#: ../intl-scm/guile-strings.c:5902
 msgid "Company Fax Number"
 msgstr "会社FAX番号"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5886 ../intl-scm/guile-strings.c:5904
+#: ../intl-scm/guile-strings.c:5886
+#: ../intl-scm/guile-strings.c:5904
 msgid "Company Website URL"
-msgstr "会社ウェブサイトURL"
+msgstr "会社WEBサイトURL"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5888 ../intl-scm/guile-strings.c:5906
+#: ../intl-scm/guile-strings.c:5888
+#: ../intl-scm/guile-strings.c:5906
 msgid "Company Email Address"
-msgstr "会社Emailアドレス"
+msgstr "会社メールアドレス"
 
 #. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:5890 ../intl-scm/guile-strings.c:5908
+#: ../intl-scm/guile-strings.c:5890
+#: ../intl-scm/guile-strings.c:5908
 msgid "Company Contact Person"
-msgstr "会社連絡先人物"
+msgstr "会社連絡先担当者"
 
 #. src/business/business-reports/payables.scm
 #. src/business/business-reports/gnucash/report/payables.scm
-#: ../intl-scm/guile-strings.c:5910 ../intl-scm/guile-strings.c:6434
+#: ../intl-scm/guile-strings.c:5910
+#: ../intl-scm/guile-strings.c:6434
 #, fuzzy
 msgid "Payable Account"
 msgstr "買掛金"
 
 #. src/business/business-reports/payables.scm
 #. src/business/business-reports/gnucash/report/payables.scm
-#: ../intl-scm/guile-strings.c:5912 ../intl-scm/guile-strings.c:6436
+#: ../intl-scm/guile-strings.c:5912
+#: ../intl-scm/guile-strings.c:6436
 #, fuzzy
 msgid "The payable account you wish to examine"
 msgstr "その名前の勘定科目はすでに存在します。"
 
 #. src/business/business-reports/payables.scm
 #. src/business/business-reports/gnucash/report/payables.scm
-#: ../intl-scm/guile-strings.c:5914 ../intl-scm/guile-strings.c:5916
-#: ../intl-scm/guile-strings.c:6438 ../intl-scm/guile-strings.c:6440
+#: ../intl-scm/guile-strings.c:5914
+#: ../intl-scm/guile-strings.c:5916
+#: ../intl-scm/guile-strings.c:6438
+#: ../intl-scm/guile-strings.c:6440
 msgid "Payable Aging"
 msgstr ""
 
@@ -21948,12 +22091,14 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5918 ../intl-scm/guile-strings.c:6236
-#: ../intl-scm/guile-strings.c:6442 ../intl-scm/guile-strings.c:6760
-#: ../intl-scm/guile-strings.c:7020 ../intl-scm/guile-strings.c:7260
-#, fuzzy
+#: ../intl-scm/guile-strings.c:5918
+#: ../intl-scm/guile-strings.c:6236
+#: ../intl-scm/guile-strings.c:6442
+#: ../intl-scm/guile-strings.c:6760
+#: ../intl-scm/guile-strings.c:7020
+#: ../intl-scm/guile-strings.c:7260
 msgid "Invoice Number"
-msgstr "請求書"
+msgstr "顧客宛請求書番号"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -21961,9 +22106,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5924 ../intl-scm/guile-strings.c:6242
-#: ../intl-scm/guile-strings.c:6448 ../intl-scm/guile-strings.c:6766
-#: ../intl-scm/guile-strings.c:7026 ../intl-scm/guile-strings.c:7266
+#: ../intl-scm/guile-strings.c:5924
+#: ../intl-scm/guile-strings.c:6242
+#: ../intl-scm/guile-strings.c:6448
+#: ../intl-scm/guile-strings.c:6766
+#: ../intl-scm/guile-strings.c:7026
+#: ../intl-scm/guile-strings.c:7266
 #, fuzzy
 msgid "Charge Type"
 msgstr "請求"
@@ -21974,12 +22122,18 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5932 ../intl-scm/guile-strings.c:5980
-#: ../intl-scm/guile-strings.c:6250 ../intl-scm/guile-strings.c:6298
-#: ../intl-scm/guile-strings.c:6456 ../intl-scm/guile-strings.c:6504
-#: ../intl-scm/guile-strings.c:6774 ../intl-scm/guile-strings.c:6822
-#: ../intl-scm/guile-strings.c:7034 ../intl-scm/guile-strings.c:7082
-#: ../intl-scm/guile-strings.c:7274 ../intl-scm/guile-strings.c:7322
+#: ../intl-scm/guile-strings.c:5932
+#: ../intl-scm/guile-strings.c:5980
+#: ../intl-scm/guile-strings.c:6250
+#: ../intl-scm/guile-strings.c:6298
+#: ../intl-scm/guile-strings.c:6456
+#: ../intl-scm/guile-strings.c:6504
+#: ../intl-scm/guile-strings.c:6774
+#: ../intl-scm/guile-strings.c:6822
+#: ../intl-scm/guile-strings.c:7034
+#: ../intl-scm/guile-strings.c:7082
+#: ../intl-scm/guile-strings.c:7274
+#: ../intl-scm/guile-strings.c:7322
 #, fuzzy
 msgid "Taxable"
 msgstr "表"
@@ -21990,12 +22144,18 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5934 ../intl-scm/guile-strings.c:5986
-#: ../intl-scm/guile-strings.c:6252 ../intl-scm/guile-strings.c:6304
-#: ../intl-scm/guile-strings.c:6458 ../intl-scm/guile-strings.c:6510
-#: ../intl-scm/guile-strings.c:6776 ../intl-scm/guile-strings.c:6828
-#: ../intl-scm/guile-strings.c:7036 ../intl-scm/guile-strings.c:7088
-#: ../intl-scm/guile-strings.c:7276 ../intl-scm/guile-strings.c:7328
+#: ../intl-scm/guile-strings.c:5934
+#: ../intl-scm/guile-strings.c:5986
+#: ../intl-scm/guile-strings.c:6252
+#: ../intl-scm/guile-strings.c:6304
+#: ../intl-scm/guile-strings.c:6458
+#: ../intl-scm/guile-strings.c:6510
+#: ../intl-scm/guile-strings.c:6776
+#: ../intl-scm/guile-strings.c:6828
+#: ../intl-scm/guile-strings.c:7036
+#: ../intl-scm/guile-strings.c:7088
+#: ../intl-scm/guile-strings.c:7276
+#: ../intl-scm/guile-strings.c:7328
 #, fuzzy
 msgid "Tax Amount"
 msgstr "金額へ:"
@@ -22006,9 +22166,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5940 ../intl-scm/guile-strings.c:6258
-#: ../intl-scm/guile-strings.c:6464 ../intl-scm/guile-strings.c:6782
-#: ../intl-scm/guile-strings.c:7042 ../intl-scm/guile-strings.c:7282
+#: ../intl-scm/guile-strings.c:5940
+#: ../intl-scm/guile-strings.c:6258
+#: ../intl-scm/guile-strings.c:6464
+#: ../intl-scm/guile-strings.c:6782
+#: ../intl-scm/guile-strings.c:7042
+#: ../intl-scm/guile-strings.c:7282
 #, fuzzy
 msgid "T"
 msgstr "終了日"
@@ -22021,39 +22184,72 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5942 ../intl-scm/guile-strings.c:5948
-#: ../intl-scm/guile-strings.c:5954 ../intl-scm/guile-strings.c:5960
-#: ../intl-scm/guile-strings.c:5966 ../intl-scm/guile-strings.c:5972
-#: ../intl-scm/guile-strings.c:5978 ../intl-scm/guile-strings.c:5984
-#: ../intl-scm/guile-strings.c:5990 ../intl-scm/guile-strings.c:6168
-#: ../intl-scm/guile-strings.c:6172 ../intl-scm/guile-strings.c:6176
-#: ../intl-scm/guile-strings.c:6180 ../intl-scm/guile-strings.c:6184
-#: ../intl-scm/guile-strings.c:6188 ../intl-scm/guile-strings.c:6260
-#: ../intl-scm/guile-strings.c:6266 ../intl-scm/guile-strings.c:6272
-#: ../intl-scm/guile-strings.c:6278 ../intl-scm/guile-strings.c:6284
-#: ../intl-scm/guile-strings.c:6290 ../intl-scm/guile-strings.c:6296
-#: ../intl-scm/guile-strings.c:6302 ../intl-scm/guile-strings.c:6308
-#: ../intl-scm/guile-strings.c:6466 ../intl-scm/guile-strings.c:6472
-#: ../intl-scm/guile-strings.c:6478 ../intl-scm/guile-strings.c:6484
-#: ../intl-scm/guile-strings.c:6490 ../intl-scm/guile-strings.c:6496
-#: ../intl-scm/guile-strings.c:6502 ../intl-scm/guile-strings.c:6508
-#: ../intl-scm/guile-strings.c:6514 ../intl-scm/guile-strings.c:6692
-#: ../intl-scm/guile-strings.c:6696 ../intl-scm/guile-strings.c:6700
-#: ../intl-scm/guile-strings.c:6704 ../intl-scm/guile-strings.c:6708
-#: ../intl-scm/guile-strings.c:6712 ../intl-scm/guile-strings.c:6784
-#: ../intl-scm/guile-strings.c:6790 ../intl-scm/guile-strings.c:6796
-#: ../intl-scm/guile-strings.c:6802 ../intl-scm/guile-strings.c:6808
-#: ../intl-scm/guile-strings.c:6814 ../intl-scm/guile-strings.c:6820
-#: ../intl-scm/guile-strings.c:6826 ../intl-scm/guile-strings.c:6832
-#: ../intl-scm/guile-strings.c:7044 ../intl-scm/guile-strings.c:7050
-#: ../intl-scm/guile-strings.c:7056 ../intl-scm/guile-strings.c:7062
-#: ../intl-scm/guile-strings.c:7068 ../intl-scm/guile-strings.c:7074
-#: ../intl-scm/guile-strings.c:7080 ../intl-scm/guile-strings.c:7086
-#: ../intl-scm/guile-strings.c:7092 ../intl-scm/guile-strings.c:7284
-#: ../intl-scm/guile-strings.c:7290 ../intl-scm/guile-strings.c:7296
-#: ../intl-scm/guile-strings.c:7302 ../intl-scm/guile-strings.c:7308
-#: ../intl-scm/guile-strings.c:7314 ../intl-scm/guile-strings.c:7320
-#: ../intl-scm/guile-strings.c:7326 ../intl-scm/guile-strings.c:7332
+#: ../intl-scm/guile-strings.c:5942
+#: ../intl-scm/guile-strings.c:5948
+#: ../intl-scm/guile-strings.c:5954
+#: ../intl-scm/guile-strings.c:5960
+#: ../intl-scm/guile-strings.c:5966
+#: ../intl-scm/guile-strings.c:5972
+#: ../intl-scm/guile-strings.c:5978
+#: ../intl-scm/guile-strings.c:5984
+#: ../intl-scm/guile-strings.c:5990
+#: ../intl-scm/guile-strings.c:6168
+#: ../intl-scm/guile-strings.c:6172
+#: ../intl-scm/guile-strings.c:6176
+#: ../intl-scm/guile-strings.c:6180
+#: ../intl-scm/guile-strings.c:6184
+#: ../intl-scm/guile-strings.c:6188
+#: ../intl-scm/guile-strings.c:6260
+#: ../intl-scm/guile-strings.c:6266
+#: ../intl-scm/guile-strings.c:6272
+#: ../intl-scm/guile-strings.c:6278
+#: ../intl-scm/guile-strings.c:6284
+#: ../intl-scm/guile-strings.c:6290
+#: ../intl-scm/guile-strings.c:6296
+#: ../intl-scm/guile-strings.c:6302
+#: ../intl-scm/guile-strings.c:6308
+#: ../intl-scm/guile-strings.c:6466
+#: ../intl-scm/guile-strings.c:6472
+#: ../intl-scm/guile-strings.c:6478
+#: ../intl-scm/guile-strings.c:6484
+#: ../intl-scm/guile-strings.c:6490
+#: ../intl-scm/guile-strings.c:6496
+#: ../intl-scm/guile-strings.c:6502
+#: ../intl-scm/guile-strings.c:6508
+#: ../intl-scm/guile-strings.c:6514
+#: ../intl-scm/guile-strings.c:6692
+#: ../intl-scm/guile-strings.c:6696
+#: ../intl-scm/guile-strings.c:6700
+#: ../intl-scm/guile-strings.c:6704
+#: ../intl-scm/guile-strings.c:6708
+#: ../intl-scm/guile-strings.c:6712
+#: ../intl-scm/guile-strings.c:6784
+#: ../intl-scm/guile-strings.c:6790
+#: ../intl-scm/guile-strings.c:6796
+#: ../intl-scm/guile-strings.c:6802
+#: ../intl-scm/guile-strings.c:6808
+#: ../intl-scm/guile-strings.c:6814
+#: ../intl-scm/guile-strings.c:6820
+#: ../intl-scm/guile-strings.c:6826
+#: ../intl-scm/guile-strings.c:6832
+#: ../intl-scm/guile-strings.c:7044
+#: ../intl-scm/guile-strings.c:7050
+#: ../intl-scm/guile-strings.c:7056
+#: ../intl-scm/guile-strings.c:7062
+#: ../intl-scm/guile-strings.c:7068
+#: ../intl-scm/guile-strings.c:7074
+#: ../intl-scm/guile-strings.c:7080
+#: ../intl-scm/guile-strings.c:7086
+#: ../intl-scm/guile-strings.c:7092
+#: ../intl-scm/guile-strings.c:7284
+#: ../intl-scm/guile-strings.c:7290
+#: ../intl-scm/guile-strings.c:7296
+#: ../intl-scm/guile-strings.c:7302
+#: ../intl-scm/guile-strings.c:7308
+#: ../intl-scm/guile-strings.c:7314
+#: ../intl-scm/guile-strings.c:7320
+#: ../intl-scm/guile-strings.c:7326
+#: ../intl-scm/guile-strings.c:7332
 #, fuzzy
 msgid "Display Columns"
 msgstr "N行表示"
@@ -22064,9 +22260,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5958 ../intl-scm/guile-strings.c:6276
-#: ../intl-scm/guile-strings.c:6482 ../intl-scm/guile-strings.c:6800
-#: ../intl-scm/guile-strings.c:7060 ../intl-scm/guile-strings.c:7300
+#: ../intl-scm/guile-strings.c:5958
+#: ../intl-scm/guile-strings.c:6276
+#: ../intl-scm/guile-strings.c:6482
+#: ../intl-scm/guile-strings.c:6800
+#: ../intl-scm/guile-strings.c:7060
+#: ../intl-scm/guile-strings.c:7300
 #, fuzzy
 msgid "Display the action?"
 msgstr "勘定科目を表示しますか?"
@@ -22077,9 +22276,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5964 ../intl-scm/guile-strings.c:6282
-#: ../intl-scm/guile-strings.c:6488 ../intl-scm/guile-strings.c:6806
-#: ../intl-scm/guile-strings.c:7066 ../intl-scm/guile-strings.c:7306
+#: ../intl-scm/guile-strings.c:5964
+#: ../intl-scm/guile-strings.c:6282
+#: ../intl-scm/guile-strings.c:6488
+#: ../intl-scm/guile-strings.c:6806
+#: ../intl-scm/guile-strings.c:7066
+#: ../intl-scm/guile-strings.c:7306
 #, fuzzy
 msgid "Display the quantity of items?"
 msgstr "合計を表示しますか?"
@@ -22090,9 +22292,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5970 ../intl-scm/guile-strings.c:6288
-#: ../intl-scm/guile-strings.c:6494 ../intl-scm/guile-strings.c:6812
-#: ../intl-scm/guile-strings.c:7072 ../intl-scm/guile-strings.c:7312
+#: ../intl-scm/guile-strings.c:5970
+#: ../intl-scm/guile-strings.c:6288
+#: ../intl-scm/guile-strings.c:6494
+#: ../intl-scm/guile-strings.c:6812
+#: ../intl-scm/guile-strings.c:7072
+#: ../intl-scm/guile-strings.c:7312
 #, fuzzy
 msgid "Display the price per item?"
 msgstr "%s 帳票を表示。"
@@ -22103,9 +22308,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5976 ../intl-scm/guile-strings.c:6294
-#: ../intl-scm/guile-strings.c:6500 ../intl-scm/guile-strings.c:6818
-#: ../intl-scm/guile-strings.c:7078 ../intl-scm/guile-strings.c:7318
+#: ../intl-scm/guile-strings.c:5976
+#: ../intl-scm/guile-strings.c:6294
+#: ../intl-scm/guile-strings.c:6500
+#: ../intl-scm/guile-strings.c:6818
+#: ../intl-scm/guile-strings.c:7078
+#: ../intl-scm/guile-strings.c:7318
 #, fuzzy
 msgid "Display the entry's discount"
 msgstr "勘定科目を表示しますか?"
@@ -22116,9 +22324,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5982 ../intl-scm/guile-strings.c:6300
-#: ../intl-scm/guile-strings.c:6506 ../intl-scm/guile-strings.c:6824
-#: ../intl-scm/guile-strings.c:7084 ../intl-scm/guile-strings.c:7324
+#: ../intl-scm/guile-strings.c:5982
+#: ../intl-scm/guile-strings.c:6300
+#: ../intl-scm/guile-strings.c:6506
+#: ../intl-scm/guile-strings.c:6824
+#: ../intl-scm/guile-strings.c:7084
+#: ../intl-scm/guile-strings.c:7324
 #, fuzzy
 msgid "Display the entry's taxable status"
 msgstr "合計を表示しますか?"
@@ -22129,9 +22340,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5988 ../intl-scm/guile-strings.c:6306
-#: ../intl-scm/guile-strings.c:6512 ../intl-scm/guile-strings.c:6830
-#: ../intl-scm/guile-strings.c:7090 ../intl-scm/guile-strings.c:7330
+#: ../intl-scm/guile-strings.c:5988
+#: ../intl-scm/guile-strings.c:6306
+#: ../intl-scm/guile-strings.c:6512
+#: ../intl-scm/guile-strings.c:6830
+#: ../intl-scm/guile-strings.c:7090
+#: ../intl-scm/guile-strings.c:7330
 #, fuzzy
 msgid "Display each entry's total total tax"
 msgstr "%s 帳票を表示。"
@@ -22142,9 +22356,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5994 ../intl-scm/guile-strings.c:6312
-#: ../intl-scm/guile-strings.c:6518 ../intl-scm/guile-strings.c:6836
-#: ../intl-scm/guile-strings.c:7096 ../intl-scm/guile-strings.c:7336
+#: ../intl-scm/guile-strings.c:5994
+#: ../intl-scm/guile-strings.c:6312
+#: ../intl-scm/guile-strings.c:6518
+#: ../intl-scm/guile-strings.c:6836
+#: ../intl-scm/guile-strings.c:7096
+#: ../intl-scm/guile-strings.c:7336
 #, fuzzy
 msgid "Display the entry's value"
 msgstr "合計を表示しますか?"
@@ -22155,9 +22372,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:5998 ../intl-scm/guile-strings.c:6334
-#: ../intl-scm/guile-strings.c:6522 ../intl-scm/guile-strings.c:6858
-#: ../intl-scm/guile-strings.c:7100 ../intl-scm/guile-strings.c:7340
+#: ../intl-scm/guile-strings.c:5998
+#: ../intl-scm/guile-strings.c:6334
+#: ../intl-scm/guile-strings.c:6522
+#: ../intl-scm/guile-strings.c:6858
+#: ../intl-scm/guile-strings.c:7100
+#: ../intl-scm/guile-strings.c:7340
 msgid "Individual Taxes"
 msgstr ""
 
@@ -22167,9 +22387,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6000 ../intl-scm/guile-strings.c:6336
-#: ../intl-scm/guile-strings.c:6524 ../intl-scm/guile-strings.c:6860
-#: ../intl-scm/guile-strings.c:7102 ../intl-scm/guile-strings.c:7342
+#: ../intl-scm/guile-strings.c:6000
+#: ../intl-scm/guile-strings.c:6336
+#: ../intl-scm/guile-strings.c:6524
+#: ../intl-scm/guile-strings.c:6860
+#: ../intl-scm/guile-strings.c:7102
+#: ../intl-scm/guile-strings.c:7342
 #, fuzzy
 msgid "Display all the individual taxes?"
 msgstr "金額を表示しますか?"
@@ -22180,9 +22403,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6010 ../intl-scm/guile-strings.c:6352
-#: ../intl-scm/guile-strings.c:6534 ../intl-scm/guile-strings.c:6876
-#: ../intl-scm/guile-strings.c:7112 ../intl-scm/guile-strings.c:7352
+#: ../intl-scm/guile-strings.c:6010
+#: ../intl-scm/guile-strings.c:6352
+#: ../intl-scm/guile-strings.c:6534
+#: ../intl-scm/guile-strings.c:6876
+#: ../intl-scm/guile-strings.c:7112
+#: ../intl-scm/guile-strings.c:7352
 #, fuzzy
 msgid "References"
 msgstr "初期設定"
@@ -22193,9 +22419,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6012 ../intl-scm/guile-strings.c:6354
-#: ../intl-scm/guile-strings.c:6536 ../intl-scm/guile-strings.c:6878
-#: ../intl-scm/guile-strings.c:7114 ../intl-scm/guile-strings.c:7354
+#: ../intl-scm/guile-strings.c:6012
+#: ../intl-scm/guile-strings.c:6354
+#: ../intl-scm/guile-strings.c:6536
+#: ../intl-scm/guile-strings.c:6878
+#: ../intl-scm/guile-strings.c:7114
+#: ../intl-scm/guile-strings.c:7354
 #, fuzzy
 msgid "Display the invoice references?"
 msgstr "株数を表示しますか?"
@@ -22206,11 +22435,14 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6016 ../intl-scm/guile-strings.c:6358
-#: ../intl-scm/guile-strings.c:6540 ../intl-scm/guile-strings.c:6882
-#: ../intl-scm/guile-strings.c:7118 ../intl-scm/guile-strings.c:7358
+#: ../intl-scm/guile-strings.c:6016
+#: ../intl-scm/guile-strings.c:6358
+#: ../intl-scm/guile-strings.c:6540
+#: ../intl-scm/guile-strings.c:6882
+#: ../intl-scm/guile-strings.c:7118
+#: ../intl-scm/guile-strings.c:7358
 msgid "Billing Terms"
-msgstr ""
+msgstr "支払条件"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -22218,9 +22450,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6018 ../intl-scm/guile-strings.c:6360
-#: ../intl-scm/guile-strings.c:6542 ../intl-scm/guile-strings.c:6884
-#: ../intl-scm/guile-strings.c:7120 ../intl-scm/guile-strings.c:7360
+#: ../intl-scm/guile-strings.c:6018
+#: ../intl-scm/guile-strings.c:6360
+#: ../intl-scm/guile-strings.c:6542
+#: ../intl-scm/guile-strings.c:6884
+#: ../intl-scm/guile-strings.c:7120
+#: ../intl-scm/guile-strings.c:7360
 #, fuzzy
 msgid "Display the invoice billing terms?"
 msgstr "小切手番号を表示しますか?"
@@ -22231,9 +22466,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6024 ../intl-scm/guile-strings.c:6366
-#: ../intl-scm/guile-strings.c:6548 ../intl-scm/guile-strings.c:6890
-#: ../intl-scm/guile-strings.c:7126 ../intl-scm/guile-strings.c:7366
+#: ../intl-scm/guile-strings.c:6024
+#: ../intl-scm/guile-strings.c:6366
+#: ../intl-scm/guile-strings.c:6548
+#: ../intl-scm/guile-strings.c:6890
+#: ../intl-scm/guile-strings.c:7126
+#: ../intl-scm/guile-strings.c:7366
 #, fuzzy
 msgid "Display the billing id?"
 msgstr "日付を表示しますか?"
@@ -22244,9 +22482,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6030 ../intl-scm/guile-strings.c:6372
-#: ../intl-scm/guile-strings.c:6554 ../intl-scm/guile-strings.c:6896
-#: ../intl-scm/guile-strings.c:7132 ../intl-scm/guile-strings.c:7372
+#: ../intl-scm/guile-strings.c:6030
+#: ../intl-scm/guile-strings.c:6372
+#: ../intl-scm/guile-strings.c:6554
+#: ../intl-scm/guile-strings.c:6896
+#: ../intl-scm/guile-strings.c:7132
+#: ../intl-scm/guile-strings.c:7372
 #, fuzzy
 msgid "Display the invoice notes?"
 msgstr "金額を表示しますか?"
@@ -22257,9 +22498,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6034 ../intl-scm/guile-strings.c:6376
-#: ../intl-scm/guile-strings.c:6558 ../intl-scm/guile-strings.c:6900
-#: ../intl-scm/guile-strings.c:7136 ../intl-scm/guile-strings.c:7376
+#: ../intl-scm/guile-strings.c:6034
+#: ../intl-scm/guile-strings.c:6376
+#: ../intl-scm/guile-strings.c:6558
+#: ../intl-scm/guile-strings.c:6900
+#: ../intl-scm/guile-strings.c:7136
+#: ../intl-scm/guile-strings.c:7376
 #, fuzzy
 msgid "Payments"
 msgstr "支払額:"
@@ -22270,22 +22514,27 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6036 ../intl-scm/guile-strings.c:6378
-#: ../intl-scm/guile-strings.c:6560 ../intl-scm/guile-strings.c:6902
-#: ../intl-scm/guile-strings.c:7138 ../intl-scm/guile-strings.c:7378
+#: ../intl-scm/guile-strings.c:6036
+#: ../intl-scm/guile-strings.c:6378
+#: ../intl-scm/guile-strings.c:6560
+#: ../intl-scm/guile-strings.c:6902
+#: ../intl-scm/guile-strings.c:7138
+#: ../intl-scm/guile-strings.c:7378
 #, fuzzy
 msgid "Display the payments applied to this invoice?"
 msgstr "この帳票を請求書として表示"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6040 ../intl-scm/guile-strings.c:6564
+#: ../intl-scm/guile-strings.c:6040
+#: ../intl-scm/guile-strings.c:6564
 msgid "Minimum # of entries"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6042 ../intl-scm/guile-strings.c:6566
+#: ../intl-scm/guile-strings.c:6042
+#: ../intl-scm/guile-strings.c:6566
 #, fuzzy
 msgid "The minimum number of invoice entries to display. (-1)"
 msgstr "表示するデフォルトの帳簿行番号"
@@ -22296,9 +22545,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6046 ../intl-scm/guile-strings.c:6388
-#: ../intl-scm/guile-strings.c:6570 ../intl-scm/guile-strings.c:6912
-#: ../intl-scm/guile-strings.c:7142 ../intl-scm/guile-strings.c:7382
+#: ../intl-scm/guile-strings.c:6046
+#: ../intl-scm/guile-strings.c:6388
+#: ../intl-scm/guile-strings.c:6570
+#: ../intl-scm/guile-strings.c:6912
+#: ../intl-scm/guile-strings.c:7142
+#: ../intl-scm/guile-strings.c:7382
 #, fuzzy
 msgid "Extra Notes"
 msgstr "注釈"
@@ -22307,74 +22559,86 @@
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6048 ../intl-scm/guile-strings.c:6572
-#: ../intl-scm/guile-strings.c:7144 ../intl-scm/guile-strings.c:7384
+#: ../intl-scm/guile-strings.c:6048
+#: ../intl-scm/guile-strings.c:6572
+#: ../intl-scm/guile-strings.c:7144
+#: ../intl-scm/guile-strings.c:7384
 #, fuzzy
 msgid "Extra notes to put on the invoice"
 msgstr "請求書に記す顧客の名前"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6052 ../intl-scm/guile-strings.c:6576
+#: ../intl-scm/guile-strings.c:6052
+#: ../intl-scm/guile-strings.c:6576
 #, fuzzy
 msgid "Payable to"
 msgstr "親勘定科目"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6054 ../intl-scm/guile-strings.c:6578
+#: ../intl-scm/guile-strings.c:6054
+#: ../intl-scm/guile-strings.c:6578
 #, fuzzy
 msgid "Display the Payable to: information"
 msgstr "勘定科目を表示しますか?"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6058 ../intl-scm/guile-strings.c:6582
+#: ../intl-scm/guile-strings.c:6058
+#: ../intl-scm/guile-strings.c:6582
 #, fuzzy
 msgid "Payable to string"
 msgstr "親勘定科目"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6060 ../intl-scm/guile-strings.c:6584
+#: ../intl-scm/guile-strings.c:6060
+#: ../intl-scm/guile-strings.c:6584
 msgid "The phrase for specifying to whom payments should be made"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6062 ../intl-scm/guile-strings.c:6586
+#: ../intl-scm/guile-strings.c:6062
+#: ../intl-scm/guile-strings.c:6586
 msgid "Make all cheques Payable to"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6066 ../intl-scm/guile-strings.c:6590
+#: ../intl-scm/guile-strings.c:6066
+#: ../intl-scm/guile-strings.c:6590
 #, fuzzy
 msgid "Company contact"
 msgstr "会社のロゴ画像"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6068 ../intl-scm/guile-strings.c:6592
+#: ../intl-scm/guile-strings.c:6068
+#: ../intl-scm/guile-strings.c:6592
 #, fuzzy
 msgid "Display the Company contact information"
 msgstr "説明を表示しますか?"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6072 ../intl-scm/guile-strings.c:6596
+#: ../intl-scm/guile-strings.c:6072
+#: ../intl-scm/guile-strings.c:6596
 msgid "Company contact string"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6074 ../intl-scm/guile-strings.c:6598
+#: ../intl-scm/guile-strings.c:6074
+#: ../intl-scm/guile-strings.c:6598
 msgid "The phrase used to introduce the company contact"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6076 ../intl-scm/guile-strings.c:6600
+#: ../intl-scm/guile-strings.c:6076
+#: ../intl-scm/guile-strings.c:6600
 #, fuzzy
 msgid "Direct all inquiries to"
 msgstr "勘定科目を選択"
@@ -22387,10 +22651,14 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6078 ../intl-scm/guile-strings.c:6150
-#: ../intl-scm/guile-strings.c:6400 ../intl-scm/guile-strings.c:6602
-#: ../intl-scm/guile-strings.c:6674 ../intl-scm/guile-strings.c:6924
-#: ../intl-scm/guile-strings.c:7154 ../intl-scm/guile-strings.c:7394
+#: ../intl-scm/guile-strings.c:6078
+#: ../intl-scm/guile-strings.c:6150
+#: ../intl-scm/guile-strings.c:6400
+#: ../intl-scm/guile-strings.c:6602
+#: ../intl-scm/guile-strings.c:6674
+#: ../intl-scm/guile-strings.c:6924
+#: ../intl-scm/guile-strings.c:7154
+#: ../intl-scm/guile-strings.c:7394
 #, fuzzy
 msgid "Payment, thank you"
 msgstr "支払合計:"
@@ -22401,9 +22669,12 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6084 ../intl-scm/guile-strings.c:6406
-#: ../intl-scm/guile-strings.c:6608 ../intl-scm/guile-strings.c:6930
-#: ../intl-scm/guile-strings.c:7160 ../intl-scm/guile-strings.c:7400
+#: ../intl-scm/guile-strings.c:6084
+#: ../intl-scm/guile-strings.c:6406
+#: ../intl-scm/guile-strings.c:6608
+#: ../intl-scm/guile-strings.c:6930
+#: ../intl-scm/guile-strings.c:7160
+#: ../intl-scm/guile-strings.c:7400
 #, fuzzy
 msgid "Amount Due"
 msgstr "合計"
@@ -22414,35 +22685,40 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6086 ../intl-scm/guile-strings.c:6408
-#: ../intl-scm/guile-strings.c:6610 ../intl-scm/guile-strings.c:6932
-#: ../intl-scm/guile-strings.c:7162 ../intl-scm/guile-strings.c:7402
+#: ../intl-scm/guile-strings.c:6086
+#: ../intl-scm/guile-strings.c:6408
+#: ../intl-scm/guile-strings.c:6610
+#: ../intl-scm/guile-strings.c:6932
+#: ../intl-scm/guile-strings.c:7162
+#: ../intl-scm/guile-strings.c:7402
 msgid "REF"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6088 ../intl-scm/guile-strings.c:6612
+#: ../intl-scm/guile-strings.c:6088
+#: ../intl-scm/guile-strings.c:6612
 msgid "INVOICE"
 msgstr ""
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6090 ../intl-scm/guile-strings.c:6614
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6090
+#: ../intl-scm/guile-strings.c:6614
 msgid "Phone:"
-msgstr "電話"
+msgstr "Tel:"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6092 ../intl-scm/guile-strings.c:6616
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6092
+#: ../intl-scm/guile-strings.c:6616
 msgid "Fax:"
-msgstr "税金(_T)"
+msgstr "Fax:"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6094 ../intl-scm/guile-strings.c:6618
+#: ../intl-scm/guile-strings.c:6094
+#: ../intl-scm/guile-strings.c:6618
 msgid "Web:"
 msgstr ""
 
@@ -22452,37 +22728,42 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6102 ../intl-scm/guile-strings.c:6416
-#: ../intl-scm/guile-strings.c:6626 ../intl-scm/guile-strings.c:6940
-#: ../intl-scm/guile-strings.c:7170 ../intl-scm/guile-strings.c:7410
+#: ../intl-scm/guile-strings.c:6102
+#: ../intl-scm/guile-strings.c:6416
+#: ../intl-scm/guile-strings.c:6626
+#: ../intl-scm/guile-strings.c:6940
+#: ../intl-scm/guile-strings.c:7170
+#: ../intl-scm/guile-strings.c:7410
 #, fuzzy, c-format
 msgid "%s #%d"
 msgstr "%s から %s まで"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6104 ../intl-scm/guile-strings.c:6628
-#, fuzzy, c-format
+#: ../intl-scm/guile-strings.c:6104
+#: ../intl-scm/guile-strings.c:6628
+#, c-format
 msgid "Invoice&nbsp;#&nbsp;%d"
-msgstr "請求書"
+msgstr "顧客宛請求書&nbsp;#&nbsp;%d"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6106 ../intl-scm/guile-strings.c:6630
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6106
+#: ../intl-scm/guile-strings.c:6630
 msgid "Invoice&nbsp;Date"
-msgstr "請求書"
+msgstr "顧客宛請求書&nbsp;日付"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6108 ../intl-scm/guile-strings.c:6632
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6108
+#: ../intl-scm/guile-strings.c:6632
 msgid "Due&nbsp;Date"
-msgstr "日付"
+msgstr "支払期限&nbsp;日付"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6110 ../intl-scm/guile-strings.c:6634
+#: ../intl-scm/guile-strings.c:6110
+#: ../intl-scm/guile-strings.c:6634
 msgid "<br>Invoice&nbsp;in&nbsp;progress...."
 msgstr ""
 
@@ -22492,113 +22773,132 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6116 ../intl-scm/guile-strings.c:6426
-#: ../intl-scm/guile-strings.c:6640 ../intl-scm/guile-strings.c:6950
-#: ../intl-scm/guile-strings.c:7182 ../intl-scm/guile-strings.c:7422
+#: ../intl-scm/guile-strings.c:6116
+#: ../intl-scm/guile-strings.c:6426
+#: ../intl-scm/guile-strings.c:6640
+#: ../intl-scm/guile-strings.c:6950
+#: ../intl-scm/guile-strings.c:7182
+#: ../intl-scm/guile-strings.c:7422
 msgid "No Valid Invoice Selected"
-msgstr ""
+msgstr "有効な顧客宛請求書が選択されていません"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/gnucash/report/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:6118 ../intl-scm/guile-strings.c:6120
-#: ../intl-scm/guile-strings.c:6122 ../intl-scm/guile-strings.c:6642
-#: ../intl-scm/guile-strings.c:6644 ../intl-scm/guile-strings.c:6646
+#: ../intl-scm/guile-strings.c:6118
+#: ../intl-scm/guile-strings.c:6120
+#: ../intl-scm/guile-strings.c:6122
+#: ../intl-scm/guile-strings.c:6642
+#: ../intl-scm/guile-strings.c:6644
+#: ../intl-scm/guile-strings.c:6646
 #, fuzzy
 msgid "Fancy Invoice"
-msgstr "請求書"
+msgstr "顧客宛請求書"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6142 ../intl-scm/guile-strings.c:6666
-#: ../intl-scm/guile-strings.c:7004 ../intl-scm/guile-strings.c:7244
+#: ../intl-scm/guile-strings.c:6142
+#: ../intl-scm/guile-strings.c:6666
+#: ../intl-scm/guile-strings.c:7004
+#: ../intl-scm/guile-strings.c:7244
 msgid "0-30 days"
-msgstr ""
+msgstr "0-30æ—¥"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6144 ../intl-scm/guile-strings.c:6668
-#: ../intl-scm/guile-strings.c:7006 ../intl-scm/guile-strings.c:7246
+#: ../intl-scm/guile-strings.c:6144
+#: ../intl-scm/guile-strings.c:6668
+#: ../intl-scm/guile-strings.c:7006
+#: ../intl-scm/guile-strings.c:7246
 msgid "31-60 days"
-msgstr ""
+msgstr "31-60æ—¥"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6146 ../intl-scm/guile-strings.c:6670
-#: ../intl-scm/guile-strings.c:7008 ../intl-scm/guile-strings.c:7248
+#: ../intl-scm/guile-strings.c:6146
+#: ../intl-scm/guile-strings.c:6670
+#: ../intl-scm/guile-strings.c:7008
+#: ../intl-scm/guile-strings.c:7248
 msgid "61-90 days"
-msgstr ""
+msgstr "61-90æ—¥"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6148 ../intl-scm/guile-strings.c:6672
-#: ../intl-scm/guile-strings.c:7010 ../intl-scm/guile-strings.c:7250
+#: ../intl-scm/guile-strings.c:6148
+#: ../intl-scm/guile-strings.c:6672
+#: ../intl-scm/guile-strings.c:7010
+#: ../intl-scm/guile-strings.c:7250
 msgid "91+ days"
-msgstr ""
+msgstr "91日以上"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6156 ../intl-scm/guile-strings.c:6680
+#: ../intl-scm/guile-strings.c:6156
+#: ../intl-scm/guile-strings.c:6680
 #, fuzzy
 msgid "Total Credit"
 msgstr "貸方合計"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6158 ../intl-scm/guile-strings.c:6682
+#: ../intl-scm/guile-strings.c:6158
+#: ../intl-scm/guile-strings.c:6682
 #, fuzzy
 msgid "Total Due"
 msgstr "合計"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6160 ../intl-scm/guile-strings.c:6684
+#: ../intl-scm/guile-strings.c:6160
+#: ../intl-scm/guile-strings.c:6684
 #, fuzzy
 msgid "The company for this report"
 msgstr "この帳票のファイル出力の形式を選択"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6162 ../intl-scm/guile-strings.c:6686
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6162
+#: ../intl-scm/guile-strings.c:6686
 msgid "The account to search for transactions"
-msgstr "取引の注釈を入力する"
+msgstr "取引を検索する勘定科目"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6170 ../intl-scm/guile-strings.c:6174
-#: ../intl-scm/guile-strings.c:6694 ../intl-scm/guile-strings.c:6698
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6170
+#: ../intl-scm/guile-strings.c:6174
+#: ../intl-scm/guile-strings.c:6694
+#: ../intl-scm/guile-strings.c:6698
 msgid "Display the transaction date?"
-msgstr "日付を表示しますか?"
+msgstr "取引の日付を表示しますか?"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6178 ../intl-scm/guile-strings.c:6702
+#: ../intl-scm/guile-strings.c:6178
+#: ../intl-scm/guile-strings.c:6702
 #, fuzzy
 msgid "Display the transaction reference?"
 msgstr "説明を表示しますか?"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6182 ../intl-scm/guile-strings.c:6706
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6182
+#: ../intl-scm/guile-strings.c:6706
 msgid "Display the transaction type?"
-msgstr "勘定科目を表示しますか?"
+msgstr "取引のタイプを表示しますか?"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6186 ../intl-scm/guile-strings.c:6710
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6186
+#: ../intl-scm/guile-strings.c:6710
 msgid "Display the transaction description?"
-msgstr "説明を表示しますか?"
+msgstr "取引の説明を表示しますか?"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
@@ -22606,10 +22906,14 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6190 ../intl-scm/guile-strings.c:6218
-#: ../intl-scm/guile-strings.c:6396 ../intl-scm/guile-strings.c:6714
-#: ../intl-scm/guile-strings.c:6742 ../intl-scm/guile-strings.c:6920
-#: ../intl-scm/guile-strings.c:7150 ../intl-scm/guile-strings.c:7390
+#: ../intl-scm/guile-strings.c:6190
+#: ../intl-scm/guile-strings.c:6218
+#: ../intl-scm/guile-strings.c:6396
+#: ../intl-scm/guile-strings.c:6714
+#: ../intl-scm/guile-strings.c:6742
+#: ../intl-scm/guile-strings.c:6920
+#: ../intl-scm/guile-strings.c:7150
+#: ../intl-scm/guile-strings.c:7390
 #, fuzzy
 msgid "Today Date Format"
 msgstr "日付の書式"
@@ -22620,134 +22924,153 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6192 ../intl-scm/guile-strings.c:6398
-#: ../intl-scm/guile-strings.c:6716 ../intl-scm/guile-strings.c:6922
-#: ../intl-scm/guile-strings.c:7152 ../intl-scm/guile-strings.c:7392
+#: ../intl-scm/guile-strings.c:6192
+#: ../intl-scm/guile-strings.c:6398
+#: ../intl-scm/guile-strings.c:6716
+#: ../intl-scm/guile-strings.c:6922
+#: ../intl-scm/guile-strings.c:7152
+#: ../intl-scm/guile-strings.c:7392
 msgid "The format for the date->string conversion for today's date."
 msgstr ""
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6198 ../intl-scm/guile-strings.c:6722
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6198
+#: ../intl-scm/guile-strings.c:6722
 msgid "Expense Report"
-msgstr "費用チャート"
+msgstr "費用帳票"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6212 ../intl-scm/guile-strings.c:6214
-#: ../intl-scm/guile-strings.c:6736 ../intl-scm/guile-strings.c:6738
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6212
+#: ../intl-scm/guile-strings.c:6214
+#: ../intl-scm/guile-strings.c:6736
+#: ../intl-scm/guile-strings.c:6738
 msgid "Report:"
-msgstr "帳票"
+msgstr "帳票:"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6216 ../intl-scm/guile-strings.c:6740
-#: ../intl-scm/guile-strings.c:7018 ../intl-scm/guile-strings.c:7258
-msgid ""
-"No valid account selected.  Click on the Options button and select the "
-"account to use."
+#: ../intl-scm/guile-strings.c:6216
+#: ../intl-scm/guile-strings.c:6740
+#: ../intl-scm/guile-strings.c:7018
+#: ../intl-scm/guile-strings.c:7258
+msgid "No valid account selected.  Click on the Options button and select the account to use."
 msgstr ""
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6222 ../intl-scm/guile-strings.c:6746
+#: ../intl-scm/guile-strings.c:6222
+#: ../intl-scm/guile-strings.c:6746
 #, c-format
 msgid "No valid %s selected.  Click on the Options button to select a company."
 msgstr ""
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6224 ../intl-scm/guile-strings.c:6230
-#: ../intl-scm/guile-strings.c:6748 ../intl-scm/guile-strings.c:6754
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6224
+#: ../intl-scm/guile-strings.c:6230
+#: ../intl-scm/guile-strings.c:6748
+#: ../intl-scm/guile-strings.c:6754
 msgid "Customer Report"
-msgstr "帳票"
+msgstr "顧客帳票"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6226 ../intl-scm/guile-strings.c:6232
-#: ../intl-scm/guile-strings.c:6750 ../intl-scm/guile-strings.c:6756
+#: ../intl-scm/guile-strings.c:6226
+#: ../intl-scm/guile-strings.c:6232
+#: ../intl-scm/guile-strings.c:6750
+#: ../intl-scm/guile-strings.c:6756
 #, fuzzy
 msgid "Vendor Report"
 msgstr "総勘定元帳の帳票"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/gnucash/report/owner-report.scm
-#: ../intl-scm/guile-strings.c:6228 ../intl-scm/guile-strings.c:6234
-#: ../intl-scm/guile-strings.c:6752 ../intl-scm/guile-strings.c:6758
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6228
+#: ../intl-scm/guile-strings.c:6234
+#: ../intl-scm/guile-strings.c:6752
+#: ../intl-scm/guile-strings.c:6758
 msgid "Employee Report"
-msgstr "完了"
+msgstr "従業員帳票"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6316 ../intl-scm/guile-strings.c:6840
+#: ../intl-scm/guile-strings.c:6316
+#: ../intl-scm/guile-strings.c:6840
 #, fuzzy
 msgid "My Company"
 msgstr "列スパン:"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6318 ../intl-scm/guile-strings.c:6842
+#: ../intl-scm/guile-strings.c:6318
+#: ../intl-scm/guile-strings.c:6842
 msgid "Display my company name and address?"
 msgstr ""
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6322 ../intl-scm/guile-strings.c:6846
+#: ../intl-scm/guile-strings.c:6322
+#: ../intl-scm/guile-strings.c:6846
 #, fuzzy
 msgid "My Company ID"
 msgstr "列スパン:"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6324 ../intl-scm/guile-strings.c:6848
+#: ../intl-scm/guile-strings.c:6324
+#: ../intl-scm/guile-strings.c:6848
 #, fuzzy
 msgid "Display my company ID?"
 msgstr "勘定科目を表示しますか?"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6330 ../intl-scm/guile-strings.c:6854
+#: ../intl-scm/guile-strings.c:6330
+#: ../intl-scm/guile-strings.c:6854
 #, fuzzy
 msgid "Display due date?"
 msgstr "日付を表示しますか?"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6348 ../intl-scm/guile-strings.c:6872
+#: ../intl-scm/guile-strings.c:6348
+#: ../intl-scm/guile-strings.c:6872
 #, fuzzy
 msgid "Display the subtotals?"
 msgstr "合計を表示しますか?"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6382 ../intl-scm/guile-strings.c:6906
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6382
+#: ../intl-scm/guile-strings.c:6906
 msgid "Invoice Width"
-msgstr "請求書"
+msgstr "顧客宛請求書幅"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6384 ../intl-scm/guile-strings.c:6908
+#: ../intl-scm/guile-strings.c:6384
+#: ../intl-scm/guile-strings.c:6908
 msgid "The minimum width of the invoice."
 msgstr ""
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6386 ../intl-scm/guile-strings.c:6394
-#: ../intl-scm/guile-strings.c:6910 ../intl-scm/guile-strings.c:6918
+#: ../intl-scm/guile-strings.c:6386
+#: ../intl-scm/guile-strings.c:6394
+#: ../intl-scm/guile-strings.c:6910
+#: ../intl-scm/guile-strings.c:6918
 #, fuzzy
 msgid "Text"
 msgstr "テキストのみ"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6390 ../intl-scm/guile-strings.c:6914
+#: ../intl-scm/guile-strings.c:6390
+#: ../intl-scm/guile-strings.c:6914
 #, fuzzy
 msgid "Extra notes to put on the invoice (simple HTML is accepted)"
 msgstr "請求書に記す顧客の名前"
@@ -22756,227 +23079,233 @@
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:6392 ../intl-scm/guile-strings.c:6916
-#: ../intl-scm/guile-strings.c:7146 ../intl-scm/guile-strings.c:7386
+#: ../intl-scm/guile-strings.c:6392
+#: ../intl-scm/guile-strings.c:6916
+#: ../intl-scm/guile-strings.c:7146
+#: ../intl-scm/guile-strings.c:7386
 msgid "Thank you for your patronage"
 msgstr ""
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6418 ../intl-scm/guile-strings.c:6942
-#, fuzzy, c-format
+#: ../intl-scm/guile-strings.c:6418
+#: ../intl-scm/guile-strings.c:6942
+#, c-format
 msgid "Invoice #%d"
-msgstr "請求書"
+msgstr "顧客宛請求書 #%d"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6420 ../intl-scm/guile-strings.c:6944
+#: ../intl-scm/guile-strings.c:6420
+#: ../intl-scm/guile-strings.c:6944
 msgid "INVOICE NOT POSTED"
 msgstr ""
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/gnucash/report/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:6428 ../intl-scm/guile-strings.c:6430
-#: ../intl-scm/guile-strings.c:6432 ../intl-scm/guile-strings.c:6952
-#: ../intl-scm/guile-strings.c:6954 ../intl-scm/guile-strings.c:6956
+#: ../intl-scm/guile-strings.c:6428
+#: ../intl-scm/guile-strings.c:6430
+#: ../intl-scm/guile-strings.c:6432
+#: ../intl-scm/guile-strings.c:6952
+#: ../intl-scm/guile-strings.c:6954
+#: ../intl-scm/guile-strings.c:6956
 #, fuzzy
 msgid "Easy Invoice"
-msgstr "請求書"
+msgstr "簡単な?顧客宛請求書"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6960 ../intl-scm/guile-strings.c:7200
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6960
+#: ../intl-scm/guile-strings.c:7200
 msgid "Sort By"
-msgstr "番号順に並べる"
+msgstr "並び替え項目"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6962 ../intl-scm/guile-strings.c:7202
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6962
+#: ../intl-scm/guile-strings.c:7202
 msgid "Sort Order"
-msgstr "並び替え(_O)"
+msgstr "並び替え順"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6968 ../intl-scm/guile-strings.c:7208
+#: ../intl-scm/guile-strings.c:6968
+#: ../intl-scm/guile-strings.c:7208
 msgid "Show Multi-currency Totals?"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6970 ../intl-scm/guile-strings.c:7210
+#: ../intl-scm/guile-strings.c:6970
+#: ../intl-scm/guile-strings.c:7210
 msgid "Show zero balance items?"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6972 ../intl-scm/guile-strings.c:7212
+#: ../intl-scm/guile-strings.c:6972
+#: ../intl-scm/guile-strings.c:7212
 #, c-format
-msgid ""
-"Transactions relating to '%s' contain more than one currency.  This report "
-"is not designed to cope with this possibility."
+msgid "Transactions relating to '%s' contain more than one currency.  This report is not designed to cope with this possibility."
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6974 ../intl-scm/guile-strings.c:7214
+#: ../intl-scm/guile-strings.c:6974
+#: ../intl-scm/guile-strings.c:7214
 msgid "Sort companys by"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6978 ../intl-scm/guile-strings.c:7218
+#: ../intl-scm/guile-strings.c:6978
+#: ../intl-scm/guile-strings.c:7218
 #, fuzzy
 msgid "Name of the company"
 msgstr "列数"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6980 ../intl-scm/guile-strings.c:7220
+#: ../intl-scm/guile-strings.c:6980
+#: ../intl-scm/guile-strings.c:7220
 #, fuzzy
 msgid "Total Owed"
 msgstr "合計"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6982 ../intl-scm/guile-strings.c:7222
+#: ../intl-scm/guile-strings.c:6982
+#: ../intl-scm/guile-strings.c:7222
 msgid "Total amount owed to/from Company"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6984 ../intl-scm/guile-strings.c:7224
+#: ../intl-scm/guile-strings.c:6984
+#: ../intl-scm/guile-strings.c:7224
 msgid "Bracket Total Owed"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6986 ../intl-scm/guile-strings.c:7226
+#: ../intl-scm/guile-strings.c:6986
+#: ../intl-scm/guile-strings.c:7226
 msgid "Amount owed in oldest bracket - if same go to next oldest"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6988 ../intl-scm/guile-strings.c:7228
-#, fuzzy
+#: ../intl-scm/guile-strings.c:6988
+#: ../intl-scm/guile-strings.c:7228
 msgid "Sort order"
-msgstr "並び替え(_O)"
+msgstr "並び替え順"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6990 ../intl-scm/guile-strings.c:7230
+#: ../intl-scm/guile-strings.c:6990
+#: ../intl-scm/guile-strings.c:7230
 #, fuzzy
 msgid "Increasing"
 msgstr "増加"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6992 ../intl-scm/guile-strings.c:7232
+#: ../intl-scm/guile-strings.c:6992
+#: ../intl-scm/guile-strings.c:7232
 msgid "0 -> $999,999.99, A->Z"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6994 ../intl-scm/guile-strings.c:7234
+#: ../intl-scm/guile-strings.c:6994
+#: ../intl-scm/guile-strings.c:7234
 #, fuzzy
 msgid "Decreasing"
 msgstr "減少"
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6996 ../intl-scm/guile-strings.c:7236
+#: ../intl-scm/guile-strings.c:6996
+#: ../intl-scm/guile-strings.c:7236
 msgid "$999,999.99 -> $0, Z->A"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:6998 ../intl-scm/guile-strings.c:7238
-msgid ""
-"Show multi-currency totals.  If not selected, convert all totals to report "
-"currency"
+#: ../intl-scm/guile-strings.c:6998
+#: ../intl-scm/guile-strings.c:7238
+msgid "Show multi-currency totals.  If not selected, convert all totals to report currency"
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:7000 ../intl-scm/guile-strings.c:7240
+#: ../intl-scm/guile-strings.c:7000
+#: ../intl-scm/guile-strings.c:7240
 msgid "Show all vendors/customers even if they have a zero balance."
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:7172 ../intl-scm/guile-strings.c:7412
-#, fuzzy
+#: ../intl-scm/guile-strings.c:7172
+#: ../intl-scm/guile-strings.c:7412
 msgid "Invoice Date"
-msgstr "請求書"
+msgstr "顧客宛請求書 日付"
 
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:7176 ../intl-scm/guile-strings.c:7416
+#: ../intl-scm/guile-strings.c:7176
+#: ../intl-scm/guile-strings.c:7416
 msgid "Invoice in progress...."
 msgstr ""
 
 #. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:7184 ../intl-scm/guile-strings.c:7186
-#: ../intl-scm/guile-strings.c:7188 ../intl-scm/guile-strings.c:7424
-#: ../intl-scm/guile-strings.c:7426 ../intl-scm/guile-strings.c:7428
-#, fuzzy
+#: ../intl-scm/guile-strings.c:7184
+#: ../intl-scm/guile-strings.c:7186
+#: ../intl-scm/guile-strings.c:7188
+#: ../intl-scm/guile-strings.c:7424
+#: ../intl-scm/guile-strings.c:7426
+#: ../intl-scm/guile-strings.c:7428
 msgid "Printable Invoice"
-msgstr "印刷プレビュー"
+msgstr "印刷可能な顧客宛請求書"
 
 #. src/business/business-reports/gnucash/report/receivables.scm
 #. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:7190 ../intl-scm/guile-strings.c:7430
+#: ../intl-scm/guile-strings.c:7190
+#: ../intl-scm/guile-strings.c:7430
 #, fuzzy
 msgid "Receivables Account"
 msgstr "売掛金"
 
 #. src/business/business-reports/gnucash/report/receivables.scm
 #. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:7192 ../intl-scm/guile-strings.c:7432
+#: ../intl-scm/guile-strings.c:7192
+#: ../intl-scm/guile-strings.c:7432
 #, fuzzy
 msgid "The receivables account you wish to examine"
 msgstr "その名前の勘定科目はすでに存在します。"
 
 #. src/business/business-reports/gnucash/report/receivables.scm
 #. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:7194 ../intl-scm/guile-strings.c:7196
-#: ../intl-scm/guile-strings.c:7434 ../intl-scm/guile-strings.c:7436
+#: ../intl-scm/guile-strings.c:7194
+#: ../intl-scm/guile-strings.c:7196
+#: ../intl-scm/guile-strings.c:7434
+#: ../intl-scm/guile-strings.c:7436
 #, fuzzy
 msgid "Receivable Aging"
 msgstr "受取"
 
 #: ../doc/tip_of_the_day.list.in:1
-msgid ""
-"Warning!! This is a DEVELOPMENT version of GnuCash. It probably has lots of "
-"bugs and unstable features! If you are looking for a stable personal finance "
-"application, you should use the latest release of GnuCash 2.0."
-msgstr ""
-"警告!!これは GnuCash の開発バージョンです。"
-"たくさんのバグと不安定な機能があるかもしれません。"
-"もし安定版の個人向け財務アプリケーションをお探しならば、"
-"最新のリリースである GnuCash 2.0 を使用すべきです。"
+msgid "Warning!! This is a DEVELOPMENT version of GnuCash. It probably has lots of bugs and unstable features! If you are looking for a stable personal finance application, you should use the latest release of GnuCash 2.0."
+msgstr "警告!! これは GnuCash の開発バージョンです。たくさんのバグと不安定な機能があるかもしれません。もし安定版の個人向け財務アプリケーションをお探しならば、最新のリリースである GnuCash 2.0 を使用すべきです。"
 
 #: ../doc/tip_of_the_day.list.in:6
-msgid ""
-"The GnuCash online manual has lots of helpful information. If you are "
-"upgrading from earlier versions of GnuCash, the section \"What's new in "
-"GnuCash 2.0\" is particularly interesting. You can access the manual under "
-"the Help menu."
-msgstr ""
-"GnuCash オンラインマニュアルには有益な情報がたくさんあります。"
-"以前のバージョンのGnuCashからアップグレードした場合は、"
-"\"What's new in GnuCash 2.0\"のセクションが特に興味のあるところでしょう。"
-"マニュアルにはヘルプメニューからアクセスすることができます。"
+msgid "The GnuCash online manual has lots of helpful information. If you are upgrading from earlier versions of GnuCash, the section \"What's new in GnuCash 2.0\" is particularly interesting. You can access the manual under the Help menu."
+msgstr "GnuCash オンラインマニュアルには有益な情報がたくさんあります。以前のバージョンのGnuCashからアップグレードした場合は、\"What's new in GnuCash 2.0\"のセクションが特に興味のあるところでしょう。マニュアルにはヘルプメニューからアクセスすることができます。"
 
 #: ../doc/tip_of_the_day.list.in:11
 #, fuzzy
-msgid ""
-"You can easily import your existing financial data from Quicken, MS Money or "
-"other programs that export QIF files or OFX files.  In the File menu, click "
-"on the sub-menu Import and click on QIF or OFX file, respectively. Then, "
-"follow the instructions provided."
+msgid "You can easily import your existing financial data from Quicken, MS Money or other programs that export QIF files or OFX files.  In the File menu, click on the sub-menu Import and click on QIF or OFX file, respectively. Then, follow the instructions provided."
 msgstr ""
 "Qicken、MS Money、あるいはその他の QIF (Quicken Interchange Format)\n"
 "ファイルを出力可能なプログラムから、すでに存在する財務データを\n"
@@ -22985,11 +23314,7 @@
 
 #: ../doc/tip_of_the_day.list.in:16
 #, fuzzy
-msgid ""
-"If you are familiar with other financial programs such as Quicken, note that "
-"GnuCash uses accounts instead of categories to track income and expenses.  "
-"For more information on income and expense accounts, please see the GnuCash "
-"online manual."
+msgid "If you are familiar with other financial programs such as Quicken, note that GnuCash uses accounts instead of categories to track income and expenses.  For more information on income and expense accounts, please see the GnuCash online manual."
 msgstr ""
 "Quicken などのその他の財務プログラムをよくご存じならば、Gnucash が\n"
 "所得や費用を記録するためにカテゴリの代わりに科目を使用することに\n"
@@ -22998,11 +23323,7 @@
 
 #: ../doc/tip_of_the_day.list.in:21
 #, fuzzy
-msgid ""
-"Create new accounts by clicking the New button in the main window tool bar.  "
-"This will bring up a dialog box where you can enter account details.  For "
-"more information on choosing an account type or setting up a chart of "
-"accounts, please see the GnuCash online manual."
+msgid "Create new accounts by clicking the New button in the main window tool bar.  This will bring up a dialog box where you can enter account details.  For more information on choosing an account type or setting up a chart of accounts, please see the GnuCash online manual."
 msgstr ""
 "メインウィンドウで新規ボタンをクリックすることで、新規科目を作成する\n"
 "ことができます。この時、科目の詳細を入力するダイアログが現れます。\n"
@@ -23011,30 +23332,19 @@
 
 #: ../doc/tip_of_the_day.list.in:27
 #, fuzzy
-msgid ""
-"Click the right mouse button in the main window to bring up the account menu "
-"options. Within each register, clicking the right mouse button brings up the "
-"transaction menu options."
+msgid "Click the right mouse button in the main window to bring up the account menu options. Within each register, clicking the right mouse button brings up the transaction menu options."
 msgstr ""
 "メインウィンドウでマウスの右ボタンをクリックすると、勘定科目メニュー\n"
 "オプションが表示されます。帳簿ウィンドウ内で右ボタンをクリックすると、\n"
 "取引メニューオプションが表示されます。"
 
 #: ../doc/tip_of_the_day.list.in:31
-msgid ""
-"To enter multiple-split transactions such as a paycheck with multiple "
-"deductions, click the Split button in the tool bar. Alternatively, in the "
-"View menu, you can choose the register style Auto-Split Ledger or "
-"Transaction Journal."
+msgid "To enter multiple-split transactions such as a paycheck with multiple deductions, click the Split button in the tool bar. Alternatively, in the View menu, you can choose the register style Auto-Split Ledger or Transaction Journal."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:36
 #, fuzzy
-msgid ""
-"As you enter amounts in the register, you can use the GnuCash calculator to "
-"add, subtract, multiply and divide .  Simply type the first value, then "
-"select '+', '-','*', or '/'.  Type the second value and press Enter to "
-"record the calculated amount."
+msgid "As you enter amounts in the register, you can use the GnuCash calculator to add, subtract, multiply and divide .  Simply type the first value, then select '+', '-','*', or '/'.  Type the second value and press Enter to record the calculated amount."
 msgstr ""
 "帳簿ウィンドウで総額を入力する際に、GnuCash の電卓を用いて、四則演算\n"
 "を行うことができ金額。通常の電卓と同様に、最初の数字を入力、'+', '-',\n"
@@ -23042,11 +23352,7 @@
 
 #: ../doc/tip_of_the_day.list.in:41
 #, fuzzy
-msgid ""
-"Quick-fill makes it easy to enter common transactions.  When you type the "
-"first letter(s) of a common transaction description, GnuCash will "
-"automatically complete the remainder of the transaction as it was last "
-"entered."
+msgid "Quick-fill makes it easy to enter common transactions.  When you type the first letter(s) of a common transaction description, GnuCash will automatically complete the remainder of the transaction as it was last entered."
 msgstr ""
 "Quick-fill により、通常の取引の入力が簡単になりました。通常の取引の\n"
 "最初の文字を入力すると、GnuCash は以前に入力した取引と同じものの\n"
@@ -23054,12 +23360,7 @@
 
 #: ../doc/tip_of_the_day.list.in:46
 #, fuzzy
-msgid ""
-"Type the first letter(s) of an existing account name in the Transfer "
-"register column, and GnuCash will complete the name from your list of "
-"accounts. For subaccounts, type the first letter(s) of the parent account, "
-"followed by ':' and the first letter(s) of the subaccount (e.g. A:C for "
-"Assets:Cash.)"
+msgid "Type the first letter(s) of an existing account name in the Transfer register column, and GnuCash will complete the name from your list of accounts. For subaccounts, type the first letter(s) of the parent account, followed by ':' and the first letter(s) of the subaccount (e.g. A:C for Assets:Cash.)"
 msgstr ""
 "すでに入力した科目の最初の文字を入力すれば、GnuCash が科目のリスト\n"
 "から名前を補完します。子科目の場合には、まず親科目の最初の文字を\n"
@@ -23068,10 +23369,7 @@
 
 #: ../doc/tip_of_the_day.list.in:52
 #, fuzzy
-msgid ""
-"Want to see all your subaccount transactions in one register? From the main "
-"menu, highlight the parent account and select Accounts -> Open Subaccounts "
-"from the menu."
+msgid "Want to see all your subaccount transactions in one register? From the main menu, highlight the parent account and select Accounts -> Open Subaccounts from the menu."
 msgstr ""
 "帳簿ウィンドウですべての子勘定科目の取引を確認したい時には、\n"
 "親勘定科目を選択し、メインメニューから勘定(A)|子勘定科目を開く\n"
@@ -23079,10 +23377,7 @@
 
 #: ../doc/tip_of_the_day.list.in:56
 #, fuzzy
-msgid ""
-"When entering dates, you can type '+' or '-' to increment or decrement the "
-"selected date. You can use '+' and '-' to increment and decrement check "
-"numbers as well."
+msgid "When entering dates, you can type '+' or '-' to increment or decrement the selected date. You can use '+' and '-' to increment and decrement check numbers as well."
 msgstr ""
 "帳簿ウィンドウでチェック用の番号を入力する際に、'+', '-' を\n"
 "使用することができます。'+' の場合には、次の番号を使用し、'-'\n"
@@ -23090,64 +23385,39 @@
 "'-'を使用して入力することができます。"
 
 #: ../doc/tip_of_the_day.list.in:60
-msgid ""
-"To switch between multiple tabs in the main window, press Control+Alt+Page "
-"Up/Down."
+msgid "To switch between multiple tabs in the main window, press Control+Alt+Page Up/Down."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:63
-msgid ""
-"In the reconcile window, you can press the spacebar to mark transactions as "
-"reconciled.  You can also press Tab and Shift-Tab to move between deposits "
-"and withdrawals."
+msgid "In the reconcile window, you can press the spacebar to mark transactions as reconciled.  You can also press Tab and Shift-Tab to move between deposits and withdrawals."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:67
 #, fuzzy
-msgid ""
-"To transfer funds between accounts with different currencies, click on the "
-"Transfer button in the register toolbar, select the accounts, and the "
-"Currency Transfer options for entering the exchange rate or the other "
-"currency's amount will be available."
+msgid "To transfer funds between accounts with different currencies, click on the Transfer button in the register toolbar, select the accounts, and the Currency Transfer options for entering the exchange rate or the other currency's amount will be available."
 msgstr ""
 "異なる通貨間での資金の移動には、中間の通貨の資金移動用科目が\n"
 "必要になります。詳細については Gnucash オンラインマニュアルを\n"
 "ご覧ください。"
 
 #: ../doc/tip_of_the_day.list.in:72
-msgid ""
-"You can pack multiple reports into a single window,  providing all the "
-"financial information you want at a glance. To do so, use the Sample & "
-"Custom -> \"Custom Multicolumn Report\" report."
+msgid "You can pack multiple reports into a single window,  providing all the financial information you want at a glance. To do so, use the Sample & Custom -> \"Custom Multicolumn Report\" report."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:77
-msgid ""
-"Style Sheets affect how reports are displayed.  Choose a style sheet for "
-"your report as a report option, and use the Edit -> Style Sheets menu to "
-"customize style sheets."
+msgid "Style Sheets affect how reports are displayed.  Choose a style sheet for your report as a report option, and use the Edit -> Style Sheets menu to customize style sheets."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:81
-msgid ""
-"To raise the accounts menu in the transfer field of a register page, press "
-"the Menu key or the Ctrl-Down key combination."
+msgid "To raise the accounts menu in the transfer field of a register page, press the Menu key or the Ctrl-Down key combination."
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:84
-msgid ""
-"The GnuCash developers are easy to contact.  As well as several mailing "
-"lists, you can chat to them live on IRC! Join them on #gnucash at irc.gnome."
-"org"
+msgid "The GnuCash developers are easy to contact.  As well as several mailing lists, you can chat to them live on IRC! Join them on #gnucash at irc.gnome.org"
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:88
-msgid ""
-"There is a theory that if ever anyone discovers what the Universe is for and "
-"why it is here, it will instantly disappear and be replaced with something "
-"even more bizarre and inexplicable. There is another theory that this has "
-"already happened. Douglas Adams, \"The Restaurant at the End of the Universe"
-"\""
+msgid "There is a theory that if ever anyone discovers what the Universe is for and why it is here, it will instantly disappear and be replaced with something even more bizarre and inexplicable. There is another theory that this has already happened. Douglas Adams, \"The Restaurant at the End of the Universe\""
 msgstr ""
 
 #, fuzzy
@@ -23165,7 +23435,6 @@
 #, fuzzy
 #~ msgid "New Check Format Title"
 #~ msgstr "そのファイルには保存できません"
-
 #~ msgid "online book"
 #~ msgstr "オンラインブック"
 
@@ -23284,7 +23553,6 @@
 #, fuzzy
 #~ msgid "_Lot Viewer..."
 #~ msgstr "新規..."
-
 #~ msgid "Enable debugging mode"
 #~ msgstr "デバッグモードをオン"
 
@@ -23435,10 +23703,8 @@
 #, fuzzy
 #~ msgid "years"
 #~ msgstr "å¹´"
-
 #~ msgid "Select pixmap"
 #~ msgstr "pixmap を選択"
-
 #~ msgid ""
 #~ "Enter the type of commodity. For stocks, this is often an exchange on "
 #~ "which the stock is traded. You can choose an existing type from the list "
@@ -23484,16 +23750,12 @@
 #, fuzzy
 #~ msgid "_HBCI Setup..."
 #~ msgstr "基本設定"
-
 #~ msgid "Field"
 #~ msgstr "フィールド"
-
 #~ msgid "Old Value"
 #~ msgstr "古い値"
-
 #~ msgid "Verify Changes"
 #~ msgstr "変更を確認する"
-
 #~ msgid "The following changes must be made. Continue?"
 #~ msgstr "下のような変更が必要です。続行しますか?"
 
@@ -23534,3 +23796,4 @@
 #~ "Update \n"
 #~ "account list"
 #~ msgstr "勘定ラベルを使う"
+

Modified: gnucash/branches/gda-dev/po/nb.po
===================================================================
--- gnucash/branches/gda-dev/po/nb.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/nb.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -9,7 +9,7 @@
 "Project-Id-Version: GnuCash 2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-10 22:05+0200\n"
-"PO-Revision-Date: 2006-05-23 19:41+0200\n"
+"PO-Revision-Date: 2007-08-12 21:11+0200\n"
 "Last-Translator: sigvei <sigve.indregard at gmail.com>\n"
 "Language-Team: Norwegian <>\n"
 "MIME-Version: 1.0\n"
@@ -12362,7 +12362,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-account.c:643
 msgid "Column letter for 'Placeholder'|P"
-msgstr "Column letter for 'Placeholder'|P"
+msgstr "P"
 
 #. Translators: %s is a currency mnemonic.
 #: ../src/gnome-utils/gnc-tree-view-account.c:1388
@@ -12428,7 +12428,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:438
 msgid "Column letter for 'Get Quotes'|Q"
-msgstr "Column letter for 'Get Quotes'|N"
+msgstr "N"
 
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:444
 #: ../src/gnome-utils/gnc-tree-view-price.c:453

Modified: gnucash/branches/gda-dev/po/nl.po
===================================================================
--- gnucash/branches/gda-dev/po/nl.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/nl.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -9,7 +9,7 @@
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-10 22:05+0200\n"
-"PO-Revision-Date: 2007-02-18 15:15+0100\n"
+"PO-Revision-Date: 2007-08-12 21:13+0200\n"
 "Last-Translator: Hendrik-Jan Heins <hjheins at gmail.com>\n"
 "Language-Team: Dutch <nl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -12692,7 +12692,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:438
 msgid "Column letter for 'Get Quotes'|Q"
-msgstr "Kolom letter voor 'Haal Quotes'|Q"
+msgstr "Q"
 
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:444
 #: ../src/gnome-utils/gnc-tree-view-price.c:453

Modified: gnucash/branches/gda-dev/po/uk.po
===================================================================
--- gnucash/branches/gda-dev/po/uk.po	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/po/uk.po	2007-09-09 16:25:08 UTC (rev 16513)
@@ -9,7 +9,7 @@
 "Project-Id-Version: gnucash 2.1.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-02 10:11-0600\n"
-"PO-Revision-Date: 2007-07-05 00:16+0300\n"
+"PO-Revision-Date: 2007-08-12 21:12+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko at gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -6594,7 +6594,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-account.c:643
 msgid "Column letter for 'Placeholder'|P"
-msgstr "Літера стовпчика для 'Тимчасовий'|Т"
+msgstr "Т"
 
 #. Translators: %s is a currency mnemonic.
 #: ../src/gnome-utils/gnc-tree-view-account.c:1388
@@ -6683,7 +6683,7 @@
 #. must only contain the part after the | character.
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:438
 msgid "Column letter for 'Get Quotes'|Q"
-msgstr "Літера стовпчика для 'Отримати котирування'|Q"
+msgstr "Q"
 
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:444
 #: ../src/gnome-utils/gnc-tree-view-price.c:453

Modified: gnucash/branches/gda-dev/src/app-utils/file-utils.c
===================================================================
--- gnucash/branches/gda-dev/src/app-utils/file-utils.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/app-utils/file-utils.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -86,7 +86,7 @@
   if (!file || file[0] == '\0') return 0;
 
   /* take absolute paths without searching */
-  if (file[0] != '/')
+  if (!g_path_is_absolute (file))
     filename = gncFindFile (file);
   else
     filename = g_strdup (file);

Modified: gnucash/branches/gda-dev/src/app-utils/gnc-sx-instance-model.c
===================================================================
--- gnucash/branches/gda-dev/src/app-utils/gnc-sx-instance-model.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/app-utils/gnc-sx-instance-model.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1155,8 +1155,6 @@
 
     {
         kvp_frame *txn_frame;
-        /* set a kvp-frame element in the transaction indicating and
-         * pointing-to the SX this was created from. */
         txn_frame = xaccTransGetSlots(new_txn);
         kvp_frame_set_guid(txn_frame, "from-sched-xaction", xaccSchedXactionGetGUID(creation_data->instance->parent->sx));
     }

Modified: gnucash/branches/gda-dev/src/backend/file/gnc-book-xml-v2.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/gnc-book-xml-v2.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/gnc-book-xml-v2.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -134,8 +134,6 @@
     xaccAccountTreeForEachTransaction (gnc_book_get_root_account(book),
 				       traverse_txns, ret);
 
-    xmlAddChild(ret, gnc_freqSpec_dom_tree_create (book));
-
     /* xxx FIXME hack alert how are we going to handle 
      *  gnc_book_get_template_group handled ???   */
     xmlAddChild(ret, gnc_schedXaction_dom_tree_create(

Modified: gnucash/branches/gda-dev/src/backend/file/gnc-freqspec-xml-v2.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/gnc-freqspec-xml-v2.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/gnc-freqspec-xml-v2.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -44,40 +44,8 @@
 
 #include "sixtp-dom-parsers.h"
 #include "SchedXaction.h"
-#include "FreqSpecP.h"
+#include "FreqSpec.h"
 
-/**
- * The XML output should look something like:
- * <freqspec>
- *   <fs:monthly>
- *     <fs:interval>2</fs:interval>
- *     <fs:offset>1</fs:offset>
- *     <fs:day>21</fs:day>
- *   </fs:monthly>
- *   <fs:id>...</fs:id>
- * </freqspec>
- *
- * <freqspec>
- *   
- *   <fs:composite>
- *     <freqspec>
- *       <fs:weekly>
- *         <fs:interval>2</fs:interval>
- *         <fs:offset>3</fs:offset>
- *       </fs:weekly>
- *     </freqspec>
- *     <freqspec>
- *       <fs:weekly>
- *         <fs:interval>2</fs:interval>
- *         <fs:offset>12</fs:offset>
- *       </fs:weekly>
- *     </freqspec>
- *   </fs:composite>
- *   <fs:id>...</fs:id>
- * </freqspec>
- *
- **/
-
 const gchar *freqspec_version_string = "1.0.0";
 
 struct freqTypeTuple {
@@ -122,7 +90,6 @@
  **/
 typedef struct
 {
-        FreqSpec        *fs;              /* FreqSpec we're parsing into. */
         QofBook         *book;            /* Book we're loading into. */
 
         Recurrence *recurrence;
@@ -141,7 +108,6 @@
 static void
 fspd_init( fsParseData *fspd )
 {
-        fspd->fs      = NULL;
         fspd->list    = NULL;
         fspd->book    = NULL;
         fspd->recurrence = g_new0(Recurrence, 1);
@@ -155,139 +121,6 @@
         g_date_clear( &fspd->once_day, 1 );
 }
 
-xmlNodePtr
-gnc_freqSpec_dom_tree_create( FreqSpec *fs )
-{
-        xmlNodePtr                ret;
-        xmlNodePtr                xmlSub;
-
-        ret = xmlNewNode( NULL, BAD_CAST "gnc:freqspec" );
-        xmlSetProp( ret, BAD_CAST "version", BAD_CAST freqspec_version_string );
-
-        xmlAddChild( ret, guid_to_dom_tree( "fs:id", qof_instance_get_guid(fs) ) );
-
-        xmlSub = text_to_dom_tree( "fs:ui_type",
-                                   uiFreqTypeStrs[ xaccFreqSpecGetUIType(fs) ].str );
-        xmlAddChild( ret, xmlSub );
-
-        switch( fs->type ) {
-
-        case INVALID: {
-                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:none" );
-                xmlAddChild( ret, xmlSub );
-        } break;
-
-        case ONCE: {
-                if (!g_date_valid(&fs->s.once.date))
-                {
-                    xmlSub = xmlNewNode(NULL, BAD_CAST "fs:none");
-                }
-                else
-                {
-                    xmlSub = xmlNewNode( NULL, BAD_CAST "fs:once" );
-                    xmlAddChild( xmlSub, 
-                                 gdate_to_dom_tree( "fs:date", 
-                                                    &fs->s.once.date ) );
-                }
-                xmlAddChild( ret, xmlSub );
-        } break;
-
-        case DAILY: {
-                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:daily" );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree(
-                                     "fs:interval", 
-                                     fs->s.daily.interval_days )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:offset", 
-                                     fs->s.daily.offset_from_epoch )
-                        );
-                xmlAddChild( ret, xmlSub );
-        } break;
-        
-        case WEEKLY: {
-                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:weekly" );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:interval", 
-                                     fs->s.weekly.interval_weeks )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:offset", 
-                                     fs->s.weekly.offset_from_epoch )
-                        );
-                xmlAddChild( ret, xmlSub );
-        } break;
-        
-        case MONTHLY: {
-                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:monthly" );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:interval", 
-                                     fs->s.monthly.interval_months )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:offset", 
-                                     fs->s.monthly.offset_from_epoch )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:day", 
-                                     fs->s.monthly.day_of_month )
-                        );
-                        xmlAddChild( ret, xmlSub );
-        } break;
-        
-        case MONTH_RELATIVE: {
-                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:month_relative" );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:interval", 
-                                     fs->s.month_relative.interval_months )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:offset", 
-                                     fs->s.month_relative.offset_from_epoch )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:weekday", 
-                                     fs->s.month_relative.weekday )
-                        );
-                xmlAddChild( xmlSub, 
-                             guint_to_dom_tree( 
-                                     "fs:occurrence", 
-                                     fs->s.month_relative.occurrence )
-                        );
-                xmlAddChild( ret, xmlSub );
-        } break;
-        
-        case COMPOSITE: {
-                GList *subelts;
-                xmlNodePtr xmlComposites;
-                xmlComposites = xmlNewNode( NULL, BAD_CAST "fs:composite" );
-                subelts = fs->s.composites.subSpecs;
-                while( subelts ) {
-                        xmlAddChild( xmlComposites,
-                                     gnc_freqSpec_dom_tree_create(
-                                             subelts->data ) );
-                        subelts = subelts->next;
-                }
-                xmlAddChild( ret, xmlComposites );
-        } break;
-        
-        default:
-                g_return_val_if_fail( FALSE, NULL );
-        }
-        
-        return ret;
-}
-
 static struct dom_tree_handler fs_dom_handlers[];
 
 static
@@ -311,7 +144,6 @@
         g_return_val_if_fail( nodeTxt, FALSE );
         for ( i=0; (tmp = uiFreqTypeStrs[i].str) != NULL; i++ ) {
                 if ( safe_strcmp( nodeTxt, tmp ) == 0 ) {
-                        xaccFreqSpecSetUIType( fspd->fs, uiFreqTypeStrs[i].uift );
                         fspd->uift = uiFreqTypeStrs[i].uift;
                         g_free( nodeTxt );
                         return TRUE;
@@ -414,14 +246,8 @@
 fs_subelement_handler( xmlNodePtr node, gpointer data )
 {
         fsParseData *fspd = data;
-        FreqSpec        *fs;
         GList *recurrences;
 
-        fs = dom_tree_to_freqSpec( node, fspd->book );
-        if ( fs == NULL )
-                return FALSE;
-        fspd->list = g_list_append( fspd->list, fs );
-
         recurrences = dom_tree_freqSpec_to_recurrences(node, fspd->book);
         if (recurrences == NULL)
                 return FALSE;
@@ -463,10 +289,7 @@
         successful = dom_tree_generic_parse( node,
                                              fs_union_dom_handlers,
                                              fspd );
-        if ( !successful )
-                return FALSE;
-        fspd->fs->type	      = INVALID;
-        return TRUE;
+        return successful;
 }
 
 static
@@ -483,8 +306,6 @@
                 return FALSE;
         recurrenceSet(fspd->recurrence, 0, PERIOD_ONCE, &fspd->once_day);
         
-        fspd->fs->type         = ONCE;
-        fspd->fs->s.once.date  = fspd->once_day;
         return TRUE;
 }
 
@@ -502,9 +323,6 @@
         g_date_set_julian(&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
         recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_DAY, &offset_date);
 
-        fspd->fs->type                      = DAILY;
-        fspd->fs->s.daily.interval_days     = fspd->interval;
-        fspd->fs->s.daily.offset_from_epoch = fspd->offset;
         return TRUE;
 }
 
@@ -525,10 +343,6 @@
         g_date_set_julian(&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
         recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_WEEK, &offset_date);
 
-        fspd->fs->type                       = WEEKLY;
-        fspd->fs->s.weekly.interval_weeks    = fspd->interval;
-        fspd->fs->s.weekly.offset_from_epoch = fspd->offset;
-
         return TRUE;
 }
 
@@ -560,11 +374,6 @@
             recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_MONTH, &offset_date);
         }
         
-        fspd->fs->type                        = MONTHLY;
-        fspd->fs->s.monthly.interval_months   = fspd->interval;
-        fspd->fs->s.monthly.offset_from_epoch = fspd->offset;
-        fspd->fs->s.monthly.day_of_month      = fspd->day;
-
         return successful;
 }
 
@@ -583,7 +392,6 @@
         fsParseData *fspd = data;
         GUID        *guid;
         guid = dom_tree_to_guid( node );
-        qof_instance_set_guid(fspd->fs, guid);
         return TRUE;
 }
 
@@ -596,12 +404,7 @@
         successful = dom_tree_generic_parse( node,
                                              fs_union_dom_handlers,
                                              fspd );
-        if ( !successful )
-                return FALSE;
-        fspd->fs->type                  = COMPOSITE;
-        fspd->fs->s.composites.subSpecs = fspd->list;
-
-        return TRUE;
+        return successful;
 }
 
 static struct dom_tree_handler fs_dom_handlers[] = {
@@ -643,11 +446,9 @@
 
         g_return_val_if_fail( tree, FALSE );
 
-        fspd.fs = xaccFreqSpecMalloc(globaldata->book);
         successful = dom_tree_generic_parse( tree, fs_dom_handlers, &fspd );
         if (!successful) {
                 xmlElemDump( stdout, NULL, tree );
-                xaccFreqSpecFree( fspd.fs );
         }
 
         xmlFreeNode(tree);
@@ -667,13 +468,10 @@
     gboolean        successful;
 
     fspd->book = book;
-    fspd->fs = xaccFreqSpecMalloc(book);
     successful = dom_tree_generic_parse( node, fs_dom_handlers, fspd );
     if (!successful)
     {
         xmlElemDump(stdout, NULL, node);
-        xaccFreqSpecFree( fspd->fs );
-        fspd->fs = NULL;
     }
 }
 
@@ -689,12 +487,3 @@
     }
     return fspd.recurrence_list;
 }
-
-FreqSpec*
-dom_tree_to_freqSpec(xmlNodePtr node, QofBook *book)
-{
-    fsParseData        fspd;
-    fspd_init( &fspd );
-    common_parse(&fspd, node, book);
-    return fspd.fs;
-}

Modified: gnucash/branches/gda-dev/src/backend/file/gnc-schedxaction-xml-v2.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/gnc-schedxaction-xml-v2.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/gnc-schedxaction-xml-v2.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -49,74 +49,6 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "gnc.backend.file.sx"
 
-/**
- * The XML output should look something like:
- * <gnc:count-data cd:type="schedXaction">XXX</gnc:count-data>
- * ...
- * <gnc:schedxaction version="1.0.0">
- *   <sx:id type="guid">...</sx:id>
- *   <sx:name>Rent</sx:name>
- *   <sx:enabled>y</sx:enabled>
- *   <sx:autoCreate>y</sx:autoCreate>
- *   <sx:autoCreateNotify>n</sx:autoCreateNotify>
- *   <sx:advanceCreateDays>0</sx:advanceCreateDays>
- *   <sx:advanceRemindDays>5</sx:advanceRemindDays>
- *   <sx:instanceCount>100</sx:instanceCount>
- *   <sx:lastOccur>
- *     <gdate>2001-02-28</gdate>
- *   </sx:lastOccur>
- *   <sx:start>
- *     <gdate>2000-12-31</gdate>
- *   </sx:start>
- *   <!-- no end -->
- *   <sx:freq>
- *     <!-- freq spec tree -->
- *   </sx:freq>
- *   <sx:deferredInstance>
- *     <sx:last>2001-10-02</sx:last>
- *     [...]
- *   </sx:deferredInstance>
- *   [...]
- * </gnc:schedxaction>
- * <gnc:schedxaction version="1.0.0">
- *   <sx:id type="guid">...</sx:id>
- *   <sx:name>Loan 1</sx:name>
- *   <sx:manual-conf>f</sx:manual-conf>
- *   <sx:start>
- *      <gdate>2000-12-31</gdate>
- *   </sx:start>
- *   <sx:end type="date">
- *     <gdate>2004-03-20</gdate>
- *   </sx:end>
- *   <sx:instanceCount>100</sx:instanceCount>
- *   <sx:freq>
- *     <!-- freqspec tree -->
- *   </sx:freq>
- * </gnc:schedxaction>
- * <gnc:schedxaction version="1.0.0">
- *   <sx:id type="guid">...</sx:id>
- *   <sx:name>Loan 2</sx:name>
- *   <sx:manual-conf>f</sx:manual-conf>
- *   <sx:instanceCount>100</sx:instanceCount>
- *   <sx:start>
- *      <gdate>2000-12-31</gdate>
- *   </sx:start>
- *   <sx:end type="num_occur">
- *     <sx:num>42</sx:num>
- *   </sx:end>
- *   <sx:freq>
- *     <!-- freqspec tree -->
- *   </sx:freq>
- * </gnc:schedxaction>
- * 
- * et-cetera...
- * bleh.
- **/
-
-/* 
- * All tags should be #defined here 
- */
-
 #define SX_ID                   "sx:id"
 #define SX_NAME                 "sx:name"
 #define SX_ENABLED              "sx:enabled"
@@ -219,16 +151,6 @@
 		 guid_to_dom_tree(SX_TEMPL_ACCT,
 				  templ_acc_guid));
 
-    if (!allow_2_2_incompat)
-    {
-        /* output freq spec */
-        fsNode = xmlNewNode(NULL, BAD_CAST SX_FREQSPEC);
-        xmlAddChild( fsNode,
-                     gnc_freqSpec_dom_tree_create(
-                         xaccSchedXactionGetFreqSpec(sx)) );
-        xmlAddChild( ret, fsNode );
-    }
-
     if (allow_2_2_incompat)
     {
         xmlNodePtr schedule_node = xmlNewNode(NULL, "sx:schedule");
@@ -495,8 +417,6 @@
 
     g_return_val_if_fail( node, FALSE );
 
-    xaccSchedXactionSetFreqSpec(sx, dom_tree_to_freqSpec(node, pdata->book));
-
     schedule = dom_tree_freqSpec_to_recurrences(node, pdata->book);
     gnc_sx_set_schedule(sx, schedule);
     g_debug("parsed from freqspec [%s]", recurrenceListToString(schedule));

Modified: gnucash/branches/gda-dev/src/backend/file/gnc-xml.h
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/gnc-xml.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/gnc-xml.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -25,7 +25,6 @@
 #ifndef GNC_XML_H
 #define GNC_XML_H
 
-#include "FreqSpec.h"
 #include "SchedXaction.h"
 #include "gnc-engine.h"
 #include "gnc-pricedb.h"
@@ -45,7 +44,6 @@
 xmlNodePtr gnc_commodity_dom_tree_create(const gnc_commodity *com);
 sixtp* gnc_commodity_sixtp_parser_create(void);
 
-xmlNodePtr gnc_freqSpec_dom_tree_create( FreqSpec *fs );
 sixtp* gnc_freqSpec_sixtp_parser_create(void);
 
 xmlNodePtr gnc_lot_dom_tree_create(GNCLot *);

Modified: gnucash/branches/gda-dev/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/io-gncxml-v2.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/io-gncxml-v2.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -432,7 +432,7 @@
           data->books_total, data->books_loaded);
     DEBUG("Commodities: Total: %d, Loaded: %d",
           data->commodities_total, data->commodities_loaded);
-    DEBUG("Scheduled Tansactions: Total: %d, Loaded: %d",
+    DEBUG("Scheduled Transactions: Total: %d, Loaded: %d",
           data->schedXactions_total, data->schedXactions_loaded);
     DEBUG("Budgets: Total: %d, Loaded: %d",
           data->budgets_total, data->budgets_loaded);
@@ -470,7 +470,7 @@
 //             counter->books_total, counter->books_loaded);
 //      printf("Commodities: Total: %d, Loaded: %d\n",
 //             counter->commodities_total, counter->commodities_loaded);
-//      printf("Scheduled Tansactions: Total: %d, Loaded: %d\n",
+//      printf("Scheduled Transactions: Total: %d, Loaded: %d\n",
 //             counter->schedXactions_total, counter->schedXactions_loaded);
 //      printf("Budgets: Total: %d, Loaded: %d\n",
 //	     counter->budgets_total, counter->budgets_loaded);

Modified: gnucash/branches/gda-dev/src/backend/file/sixtp-dom-parsers.h
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/sixtp-dom-parsers.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/sixtp-dom-parsers.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -28,7 +28,6 @@
 
 #include "gnc-xml-helper.h"
 
-#include "FreqSpec.h"
 #include "gnc-commodity.h"
 #include "qof.h"
 #include "gnc-budget.h"
@@ -38,7 +37,6 @@
 gnc_commodity* dom_tree_to_commodity_ref(xmlNodePtr node, QofBook *book);
 gnc_commodity *dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *);
 
-FreqSpec* dom_tree_to_freqSpec( xmlNodePtr node, QofBook *book);
 GList* dom_tree_freqSpec_to_recurrences(xmlNodePtr node, QofBook *book);
 Recurrence* dom_tree_to_recurrence(xmlNodePtr node);
 

Modified: gnucash/branches/gda-dev/src/backend/file/sixtp.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/file/sixtp.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/file/sixtp.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -712,8 +712,8 @@
     {
         if(parse_result)
             *parse_result = NULL;
-	if (g_slist_length(ctxt->data.stack) > 1)
-	  sixtp_handle_catastrophe(&ctxt->data);
+        if (g_slist_length(ctxt->data.stack) > 1)
+            sixtp_handle_catastrophe(&ctxt->data);
         sixtp_context_destroy(ctxt);
         return FALSE;
     }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -57,16 +57,16 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",		CT_GUID,	0, COL_NNUL|COL_PKEY,	NULL,
+    { "guid",		CT_GUID,	0, COL_NNUL|COL_PKEY,	NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)xaccAccountSetGUID },
-    { "name",		CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, ACCOUNT_NAME_ },
-    { "account_type",	CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, ACCOUNT_TYPE_ },
-    { "commodity_guid",	CT_GUID,	0, COL_NNUL,	NULL,
+    { "name",		CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
+    { "account_type",	CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
+    { "commodity_guid",	CT_GUID,	0, COL_NNUL,	NULL, NULL,
             get_commodity, set_commodity },
-    { "parent_guid",	CT_GUID,	0, 0,	NULL, get_parent, set_parent },
-    { "code",		CT_STRING, ACCOUNT_MAX_CODE_LEN, 0,	ACCOUNT_CODE_ },
-    { "description",	CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0,	ACCOUNT_DESCRIPTION_ },
+    { "parent_guid",	CT_GUID,	0, 0,	NULL, NULL, get_parent, set_parent },
+    { "code",		CT_STRING, ACCOUNT_MAX_CODE_LEN,	0, "code" },
+    { "description",	CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -158,7 +158,11 @@
     } else {
         s = g_value_get_string( val );
     }
-    (*setter)( pObject, (const gpointer)s );
+    if( table->gobj_param_name != NULL ) {
+	g_object_set( pObject, table->gobj_param_name, s, NULL );
+    } else {
+	(*setter)( pObject, (const gpointer)s );
+    }
 }
 
 static void
@@ -853,7 +857,7 @@
 // Table to retrieve just the guid
 static col_cvt_t guid_table[] =
 {
-    { "guid", CT_GUID, 0, 0, NULL, NULL, retrieve_guid },
+    { "guid", CT_GUID, 0, 0, NULL, NULL, NULL, retrieve_guid },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -95,7 +95,8 @@
 #define COL_UNIQUE	0x04
 #define COL_AUTOINC	0x08
 	gint flags;
-	const char* param_name;		// If non null, use qof getter/setter
+	const gchar* gobj_param_name;	// If non-null, use g_object_get/g_object_set
+	const gchar* param_name;	// If non null, use qof getter/setter
 	QofAccessFunc getter;
 	QofSetterFunc setter;
 } col_cvt_t;

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -56,12 +56,12 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "root_account_guid", CT_GUID,  0, COL_NNUL,             NULL,
+    { "root_account_guid", CT_GUID,  0, COL_NNUL,             NULL, NULL,
             get_root_account_guid, set_root_account_guid },
-    { "root_template_guid", CT_GUID, 0, COL_NNUL,             NULL,
+    { "root_template_guid", CT_GUID, 0, COL_NNUL,             NULL, NULL,
             get_root_template_guid, set_root_template_guid },
     { NULL }
 };

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -58,17 +58,17 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "name",            CT_STRING,    BUDGET_MAX_NAME_LEN, COL_NNUL,    "name" },
-    { "description",    CT_STRING,    BUDGET_MAX_DESCRIPTION_LEN, 0,    "description" },
-    { "num_periods",    CT_INT,        0, COL_NNUL, "num_periods" },
-    { "recurrence_mult", CT_INT,    0, COL_NNUL, NULL,
+    { "name",            CT_STRING,    BUDGET_MAX_NAME_LEN, COL_NNUL,    NULL, "name" },
+    { "description",    CT_STRING,    BUDGET_MAX_DESCRIPTION_LEN, 0,    NULL, "description" },
+    { "num_periods",    CT_INT,        0, COL_NNUL, NULL, "num_periods" },
+    { "recurrence_mult", CT_INT,    0, COL_NNUL, NULL, NULL,
             get_recurrence_mult, set_recurrence_mult },
     { "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN,
-            COL_NNUL, NULL, get_recurrence_period_type, set_recurrence_period_type },
-    { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL,
+            COL_NNUL, NULL, NULL, get_recurrence_period_type, set_recurrence_period_type },
+    { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
             get_recurrence_period_start, set_recurrence_period_start },
     { NULL }
 };

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -57,30 +57,30 @@
 #define COMMODITY_MAX_QUOTE_TZ_LEN 50
 
 static col_cvt_t col_table[] = {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "namespace",        CT_STRING,    COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL,    NULL,
+    { "namespace",        CT_STRING,    COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_namespace,
             (QofSetterFunc)gnc_commodity_set_namespace },
-    { "mnemonic",        CT_STRING,    COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL,    NULL,
+    { "mnemonic",        CT_STRING,    COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_mnemonic,
             (QofSetterFunc)gnc_commodity_set_mnemonic },
-    { "fullname",        CT_STRING,    COMMODITY_MAX_FULLNAME_LEN, COL_NNUL,    NULL,
+    { "fullname",        CT_STRING,    COMMODITY_MAX_FULLNAME_LEN, COL_NNUL,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_fullname,
             (QofSetterFunc)gnc_commodity_set_fullname },
-    { "cusip",            CT_STRING,    COMMODITY_MAX_CUSIP_LEN, 0,    NULL,
+    { "cusip",            CT_STRING,    COMMODITY_MAX_CUSIP_LEN, 0,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_cusip,
             (QofSetterFunc)gnc_commodity_set_cusip },
-    { "fraction",        CT_INT,        0, COL_NNUL,    NULL,
+    { "fraction",        CT_INT,        0, COL_NNUL,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_fraction,
             (QofSetterFunc)gnc_commodity_set_fraction },
-    { "quote_flag",        CT_INT,        0, COL_NNUL,    NULL,
+    { "quote_flag",        CT_INT,        0, COL_NNUL,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_quote_flag,
             (QofSetterFunc)gnc_commodity_set_quote_flag },
-    { "quote_source",    CT_STRING,    COMMODITY_MAX_QUOTESOURCE_LEN, 0,    NULL,
+    { "quote_source",    CT_STRING,    COMMODITY_MAX_QUOTESOURCE_LEN, 0,    NULL, NULL,
             get_quote_source_name, set_quote_source_name },
-    { "quote_tz",        CT_STRING,    COMMODITY_MAX_QUOTE_TZ_LEN, 0,    NULL,
+    { "quote_tz",        CT_STRING,    COMMODITY_MAX_QUOTE_TZ_LEN, 0,    NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_quote_tz,
             (QofSetterFunc)gnc_commodity_set_quote_tz },
     { NULL }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -50,12 +50,12 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "account_guid",    CT_GUID,      0, COL_NNUL,    NULL,
+    { "account_guid",    CT_GUID,      0, COL_NNUL,    NULL, NULL,
             get_lot_account, set_lot_account },
-    { "is_closed",        CT_STRING,  1, COL_NNUL, NULL,
+    { "is_closed",        CT_STRING,  1, COL_NNUL, NULL, NULL,
             get_lot_is_closed, set_lot_is_closed },
     { NULL }
 };

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -57,18 +57,18 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "commodity_guid",    CT_GUID,    0, COL_NNUL, NULL,
+    { "commodity_guid",    CT_GUID,    0, COL_NNUL, NULL, NULL,
             get_commodity_guid, set_commodity_guid },
-    { "currency_guid",    CT_GUID,    0, COL_NNUL, NULL,
+    { "currency_guid",    CT_GUID,    0, COL_NNUL, NULL, NULL,
             get_currency_guid, set_currency_guid },
-    { "date",            CT_TIMESPEC,    0, COL_NNUL, NULL,
+    { "date",            CT_TIMESPEC,    0, COL_NNUL, NULL, NULL,
             get_date, set_date },
-    { "source",            CT_STRING,    PRICE_MAX_SOURCE_LEN, 0, PRICE_SOURCE },
-    { "type",            CT_STRING,    PRICE_MAX_TYPE_LEN, 0, PRICE_TYPE },
-    { "value",            CT_NUMERIC,    0, COL_NNUL, NULL, get_value, set_value },
+    { "source",            CT_STRING,    PRICE_MAX_SOURCE_LEN, 0, NULL, PRICE_SOURCE },
+    { "type",            CT_STRING,    PRICE_MAX_TYPE_LEN, 0, NULL, PRICE_TYPE },
+    { "value",            CT_NUMERIC,    0, COL_NNUL, NULL, NULL, get_value, set_value },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -53,22 +53,22 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
             (QofAccessFunc)qof_instance_get_guid,
             (QofSetterFunc)qof_instance_set_guid },
-    { "name",            CT_STRING, SX_MAX_NAME_LEN, COL_NNUL, GNC_SX_NAME },
-    { "start_date",        CT_GDATE,    0, COL_NNUL, GNC_SX_START_DATE },
-    { "last_occur",        CT_GDATE,    0, COL_NNUL, GNC_SX_LAST_DATE },
-    { "num_occur",        CT_INT,        0, COL_NNUL, GNC_SX_NUM_OCCUR },
-    { "rem_occur",        CT_INT,        0, COL_NNUL, GNC_SX_REM_OCCUR },
-    { "auto_create",    CT_BOOLEAN,    0, COL_NNUL, NULL,
+    { "name",            CT_STRING, SX_MAX_NAME_LEN, COL_NNUL, NULL, GNC_SX_NAME },
+    { "start_date",        CT_GDATE,    0, COL_NNUL, NULL, GNC_SX_START_DATE },
+    { "last_occur",        CT_GDATE,    0, COL_NNUL, NULL, GNC_SX_LAST_DATE },
+    { "num_occur",        CT_INT,        0, COL_NNUL, NULL, GNC_SX_NUM_OCCUR },
+    { "rem_occur",        CT_INT,        0, COL_NNUL, NULL, GNC_SX_REM_OCCUR },
+    { "auto_create",    CT_BOOLEAN,    0, COL_NNUL, NULL, NULL,
             get_autocreate, set_autocreate },
-    { "auto_notify",    CT_BOOLEAN,    0, COL_NNUL, NULL,
+    { "auto_notify",    CT_BOOLEAN,    0, COL_NNUL, NULL, NULL,
             get_autonotify, set_autonotify },
-    { "adv_creation",    CT_INT,        0, COL_NNUL, NULL,
+    { "adv_creation",    CT_INT,        0, COL_NNUL, NULL, NULL,
             (QofAccessFunc)xaccSchedXactionGetAdvanceCreation,
             (QofSetterFunc)xaccSchedXactionSetAdvanceCreation },
-    { "adv_notify",    CT_INT,        0, COL_NNUL, NULL,
+    { "adv_notify",    CT_INT,        0, COL_NNUL, NULL, NULL,
             (QofAccessFunc)xaccSchedXactionGetAdvanceReminder,
             (QofSetterFunc)xaccSchedXactionSetAdvanceReminder },
     { NULL }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -77,25 +77,25 @@
 
 static col_cvt_t col_table[] =
 {
-    { "slot_id",        CT_INT,        0, COL_NNUL|COL_PKEY|COL_AUTOINC, NULL,
+    { "slot_id",        CT_INT,        0, COL_NNUL|COL_PKEY|COL_AUTOINC, NULL, NULL,
             get_slot_id, set_slot_id },
-    { "obj_guid",        CT_GUID,    0, COL_NNUL,    NULL,
+    { "obj_guid",        CT_GUID,    0, COL_NNUL,    NULL, NULL,
             get_obj_guid, set_obj_guid },
-    { "name",            CT_STRING,    SLOT_MAX_PATHNAME_LEN, COL_NNUL,    NULL,
+    { "name",            CT_STRING,    SLOT_MAX_PATHNAME_LEN, COL_NNUL,    NULL, NULL,
             get_path, set_path },
-    { "slot_type",        CT_INT,        0, COL_NNUL,    NULL,
+    { "slot_type",        CT_INT,        0, COL_NNUL,    NULL, NULL,
             get_slot_type, set_slot_type, },
-    { "int64_val",        CT_INT64,    0, 0,            NULL,
+    { "int64_val",        CT_INT64,    0, 0,            NULL, NULL,
             get_int64_val, set_int64_val },
-    { "string_val",        CT_STRING,    SLOT_MAX_PATHNAME_LEN, 0,            NULL,
+    { "string_val",        CT_STRING,    SLOT_MAX_PATHNAME_LEN, 0,            NULL, NULL,
             get_string_val, set_string_val },
-    { "double_val",        CT_DOUBLE,    0, 0,            NULL,
+    { "double_val",        CT_DOUBLE,    0, 0,            NULL, NULL,
             get_double_val, set_double_val },
-    { "timespec_val",    CT_TIMESPEC, 0, 0,            NULL,
+    { "timespec_val",    CT_TIMESPEC, 0, 0,            NULL, NULL,
             get_timespec_val, set_timespec_val },
-    { "guid_val",        CT_GUID,    0, 0,            NULL,
+    { "guid_val",        CT_GUID,    0, 0,            NULL, NULL,
             get_guid_val, set_guid_val },
-    { "numeric_val",    CT_NUMERIC,    0, 0,            NULL,
+    { "numeric_val",    CT_NUMERIC,    0, 0,            NULL, NULL,
             get_numeric_val, set_numeric_val },
     { NULL }
 };
@@ -104,7 +104,7 @@
 a column other than the primary key */
 static col_cvt_t guid_col_table[] =
 {
-    { "obj_guid",        CT_GUID,      0, COL_NNUL,    NULL,
+    { "obj_guid",        CT_GUID,      0, COL_NNUL,    NULL, NULL,
             get_obj_guid, set_obj_guid },
     { NULL }
 };

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -72,17 +72,17 @@
 
 static col_cvt_t tx_col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY, NULL,
+    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY, NULL, NULL,
             get_guid, set_guid },
-    { "currency_guid",    CT_GUID,    0, COL_NNUL,    NULL,
+    { "currency_guid",    CT_GUID,    0, COL_NNUL,    NULL, NULL,
             get_tx_currency_guid, set_tx_currency_guid },
-    { "num",            CT_STRING,    TX_MAX_NUM_LEN, COL_NNUL, NULL,
+    { "num",            CT_STRING,    TX_MAX_NUM_LEN, COL_NNUL, NULL, NULL,
             get_tx_num, set_tx_num },
-    { "post_date",        CT_TIMESPEC, 0, COL_NNUL, NULL,
+    { "post_date",        CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
             get_tx_post_date, set_tx_post_date },
-    { "enter_date",        CT_TIMESPEC, 0, COL_NNUL, NULL,
+    { "enter_date",        CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
             get_tx_enter_date, set_tx_enter_date },
-    { "description",    CT_STRING,    TX_MAX_DESCRIPTION_LEN, 0,    NULL,
+    { "description",    CT_STRING,    TX_MAX_DESCRIPTION_LEN, 0,    NULL, NULL,
             (QofAccessFunc)xaccTransGetDescription,
             (QofSetterFunc)xaccTransSetDescription },
     { NULL }
@@ -106,28 +106,28 @@
 
 static col_cvt_t split_col_table[] =
 {
-    { "guid",            CT_GUID,     0, COL_NNUL|COL_PKEY,    NULL,
+    { "guid",            CT_GUID,     0, COL_NNUL|COL_PKEY,    NULL, NULL,
             get_guid, set_guid },
-    { "tx_guid",        CT_GUID,     0, COL_NNUL,    NULL,
+    { "tx_guid",        CT_GUID,     0, COL_NNUL,    NULL, NULL,
             get_split_tx_guid, set_split_tx_guid },
-    { "memo",            CT_STRING,     SPLIT_MAX_MEMO_LEN, COL_NNUL,    SPLIT_MEMO },
-    { "action",            CT_STRING,     SPLIT_MAX_ACTION_LEN, COL_NNUL,    SPLIT_ACTION },
-    { "reconcile_state", CT_STRING,     1, COL_NNUL,    NULL,
+    { "memo",            CT_STRING,     SPLIT_MAX_MEMO_LEN, COL_NNUL,    NULL, SPLIT_MEMO },
+    { "action",            CT_STRING,     SPLIT_MAX_ACTION_LEN, COL_NNUL,    NULL, SPLIT_ACTION },
+    { "reconcile_state", CT_STRING,     1, COL_NNUL,    NULL, NULL,
             get_split_reconcile_state, set_split_reconcile_state },
-    { "reconcile_date",    CT_TIMESPEC, 0, COL_NNUL,    NULL,
+    { "reconcile_date",    CT_TIMESPEC, 0, COL_NNUL,    NULL, NULL,
             get_split_reconcile_date, set_split_reconcile_date },
-    { "value",            CT_NUMERIC,     0, COL_NNUL,    NULL,
+    { "value",            CT_NUMERIC,     0, COL_NNUL,    NULL, NULL,
             get_split_value, set_split_value },
-    { "quantity",        CT_NUMERIC,     0, COL_NNUL,    NULL,
+    { "quantity",        CT_NUMERIC,     0, COL_NNUL,    NULL, NULL,
             get_split_quantity, set_split_quantity },
-    { "account_guid",    CT_GUID,     0, COL_NNUL,    NULL,
+    { "account_guid",    CT_GUID,     0, COL_NNUL,    NULL, NULL,
             get_split_account_guid, set_split_account_guid },
     { NULL }
 };
 
 static col_cvt_t guid_col_table[] =
 {
-    { "tx_guid", CT_GUID, 0, 0, NULL, get_guid, set_guid },
+    { "tx_guid", CT_GUID, 0, 0, NULL, NULL, get_guid, set_guid },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/bin/gnucash-bin.c
===================================================================
--- gnucash/branches/gda-dev/src/bin/gnucash-bin.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/bin/gnucash-bin.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -84,7 +84,7 @@
 	    _("This is a development version. It may or may not work.\n"),
 	    _("Report bugs and other problems to gnucash-devel at gnucash.org.\n"),
 	    _("You can also lookup and file bug reports at http://bugzilla.gnome.org\n"),
-	    _("The last stable version was "), "GnuCash 2.2.0",
+	    _("The last stable version was "), "GnuCash 2.2.1",
 	    _("The next stable version will be "), "GnuCash 2.4");
 }
 
@@ -470,7 +470,6 @@
     
     if (!nofile && (fn = get_file_to_load())) {
         gnc_update_splash_screen(_("Loading data..."));
-        gnc_destroy_splash_screen();
         gnc_file_open_file(fn);
         g_free(fn);
     } 
@@ -529,7 +528,6 @@
           {
                QofLogLevel level;
                gchar **parts = NULL;
-               gchar *logger_name = NULL;
 
                gchar *log_opt = log_flags[i];
                parts = g_strsplit(log_opt, "=", 2);
@@ -539,10 +537,8 @@
                     continue;
                }
 
-               logger_name = g_strdup(parts[0]);
                level = qof_log_level_from_string(parts[1]);
-
-               qof_log_set_level(logger_name, level);
+               qof_log_set_level(parts[0], level);
                g_strfreev(parts);
           }
      }

Modified: gnucash/branches/gda-dev/src/doc/sx.rst
===================================================================
--- gnucash/branches/gda-dev/src/doc/sx.rst	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/doc/sx.rst	2007-09-09 16:25:08 UTC (rev 16513)
@@ -43,7 +43,7 @@
       - [ ] remove instances
       - [ ] make "weird"
 
-    - [ ] ± disabled flag
+    - [ ] ± disabled flag
 
   - [x] ensure state consistency model is upheld
   - [ ] check variables-unbound logic
@@ -51,7 +51,7 @@
   - [ ] check "since last run" states
 
     - [ ] specious datafile dirty-ing
-    - [ ] -autocreate[, ±notify]
+    - [ ] -autocreate[, ±notify]
     - [ ] +autocreate, -notify
     - [ ] +autocreate, +notify
     - [ ] +autocreate, -notify, w/postponed

Modified: gnucash/branches/gda-dev/src/engine/FreqSpec.h
===================================================================
--- gnucash/branches/gda-dev/src/engine/FreqSpec.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/FreqSpec.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -19,67 +19,18 @@
 \********************************************************************/
 /** @addtogroup SchedXaction
     @{ */
-/** @addtogroup FreqSpec Specifying Recurring Dates (Periods)
-
- Frequency specifications include how to let an event recur on a
- predictable frequency, from a core of once, daily, weekly, monthly or annually.
- More complex frequencies like twice weekly, quarterly, bi-annually and
- custom frequencies consisting of a series of distinct dates are built from
- the core types.
- 
- Although defined, MONTH_RELATIVE is not yet supported.
-
- Scheduled transactions have a frequency defined by a frequency
- specifier.  This specifier, given a start date, end date [present
- in the scheduled transaction] and last occurance date [possibly not
- present] can be used to determine that a s.transaction should be
- instantiated on a given date [the given query date].
-
- There is a split between the UIFreqType and the 'internal' FreqType
- to reduce the complexity of some of the code involved.
-
- This still needs to deal with:
- . exceptions
- . 13 periods: (4 weeks/period 4x13=52 weeks/year)
- . yearly 360/365?
- . re-based frequencies [based around a non-standard [read:
-   not-Jan-1-based/fiscal] year]
- . "business days" -- m-f sans holidays [per-user list thereof]
-
- \todo  add month-relative getter 
-
-@{ */
 /** @file FreqSpec.h
     @brief Period / Date Frequency Specification
     @author Copyright (C) 2001 Joshua Sled <jsled at asynchronous.org>
-    @author Copyright (C) 2001 Ben Stanley <bds02 at uow.edu.au>
-    @author Copyright (c) 2005 Neil Williams <linux at codehelp.co.uk>
 */
 
 #ifndef XACC_FREQSPEC_H
 #define XACC_FREQSPEC_H
 
-typedef struct _FreqSpecClass FreqSpecClass;
-
 #include "gnc-engine.h"
 #include <glib.h>
 #include "qof.h"
 
-/* --- type macros --- */
-#define GNC_TYPE_FREQSPEC            (gnc_freqspec_get_type ())
-#define GNC_FREQSPEC(o)              \
-     (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_FREQSPEC, FreqSpec))
-#define GNC_FREQSPEC_CLASS(k)        \
-     (G_TYPE_CHECK_CLASS_CAST((k), GNC_TYPE_FREQSPEC, FreqSpecClass))
-#define GNC_IS_FREQSPEC(o)           \
-     (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_FREQSPEC))
-#define GNC_IS_FREQSPEC_CLASS(k)     \
-     (G_TYPE_CHECK_CLASS_TYPE ((k), GNC_TYPE_FREQSPEC))
-#define GNC_FREQSPEC_GET_CLASS(o)    \
-     (G_TYPE_INSTANCE_GET_CLASS ((o), GNC_TYPE_FREQSPEC, FreqSpecClass))
-GType gnc_freqspec_get_type(void);
-
-
 #define ENUM_LIST_TYPE(_) \
         _(INVALID,) \
         _(ONCE,) \
@@ -121,185 +72,6 @@
 AS_STRING_DEC(UIFreqType, ENUM_LIST_UI) 
 FROM_STRING_DEC(UIFreqType, ENUM_LIST_UI)
 
-
-/**
- * Forward declaration of FreqSpec type for storing
- * date repetition information. This is an opaque type.
- */
-
-struct gncp_freq_spec;
-typedef struct gncp_freq_spec FreqSpec;
-
-/** PROTOTYPES ******************************************************/
-
-/**
- * Allocates memory for a FreqSpec and initializes it.
- **/
-FreqSpec* xaccFreqSpecMalloc(QofBook *book);
-
-/**
- * destroys any private data belonging to the FreqSpec.
- * Use this for a stack object.
- */
-void xaccFreqSpecCleanUp( FreqSpec *fs );
-
-/**
- * Frees a heap allocated FreqSpec.
- * This is the opposite of xaccFreqSpecMalloc().
- **/
-void xaccFreqSpecFree( FreqSpec *fs );
-
-/**
- * Gets the type of a FreqSpec.
- **/
-FreqType xaccFreqSpecGetType( FreqSpec *fs );
-
-/**
- * Sets the type of a FreqSpec.
- * Setting the type re-initializes any spec-data; this means
- * destroying any sub-types in the case of COMPOSITE.
- *
- * \warning THESE FUNCTIONS HAVE NOT BEEN MAINTAINED THROUGH BEN'S CHANGES.
- * They need to be checked.
- **/
-/* void xaccFreqSpecSetType( FreqSpec *fs, FreqType newType ); */
-void xaccFreqSpecSetUIType( FreqSpec *fs, UIFreqType newUIFreqType );
-
-/** 
- * Returns the frequency part of the FreqSpec, specifically,
- * one of the 'user-interface' enumerants.
- */
-UIFreqType xaccFreqSpecGetUIType( FreqSpec *fs );
-
-
-void xaccFreqSpecSetNone( FreqSpec *fs );
-
-/**
- * Sets the type to once-off, and initialises the
- * date it occurs on.
- * Disposes of any previous data.
- */
-void xaccFreqSpecSetOnceDate( FreqSpec *fs,
-                              const GDate* when );
-
-/**
- * Sets the type to DAILY. Disposes of any previous data.
- * Uses the start date to figure
- * out how many days after epoch (1/1/1900) this repeat would
- * have first occurred on if it had been running back then.
- * This is used later to figure out absolute repeat dates.
- */
-void xaccFreqSpecSetDaily( FreqSpec *fs,
-                           const GDate* initial_date,
-                           guint interval_days );
-
-/**
- * Sets the type to WEEKLY. Disposes of any previous data.
- * Uses the inital date to figure out the day of the week to use.
- */
-void xaccFreqSpecSetWeekly( FreqSpec *fs,
-                            const GDate* inital_date,
-                            guint interval_weeks );
-
-/**
- * Sets the type to MONTHLY. Disposes of any previous data.
- * Uses the inital date to figure out the day of the month to use.
- */
-void xaccFreqSpecSetMonthly( FreqSpec *fs,
-                             const GDate* inital_date,
-                             guint interval_months );
-
-/**
- * Sets the type to MONTH_RELATIVE. Disposes of any previous data.
- * Uses the inital date to figure out the day of the month to use.
- */
-void xaccFreqSpecSetMonthRelative( FreqSpec *fs,
-                                   const GDate* inital_date,
-                                   guint interval_months );
-
-/**
- * Sets the type to COMPOSITE. Disposes of any previous data.
- * You must Add some repeats to the composite before using
- * it for repeating.
- */
-void xaccFreqSpecSetComposite( FreqSpec *fs );
-
-/**
- * Returns a human-readable string of the Frequency.  This uses
- * UIFreqType to unroll the internal structure.  It is an assertion
- * failure if the FreqSpec data doesn't match the UIFreqType.
- * Caller allocates the GString [natch].
- **/
-void xaccFreqSpecGetFreqStr( FreqSpec *fs, GString *str );
-
-/** DOCUMENT ME! */
-int xaccFreqSpecGetOnce( FreqSpec *fs, GDate *outGD );
-/** DOCUMENT ME! */
-int xaccFreqSpecGetDaily( FreqSpec *fs, int *outRepeat );
-/** DOCUMENT ME! */
-int xaccFreqSpecGetWeekly( FreqSpec *fs, int *outRepeat, int *outDayOfWeek );
-/** DOCUMENT ME! */
-int xaccFreqSpecGetMonthly( FreqSpec *fs, int *outRepeat,
-                            int *outDayOfMonth, int *outMonthOffset );
-/* FIXME: add month-relative */
-
-/**
- * Returns the list of FreqSpecs in a COMPOSITE FreqSpec.
- * It is an error to use this if the type is not COMPOSITE.
- * The caller should not modify this list;
- * only add/remove composites and use this fn to get
- * the perhaps-changed list head.
- **/
-GList* xaccFreqSpecCompositeGet( FreqSpec *fs );
-
-/**
- * Adds a FreqSpec to the list in a COMPOSITE FreqSpec; if the
- * FreqSpec is not COMPOSITE, this is an assertion failure.
- **/
-void xaccFreqSpecCompositeAdd( FreqSpec *fs, FreqSpec *fsToAdd );
-
-/**
- * Computes the next instance of the FreqSpec after a given input date.
- * The object pointed at by 'out_date' is set to the computed value.
- * The 'in_date' can be any date.  It is gaurenteed that the 'out_date'
- * is strictly greater than the 'in_date'.  That is, if the 'in_date'
- * happens to be a repeat date (e.g. a previous out_date), then
- * the out_date will be the next repeat date after that.
- **/
-void xaccFreqSpecGetNextInstance( FreqSpec *fs,
-                                  const GDate* in_date,
-                                  GDate* out_date );
-
-/**
- * qsort-style comparison of FreqSpecs.
- * More frequently-occuring FreqSpecs are sorted before less-frequent FreqSpecs.
- * FIXME: What to do for composites?
- **/
-int gnc_freq_spec_compare( FreqSpec *a, FreqSpec *b );
-
-/** \name QOF handling.
-
-QOF requires parameters to use get and set routines individually -
-one parameter, one set routine, one get routine. QOF also passes
-parameter values directly and expects to receive the parameter value
-directly. These functions provide this mechanism. Note that in each
-case, where the xacc.. function uses a *int, QOF uses the int.
-
-In keeping with the rest of QOF, dates are handled as Timespec.
-@{
-*/
-#define QOF_ID_FREQSPEC       "FreqSpec"
-#define FS_UI_TYPE            "fs-frequency"
-#define FS_REPEAT             "fs-repeat"
-#define FS_BASE_DATE          "fs-initial-date"
-#define FS_MONTH_DAY          "fs-day-of-month"
-#define FS_MONTH_OFFSET       "fs-month-offset"
-
-/** \todo Need support for monthly and weekly extra values and composite. */
-gboolean FreqSpecRegister(void);
-
 /** @} */
-/** @} */
-/** @} */
 
 #endif /* XACC_FREQSPEC_H */

Modified: gnucash/branches/gda-dev/src/engine/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/engine/Makefile.am	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/Makefile.am	2007-09-09 16:25:08 UTC (rev 16513)
@@ -14,7 +14,6 @@
 
 libgncmod_engine_la_SOURCES = \
   Account.c \
-  FreqSpec.c \
   Recurrence.c \
   Period.c \
   Query.c \
@@ -93,7 +92,6 @@
 
 noinst_HEADERS = \
   AccountP.h \
-  FreqSpecP.h \
   QueryP.h \
   ScrubP.h \
   SplitP.h \

Modified: gnucash/branches/gda-dev/src/engine/Recurrence.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/Recurrence.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/Recurrence.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -327,11 +327,14 @@
 
     str = g_string_new("");
     if (r == NULL) {
-        g_string_append(str, "None");
+        g_string_append(str, _("None"));
     } else {
         for(iter = r; iter; iter = iter->next){
             if (iter != r)
-                g_string_append(str, " + ");
+            {
+                /* translators: " + " is an separator in a list of string-representations of recurrence frequencies */
+                g_string_append(str, _(" + "));
+            }
             s = recurrenceToString((Recurrence *)iter->data);
             g_string_append(str, s);
             g_free(s);
@@ -542,15 +545,15 @@
             g_string_printf(buf, _("Monthly"));
             if (multiplier > 1)
             {
-                /* translators: %u is the recurrence multipler. */
+                /* translators: %u is the recurrence multiplier. */
                 g_string_append_printf(buf, _(" (x%u)"), multiplier);
             }
             g_string_append_printf(buf, ": ");
             _monthly_append_when(r, buf);
         } break;
         case PERIOD_NTH_WEEKDAY: {
-            g_warning("nth weekday unhandled");
-            g_string_printf(buf, "@fixme: nth weekday");
+            g_warning("nth weekday not handled");
+            g_string_printf(buf, "@fixme: nth weekday not handled");
         } break;
         case PERIOD_YEAR: {
             g_string_printf(buf, _("Yearly"));
@@ -561,7 +564,7 @@
             }
         } break;
         default:
-            g_error("unknown Recurrnce period %d", recurrenceGetPeriodType(r));
+            g_error("unknown Recurrence period %d", recurrenceGetPeriodType(r));
             break;
         }
     }

Modified: gnucash/branches/gda-dev/src/engine/Recurrence.h
===================================================================
--- gnucash/branches/gda-dev/src/engine/Recurrence.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/Recurrence.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -17,10 +17,6 @@
  *   and perform the same "next instance" computation for this
  *   sequence.
  *
- *   Note: Recurrence is similar to FreqSpec, but it represents a
- *   broader concept than FreqSpec (because it also represents the
- *   beginning of the recurrence).
- *
  * Copyright (C) 2005, Chris Shoemaker <c.shoemaker at cox.net>
  *
  * This program is free software; you can redistribute it and/or

Modified: gnucash/branches/gda-dev/src/engine/SchedXaction.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/SchedXaction.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/SchedXaction.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -29,7 +29,6 @@
 
 #include "qof.h"
 
-#include "FreqSpec.h"
 #include "Account.h"
 #include "gnc-book.h"
 #include "SX-book.h"
@@ -72,7 +71,6 @@
    qof_instance_init_data (&sx->inst, GNC_ID_SCHEDXACTION, book);
 
    sx->schedule = NULL;
-   sx->freq = xaccFreqSpecMalloc(book);
 
    g_date_clear( &sx->last_date, 1 );
    g_date_clear( &sx->start_date, 1 );
@@ -176,7 +174,6 @@
       
   if ( sx == NULL ) return;
   
-  xaccFreqSpecFree( sx->freq );
   qof_event_gen( &sx->inst, QOF_EVENT_DESTROY , NULL);
   
   if ( sx->name )
@@ -239,24 +236,6 @@
 
 /* ============================================================ */
 
-FreqSpec *
-xaccSchedXactionGetFreqSpec( const SchedXaction *sx )
-{
-   return sx->freq;
-}
-
-void
-xaccSchedXactionSetFreqSpec( SchedXaction *sx, FreqSpec *fs )
-{
-   g_return_if_fail( fs );
-
-   gnc_sx_begin_edit(sx);
-   xaccFreqSpecFree( sx->freq );
-   sx->freq = fs;
-   qof_instance_set_dirty(&sx->inst);
-   gnc_sx_commit_edit(sx);
-}
-
 GList*
 gnc_sx_get_schedule(const SchedXaction *sx)
 {
@@ -887,8 +866,6 @@
 SXRegister(void)
 {
 	static QofParam params[] = {
-	 { GNC_SX_FREQ_SPEC, QOF_ID_FREQSPEC, (QofAccessFunc)xaccSchedXactionGetFreqSpec,
-		 (QofSetterFunc)xaccSchedXactionSetFreqSpec },
 	 { GNC_SX_NAME, QOF_TYPE_STRING, (QofAccessFunc)xaccSchedXactionGetName,
 		 (QofSetterFunc)xaccSchedXactionSetName },
 	 { GNC_SX_START_DATE, QOF_TYPE_DATE, (QofAccessFunc)xaccSchedXactionGetStartDate,

Modified: gnucash/branches/gda-dev/src/engine/SchedXaction.h
===================================================================
--- gnucash/branches/gda-dev/src/engine/SchedXaction.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/SchedXaction.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -41,7 +41,6 @@
 #include <time.h>
 #include <glib.h>
 #include "qof.h"
-#include "FreqSpec.h"
 #include "Recurrence.h"
 #include "gnc-engine.h"
 
@@ -91,7 +90,6 @@
   gchar           *name;
 
   GList           *schedule;
-  FreqSpec        *freq;
   
   GDate           last_date;
   
@@ -154,13 +152,6 @@
 /** @param[in] schedule A GList<Recurrence*> **/
 void gnc_sx_set_schedule(SchedXaction *sx, GList *schedule);
 
-FreqSpec *xaccSchedXactionGetFreqSpec( const SchedXaction *sx );
-/**
- * The FreqSpec is given to the SchedXaction for mem mgmt; it should
- * not be freed by the external code.
-*/
-void xaccSchedXactionSetFreqSpec( SchedXaction *sx, FreqSpec *fs );
-
 gchar *xaccSchedXactionGetName( const SchedXaction *sx );
 /**
  * A copy of the name is made.

Modified: gnucash/branches/gda-dev/src/engine/Split.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/Split.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/Split.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -551,17 +551,13 @@
        original and new transactions, for the _next_ begin/commit cycle. */
     s->orig_acc = s->acc;
     s->orig_parent = s->parent;
-    qof_instance_mark_clean(QOF_INSTANCE(s));
+    qof_commit_edit_part2(QOF_INSTANCE(s), NULL, NULL, 
+                          (void (*) (QofInstance *)) xaccFreeSplit);
 
-    /* This is because Splits don't call qof_commit_edit(). */
-    qof_instance_set_dirty(QOF_INSTANCE(s->parent));
-
     if (acc) {
         g_object_set(acc, "sort-dirty", TRUE, "balance-dirty", TRUE, NULL);
         xaccAccountRecomputeBalance(acc);
     }
-    if (qof_instance_get_destroying(s))
-        xaccFreeSplit(s);
 }
 
 /* An engine-private helper for completing xaccTransRollbackEdit(). */

Modified: gnucash/branches/gda-dev/src/engine/cashobjects.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/cashobjects.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/cashobjects.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -28,7 +28,6 @@
 #include "gnc-engine.h"
 #include "AccountP.h"
 #include "TransactionP.h"
-#include "FreqSpec.h"
 #include "SchedXaction.h"
 #include "SX-book-p.h"
 #include "gnc-pricedb-p.h"
@@ -42,7 +41,6 @@
 	g_return_val_if_fail(xaccAccountRegister(), FALSE);
 	g_return_val_if_fail ( xaccTransRegister(), FALSE);
 	g_return_val_if_fail ( xaccSplitRegister(), FALSE);
-	g_return_val_if_fail ( FreqSpecRegister(),  FALSE);
 	g_return_val_if_fail ( SXRegister (),       FALSE);
 	g_return_val_if_fail ( gnc_sxtt_register(), FALSE);
 	g_return_val_if_fail(gnc_pricedb_register(),FALSE);

Modified: gnucash/branches/gda-dev/src/engine/gnc-engine.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/gnc-engine.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/gnc-engine.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -33,7 +33,6 @@
 #include "TransactionP.h"
 #include "gnc-commodity.h"
 #include "gnc-lot-p.h"
-#include "FreqSpecP.h"
 #include "gnc-pricedb-p.h"
 
 /** gnc file backend library name */

Modified: gnucash/branches/gda-dev/src/engine/gnc-engine.h
===================================================================
--- gnucash/branches/gda-dev/src/engine/gnc-engine.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/gnc-engine.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -93,7 +93,6 @@
 #define GNC_ID_COMMODITY      "Commodity"
 #define GNC_ID_COMMODITY_NAMESPACE "CommodityNamespace"
 #define GNC_ID_COMMODITY_TABLE "CommodityTable"
-#define GNC_ID_FREQSPEC       "FreqSpec"
 #define GNC_ID_LOT            "Lot"
 #define GNC_ID_PERIOD         "Period"
 #define GNC_ID_PRICE          "Price"

Modified: gnucash/branches/gda-dev/src/engine/iso-4217-currencies.scm
===================================================================
--- gnucash/branches/gda-dev/src/engine/iso-4217-currencies.scm	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/iso-4217-currencies.scm	2007-09-09 16:25:08 UTC (rev 16513)
@@ -195,6 +195,7 @@
 ( "Vanuatu Vatu" "vatu" "centime" "ISO4217" "VUV" "548" 1 1 )
 ( "Venezuelan Bolivar" "bolivar" "centimo" "ISO4217" "VEB" "862" 100 100 )
 ( "Vietnamese Dong" "dong" "hao" "ISO4217" "VND" "704" 100 100 )
+( "Yemeni Riyal" "riyal" "fils" "ISO4217" "YER" "886" 100 100 )
 ( "Yugoslav Dinar" "dinar" "para"  "ISO4217" "YUM"  "890" 100 100)
 ( "Zambian Kwacha" "kwacha" "ngwee"  "ISO4217" "ZMK" "894" 100 100 )
 ( "Zimbabwe Dollar" "dollar" "cent" "ISO4217" "ZWD" "716" 100 100 )

Modified: gnucash/branches/gda-dev/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/gda-dev/src/engine/test/Makefile.am	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/test/Makefile.am	2007-09-09 16:25:08 UTC (rev 16513)
@@ -42,7 +42,6 @@
   test-split-vs-account  \
   test-transaction-reversal \
   test-transaction-voiding \
-  test-freq-spec \
   test-recurrence \
   test-scm-query \
   test-book-merge
@@ -64,7 +63,6 @@
   test-link \
   test-commodities \
   test-date \
-  test-freq-spec \
   test-recurrence \
   test-guid \
   test-account-object \

Deleted: gnucash/branches/gda-dev/src/engine/test/test-freq-spec.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/test/test-freq-spec.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/test/test-freq-spec.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1,630 +0,0 @@
-/*
- * Testing routine added by Ben Stanley bds02 at uow.edu.au 20010320
- * Try to test Joshua Sled's FreqSpec module.
- *
- */
-/*
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA
- *  02110-1301, USA.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <glib.h>
-#include "cashobjects.h"
-#include "test-stuff.h"
-#include "FreqSpec.h"
-#include "gnc-engine.h"
-
-static QofBook *book;
-
-static void
-test_once (void)
-{
-   FreqSpec *fs;
-   guint32 i, start_julian;
-   GDate date1, date2, next_date;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   for( start_julian = 1; start_julian < 1000; ++start_julian ) {
-      g_date_set_julian( &date1, start_julian );
-
-      xaccFreqSpecSetOnceDate( fs, &date1 );
-      for( i = 0; i <= 2 * start_julian; ++i ) {
-         g_date_set_julian( &date2, start_julian + i );
-         xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-         do_test( (g_date_compare( &date2, &date1 ) >= 0 &&
-               !g_date_valid( &next_date ) ) ||
-            g_date_compare( &date1, &next_date ) == 0,
-            "once off" );
-      }
-   }
-   fprintf(stdout, " FreqSpec: Single test OK, continuing . . . \r");
-   fflush(stdout);
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_daily (void)
-{
-   guint32 interval, i, start_julian, j;
-   FreqSpec *fs;
-   GDate date1, date2, next_date;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   g_date_set_dmy( &date1, 1, 1, 2000 );
-
-   start_julian = g_date_get_julian( &date1 );
-   for( interval = 1; interval < 400; ++interval ) {
-      xaccFreqSpecSetDaily( fs, &date1, interval );
-      for( i = 0; i <= 2 * interval; ++i ) {
-         g_date_set_julian( &date2, start_julian + i );
-         xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-         do_test_args(
-            g_date_get_julian( &next_date ) - g_date_get_julian( &date2 ) ==
-               interval - (i%interval),
-            "daily repeats",
-            __FILE__, __LINE__,
-            "interval = %d days, days from start = %d",
-            interval, i );
-      }
-   }
-
-   /* This tests whether we can correctly generate a sequence of dates,
-    * and end up in the right place. */
-   g_date_set_dmy( &date1, 25, 3, 2001 );
-   for( interval = 1; interval < 20; ++interval ) {
-      xaccFreqSpecSetDaily( fs, &date1, interval );
-      for( j = 0; j < 20; ++j ) { /* j=0 passes by luck, but it's not valid */
-         date2 = date1;
-         for( i = 0; i < j; ++i ) {
-            xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-            date2 = next_date;
-         }
-         do_test_args( g_date_get_julian( &date2 ) - g_date_get_julian( &date1 ) == interval*j,
-            "daily repeats end up in the right place",
-            __FILE__, __LINE__, "interval = %d days, iters = %d",
-            interval, j );
-      }
-   }
-   fprintf(stdout, " FreqSpec: Daily test OK, continuing . . . \r");
-   fflush(stdout);
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_weekly (void)
-{
-   guint32 interval, i, start_julian, weekday, j;
-   FreqSpec *fs;
-   GDate date1, date2, next_date;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   /* Use this to test any specific cases which fail,
-    * for easy access in the debugger. */
-/*
-   g_date_set_dmy( &date1, 2, 1, 1 );
-   xaccFreqSpecSetWeekly( fs, &date1, 1 );
-   start_julian = g_date_get_julian( &date1 );
-   g_date_set_julian( &date2, start_julian + 6 );
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-*/
-   /* date2 should now be 9/1/1, julian date 9. */
-
-   for( weekday = 1; weekday <= 7; ++weekday ) {
-      g_date_set_dmy( &date1, weekday, 1, 1 );
-      start_julian = g_date_get_julian( &date1 );
-      for( interval = 1; interval <= 52; ++interval ) {
-         xaccFreqSpecSetWeekly( fs, &date1, interval );
-         for( i = 0; i <= 2 * 7 * interval; ++i ) {
-            g_date_set_julian( &date2, start_julian + i );
-            xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-            do_test_args(
-               g_date_get_julian( &next_date ) - g_date_get_julian( &date2 ) ==
-                  interval*7 - (i%(interval*7)),
-               "weekly repeats",
-               __FILE__, __LINE__,
-               "weekday = %d, interval = %d weeks, days from start = %d",
-               weekday, interval, i );
-         }
-      }
-   }
-
-   /* This tests whether we can correctly generate a sequence of dates,
-    * and end up in the right place. */
-   g_date_set_dmy( &date1, 25, 3, 2001 );
-   for( interval = 1; interval < 20; ++interval ) {
-      xaccFreqSpecSetWeekly( fs, &date1, interval );
-      for( j = 0; j < 2*53; ++j ) {
-         date2 = date1;
-         for( i = 0; i < j; ++i ) {
-            xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-            date2 = next_date;
-         }
-         do_test_args( g_date_get_julian( &date2 ) - g_date_get_julian( &date1 ) == interval*7*j,
-            "weekly repeats end up in the right place",
-            __FILE__, __LINE__, "interval = %d weeks, iters = %d",
-            interval, j );
-      }
-   }
-   fprintf(stdout, " FreqSpec: Weekly test OK, continuing . . . \r");
-   fflush(stdout);
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_monthly (void)
-{
-   guint32 interval, i, start_julian, monthday, month, j, day_of_year;
-   FreqSpec *fs;
-   GDate date0, date1, date2, next_date;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   /* Use this to test any specific cases which fail,
-    * for easy access in the debugger. */
-
-/*
-   g_date_set_dmy( &date1, 1, 1, 1 );
-   xaccFreqSpecSetMonthly( fs, &date1, 2 );
-   start_julian = g_date_get_julian( &date1 );
-   g_date_set_julian( &date2, start_julian + 0 );
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-*/
-
-   for( monthday = 1; monthday <= 28; ++monthday ) {
-      for( month = 1; month <= 12; ++month ) {
-         g_date_set_dmy( &date1, monthday, month, 1 );
-         start_julian = g_date_get_julian( &date1 );
-         for( interval = 1; interval <= 24; ++interval ) {
-            xaccFreqSpecSetMonthly( fs, &date1, interval );
-            for( i = 0; i <= 2 * 31 * interval; ++i ) {
-               g_date_set_julian( &date2, start_julian + i );
-               xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-               do_test_args(
-                  g_date_get_day( &next_date ) == g_date_get_day( &date1 ),
-                  "monthly repeats - check day",
-                  __FILE__, __LINE__,
-                  "monthday = %d, month = %d, interval = %d months, days from start = %d",
-                  monthday, month, interval, i );
-               do_test_args(
-                  ( g_date_get_month( &next_date ) + 12 * (g_date_get_year( &next_date )-1) - 1) %
-                     interval == (month-1) % interval,
-                  "monthly repeats - check month",
-                  __FILE__, __LINE__,
-                  "monthday = %d, month = %d, interval = %d months, days from start = %d",
-                  monthday, month, interval, i );
-            }
-         }
-      }
-   }
-
-   /* This tests whether we can correctly generate a sequence of dates,
-    * and end up in the right place. */
-   g_date_set_dmy( &date0, 1, 1, 2000 );
-   for( day_of_year = 1; day_of_year <= 365*5; ++day_of_year ) {
-      g_date_set_julian( &date1, g_date_get_julian( &date0 ) + day_of_year-1 );
-      for( interval = 1; interval < 20; ++interval ) {
-         xaccFreqSpecSetMonthly( fs, &date1, interval );
-         for( j = 1; j < 20; ++j ) {
-            date2 = date1;
-            for( i = 0; i < j; ++i ) {
-               xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-               date2 = next_date;
-            }
-            date2 = date1;
-            g_date_add_months( &date2, interval * j );
-            do_test_args( g_date_compare( &date2, &next_date ) == 0,
-               "monthly repeats end up in the right place",
-               __FILE__, __LINE__, "interval = %d months, iters = %d, day_of_year = %d",
-               interval, j, day_of_year );
-         }
-      }
-   }
-   fprintf(stdout, " FreqSpec: Monthly test OK, continuing . . . \r");
-   fflush(stdout);
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_month_relative (void)
-{
-   guint32 interval, i, start_julian, monthday, month, j;
-   FreqSpec *fs;
-   GDate date0, date1, date2, next_date;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   /* Use this to test any specific cases which fail,
-    * for easy access in the debugger. */
-
-/*
-   g_date_set_dmy( &date1, 1, 1, 1 );
-   xaccFreqSpecSetMonthRelative( fs, &date1, 2 );
-   start_julian = g_date_get_julian( &date1 );
-   g_date_set_julian( &date2, start_julian + 0 );
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-*/
-
-   /* This loop does not test for days/occurences which can
-    * fail to fall in the same month. */
-   for( monthday = 1; monthday <= 28; ++monthday ) {
-      for( month = 1; month <= 12; ++month ) {
-         g_date_set_dmy( &date1, monthday, month, 1 );
-         start_julian = g_date_get_julian( &date1 );
-         for( interval = 1; interval <= 24; ++interval ) {
-            xaccFreqSpecSetMonthRelative( fs, &date1, interval );
-            for( i = 0; i <= 2 * 31 * interval; ++i ) {
-               g_date_set_julian( &date2, start_julian + i );
-               xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-               do_test_args(
-                  g_date_get_weekday( &next_date ) == g_date_get_weekday( &date1 ),
-                  "month relative repeats - check weekday",
-                  __FILE__, __LINE__,
-                  "monthday = %d, month = %d, interval = %d months, days from start = %d, weekday = %d",
-                  monthday, month, interval, i, g_date_get_weekday( &date1 ) );
-               do_test_args(
-                  (g_date_get_day( &next_date )-1)/7 == (g_date_get_day( &date1 )-1)/7,
-                  "month relative repeats - check occurrence",
-                  __FILE__, __LINE__,
-                  "monthday = %d, month = %d, interval = %d months, days from start = %d, occurrence = %d",
-                  monthday, month, interval, i, (g_date_get_day( &date1 )-1)/7 );
-               do_test_args(
-                  ( g_date_get_month( &next_date ) + 12 * (g_date_get_year( &next_date )-1) - 1) %
-                     interval == (month-1) % interval,
-                  "month relative repeats - check month",
-                  __FILE__, __LINE__,
-                  "monthday = %d, month = %d, interval = %d months, days from start = %d",
-                  monthday, month, interval, i );
-            }
-         }
-      }
-   }
-
-   /* This tests whether we can correctly generate a sequence of dates,
-    * and end up in the right place. */
-   /* Unfortunately, I think that this is going to require specifically
-    * written test cases, for the case where the repeat falls in the next
-    * (or subsequent) month in the cycle.... */
-   
-   g_date_set_dmy( &date1, 1, 1, 2000 );
-   for( interval = 1; interval < 20; ++interval ) {
-      xaccFreqSpecSetMonthRelative( fs, &date1, interval );
-      for( j = 1; j < 20; ++j ) {
-         date2 = date1;
-         for( i = 0; i < j; ++i ) {
-            xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-            date2 = next_date;
-         }
-         date2 = date1;
-         g_date_add_months( &date2, interval * j );
-         do_test_args( g_date_get_month( &date2 ) == g_date_get_month( &next_date ),
-            "month_relative repeats end up in the right place - month",
-            __FILE__, __LINE__, "interval = %d months, iters = %d, weekday = %d",
-            interval, j, g_date_get_weekday( &date1 ) );
-         do_test_args( g_date_get_weekday( &date1 ) == g_date_get_weekday( &next_date ),
-            "month_relative repeats end up in the right place - weekday",
-            __FILE__, __LINE__, "interval = %d months, iters = %d, weekday = %d",
-            interval, j, g_date_get_weekday( &date1 ) );
-         do_test_args( (g_date_get_day( &date2 )-1)/7 == (g_date_get_day( &next_date )-1)/7,
-            "month_relative repeats end up in the right place - occurrence",
-            __FILE__, __LINE__, "interval = %d months, iters = %d, weekday = %d",
-            interval, j, g_date_get_weekday( &date1 ) );
-      }
-   }
-   
-   /* also test oddball cases */
-   /* This is the fifth Sunday of a five Sunday month. */
-   g_date_set_dmy( &date0, 29, 4, 2001 );
-   xaccFreqSpecSetMonthRelative( fs, &date0, 1 );
-   
-   xaccFreqSpecGetNextInstance( fs, &date0, &next_date );
-   g_date_set_dmy( &date1, 29, 7, 2001 );
-   do_test( g_date_compare( &next_date, &date1 ) == 0, "find five-sunday months" );
-   date2 = next_date;
-   
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-   g_date_set_dmy( &date1, 30, 9, 2001 );
-   do_test( g_date_compare( &next_date, &date1 ) == 0, "find five-sunday months" );
-   date2 = next_date;
-
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-   g_date_set_dmy( &date1, 30, 12, 2001 );
-   do_test( g_date_compare( &next_date, &date1 ) == 0, "find five-sunday months" );
-   date2 = next_date;
-   
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-   g_date_set_dmy( &date1, 31, 3, 2002 );
-   do_test( g_date_compare( &next_date, &date1 ) == 0, "find five-sunday months" );
-   date2 = next_date;
-   fprintf(stdout, " FreqSpec: Relative months test OK, continuing . . . \r");
-   fflush(stdout);   
-   xaccFreqSpecFree(fs);
-}
-
-static void test_caseA()
-{
-   FreqSpec *fs;
-   GDate date0, date1, date2, date3;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   g_date_set_dmy(&date0, 31, 12, 1); /* end of year */
-
-   xaccFreqSpecSetMonthly(fs, &date0, 3);  /* quarterly */
-
-   g_date_set_dmy(&date1, 13, 2, 1);  /* Feb 13th */
-   xaccFreqSpecGetNextInstance( fs, &date1, &date2 );
-
-   g_date_set_dmy( &date3, 31, 3, 1 ); /* Should get March 31st */
-   do_test( g_date_compare( &date2, &date3 ) == 0, "end of quarter" );
-
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_composite (void)
-{
-   FreqSpec *fs, *fs2;
-   GDate date0, date1, date2;
-
-   fs = xaccFreqSpecMalloc(book);
-
-   /* Use this to test any specific cases which fail,
-    * for easy access in the debugger. */
-
-/*
-   g_date_set_dmy( &date1, 1, 1, 1 );
-   xaccFreqSpecSetMonthly( fs, &date1, 2 );
-   start_julian = g_date_get_julian( &date1 );
-   g_date_set_julian( &date2, start_julian + 0 );
-   xaccFreqSpecGetNextInstance( fs, &date2, &next_date );
-*/
-
-   /* I have not tested this type as thoroughly
-    * because I expect that the elements from which it
-    * has been constructed have been pretty much tortured
-    * in the previous tests. I don't expect anything strange
-    * to go on here, at least for now... Maybe I'll put
-    * in more extensive tests later. */
-   
-   xaccFreqSpecSetComposite( fs );
-
-   fs2 = xaccFreqSpecMalloc(book);
-   g_date_set_dmy( &date0, 29, 3, 2001 ); /* Wednesday */
-   xaccFreqSpecSetWeekly( fs2, &date0, 2 );
-   xaccFreqSpecCompositeAdd( fs, fs2 );
-   
-   fs2 = xaccFreqSpecMalloc(book);
-   g_date_set_dmy( &date0, 3, 4, 2001 ); /* Tuesday */
-   xaccFreqSpecSetWeekly( fs2, &date0, 2 );
-   xaccFreqSpecCompositeAdd( fs, fs2 );
-      
-   fs2 = xaccFreqSpecMalloc(book);
-   g_date_set_dmy( &date0, 7, 4, 2001 ); /* Saturday */
-   xaccFreqSpecSetWeekly( fs2, &date0, 2 );
-   xaccFreqSpecCompositeAdd( fs, fs2 );
-   
-   fs2 = 0;
-
-   /* OK - now let's iterate it and see if we get the right sequence of dates. */
-   g_date_set_dmy( &date0, 26, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 29, 3, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0,
-                 "first date in sequence" );
-   
-   g_date_set_dmy( &date0, 27, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 29, 3, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0,
-                 "first date in sequence" );
-   
-   g_date_set_dmy( &date0, 28, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 29, 3, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "first date in sequence" );
-   
-   g_date_set_dmy( &date0, 29, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 3, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "second date in sequence" );
-
-   g_date_set_dmy( &date0, 30, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 3, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "second date in sequence" );
-
-   g_date_set_dmy( &date0, 31, 3, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 3, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "second date in sequence" );
-
-   g_date_set_dmy( &date0, 1, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 3, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "second date in sequence" );
-
-   g_date_set_dmy( &date0, 2, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 3, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "second date in sequence" );
-
-   g_date_set_dmy( &date0, 3, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 7, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "third date in sequence" );
-
-   g_date_set_dmy( &date0, 4, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 7, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "third date in sequence" );
-
-   g_date_set_dmy( &date0, 5, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 7, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "third date in sequence" );
-
-   g_date_set_dmy( &date0, 6, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 7, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "third date in sequence" );
-
-   g_date_set_dmy( &date0, 7, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 12, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fourth date in sequence" );
-
-   g_date_set_dmy( &date0, 8, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 12, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fourth date in sequence" );
-
-   g_date_set_dmy( &date0, 9, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 12, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fourth date in sequence" );
-
-   g_date_set_dmy( &date0, 10, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 12, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fourth date in sequence" );
-
-   g_date_set_dmy( &date0, 11, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 12, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fourth date in sequence" );
-
-   g_date_set_dmy( &date0, 12, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 17, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fifth date in sequence" );
-
-   g_date_set_dmy( &date0, 13, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 17, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fifth date in sequence" );
-
-   g_date_set_dmy( &date0, 14, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 17, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fifth date in sequence" );
-
-   g_date_set_dmy( &date0, 15, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 17, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fifth date in sequence" );
-
-   g_date_set_dmy( &date0, 16, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 17, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "fifth date in sequence" );
-
-   g_date_set_dmy( &date0, 17, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 21, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "sixth date in sequence" );
-
-   g_date_set_dmy( &date0, 18, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 21, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "sixth date in sequence" );
-
-   g_date_set_dmy( &date0, 19, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 21, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "sixth date in sequence" );
-
-   g_date_set_dmy( &date0, 20, 4, 2001 );
-   xaccFreqSpecGetNextInstance( fs, &date0, &date1 );
-   g_date_set_dmy( &date2, 21, 4, 2001 );
-   do_test( g_date_compare( &date1, &date2 ) == 0, "sixth date in sequence" );
-   fprintf(stdout, " FreqSpec: Composite months test OK, cleaning up\n");
-   fflush(stdout);   
-   xaccFreqSpecFree(fs);
-}
-
-static void
-test_monthly_31st_bug_104844()
-{
-     gchar date_buf[128];
-     GDate start, next, expected;
-     FreqSpec *fs = xaccFreqSpecMalloc(book);
-
-     g_date_clear(&next, 1);
-
-     g_date_clear(&start, 1);
-     g_date_set_dmy(&start, 31, 1, 2003);
-     xaccFreqSpecSetMonthly(fs, &start, 1);
-
-     //g_date_add_days(&start, 1);
-     xaccFreqSpecGetNextInstance(fs, &start, &next);
-     g_date_clear(&expected, 1);
-     g_date_set_dmy(&expected, 28, 2, 2003);
-     g_date_strftime(date_buf, 128, "%c", &next);
-     do_test(g_date_compare(&expected, &next) == 0, date_buf);
-
-     start = next;
-     xaccFreqSpecGetNextInstance(fs, &start, &next);
-     g_date_set_dmy(&expected, 31, 3, 2003);
-     g_date_strftime(date_buf, 128, "%c", &next);
-     do_test(g_date_compare(&expected, &next) == 0, date_buf);
-
-     // test...
-     g_date_set_dmy(&start, 31, 1, 2003);
-     xaccFreqSpecSetMonthly(fs, &start, 1);
-     g_date_set_dmy(&start, 31, 1, 2007);
-     xaccFreqSpecGetNextInstance(fs, &start, &next);
-     g_date_set_dmy(&expected, 28, 2, 2007);
-     g_date_strftime(date_buf, 128, "%c", &next);
-     do_test(g_date_compare(&expected, &next) == 0, date_buf);
-
-     start = next;
-     xaccFreqSpecGetNextInstance(fs, &start, &next);
-     g_date_set_dmy(&expected, 31, 3, 2007);
-     g_date_strftime(date_buf, 128, "%c", &next);
-     do_test(g_date_compare(&expected, &next) == 0, date_buf);
-
-     xaccFreqSpecFree(fs);
-}
-
-int
-main (int argc, char **argv)
-{
-    QofSession *session;
-
-    qof_init();
-    g_return_val_if_fail(cashobjects_register(), -1);
-    session = qof_session_new ();
-    book = qof_session_get_book(session);
-
-    test_monthly_31st_bug_104844();
-
-    test_once();
-    test_caseA();
-    test_daily();
-    test_weekly();
-    test_monthly();
-    test_month_relative();
-    test_composite();
-
-    print_test_results();
-    qof_session_end(session);
-    qof_close();
-    return (get_rv() > 1);
-}

Modified: gnucash/branches/gda-dev/src/engine/test/test-recurrence.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/test/test-recurrence.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/test/test-recurrence.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -25,13 +25,10 @@
 #include <glib.h>
 
 #include "test-stuff.h"
-#include "FreqSpec.h"
 #include "Recurrence.h"
 #include "gnc-engine.h"
 
 static QofBook *book;
-static FreqSpec *fs;
-//#define FREQSPECTEST
 
 static void check_valid(GDate *next, GDate *ref, GDate *start,
                         guint16 mult, PeriodType pt)
@@ -47,16 +44,10 @@
 
     if (!valid) return;
 
-    // FreqSpec.h does claim to offer this.
     do_test(g_date_compare(ref, next) < 0,
             "next date not strictly later than ref date");
     startToNext = g_date_get_julian(next) - g_date_get_julian(start);
 
-    // FreqSpec *doesn't* offer beginning dates.
-#ifndef FREQSPECTEST
-    do_test(startToNext >= 0, "next date is before start date");
-#endif
-
     // Phase test
     switch (pt) {
     case PERIOD_YEAR:
@@ -65,9 +56,6 @@
         mult *= 12;
         // fall-through
     case PERIOD_END_OF_MONTH:
-#ifdef FREQSPECTEST
-        return;   // FreqSpec doesn't have this case
-#endif
         if (pt == PERIOD_END_OF_MONTH)
             do_test(g_date_is_last_of_month(next), "end of month phase wrong");
         // fall-through
@@ -131,36 +119,6 @@
 
 }
 
-#ifdef FREQSPECTEST
-static void convert_pt_to_fs(FreqSpec *fs, guint mult,
-                             PeriodType pt, GDate *start)
-{
-    switch (pt) {
-    case PERIOD_ONCE:
-        xaccFreqSpecSetOnceDate(fs, start);
-        break;
-    case PERIOD_DAY:
-        xaccFreqSpecSetDaily(fs, start, mult);
-        break;
-    case PERIOD_WEEK:
-        xaccFreqSpecSetWeekly(fs, start, mult);
-        break;
-    case PERIOD_MONTH:
-        xaccFreqSpecSetMonthly(fs, start, mult);
-        break;
-    case PERIOD_END_OF_MONTH:
-        // not handled
-    case PERIOD_NTH_WEEKDAY:
-        break;
-    case PERIOD_YEAR:
-        xaccFreqSpecSetMonthly(fs, start, 12*mult);
-        break;
-    default:
-        ;
-    }
-}
-#endif
-
 #define NUM_DATES_TO_TEST 300
 #define NUM_DATES_TO_TEST_REF 300
 #define NUM_MULT_TO_TEST 10
@@ -193,10 +151,6 @@
                     mult_reg = recurrenceGetMultiplier(&r);
 
                     recurrenceNextInstance(&r, &d_ref, &d_next);
-#ifdef FREQSPECTEST
-                    convert_pt_to_fs(fs, mult_reg, pt_reg, &d_start_reg);
-                    xaccFreqSpecGetNextInstance(fs, &d_ref, &d_next);
-#endif
                     check_valid(&d_next, &d_ref, &d_start_reg,
                                 mult_reg, pt_reg);
 
@@ -237,10 +191,6 @@
 
     recurrenceSet(&r, mult, pt, &start);
     recurrenceNextInstance(&r, &ref, &next);
-#ifdef FREQSPECTEST
-    convert_pt_to_fs(fs, mult, pt, &start);
-    xaccFreqSpecGetNextInstance(fs, &ref, &next);
-#endif
 
     check_valid(&next, &ref, &start, mult, pt);
     if (!test_equal(&next, &true_next)) {
@@ -344,13 +294,10 @@
     test_specific(PERIOD_MONTH, 1,     1,30,1,    2,27,1,   2,28,1);
     test_specific(PERIOD_MONTH, 1,     2,28,1,    3,30,1,   4,28,1);
 
-#ifdef FREQSPECTEST
-    test_specific(PERIOD_MONTH, 3,    12, 12, 1,  2, 1, 1,    3, 12, 1);
-#else
     test_specific(PERIOD_END_OF_MONTH, 1,   2,28,1,    3,30,1,   3,31,1);
     test_specific(PERIOD_END_OF_MONTH, 5,   4,30,1,    4,21,1,  4,30,1);
     test_specific(PERIOD_END_OF_MONTH, 5,   2,28,1,    5,21,1,  7,31,1);
-#endif
+
     test_specific(PERIOD_YEAR,          7,   6,8,199,    9,10,1338,  6,8,1340);
     test_specific(PERIOD_YEAR,          2,   9,8,838,    6,30,1094,  9,8,1094);
 
@@ -371,7 +318,6 @@
 {
 
     book = qof_book_new ();
-    fs = xaccFreqSpecMalloc(book);
 
     test_use();
 
@@ -379,7 +325,6 @@
 
     test_all();
 
-    xaccFreqSpecFree(fs);
     qof_book_destroy (book);
 }
 

Modified: gnucash/branches/gda-dev/src/engine/test-core/test-engine-stuff.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/test-core/test-engine-stuff.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/engine/test-core/test-engine-stuff.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -33,7 +33,6 @@
 #include "gnc-session.h"
 #include "Transaction.h"
 #include "TransactionP.h"
-#include "FreqSpec.h"
 #include "Recurrence.h"
 #include "SchedXaction.h"
 #include "SX-book.h"

Modified: gnucash/branches/gda-dev/src/gnome/dialog-sx-editor.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/dialog-sx-editor.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/dialog-sx-editor.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -41,7 +41,6 @@
 #include "qof.h"
 #include "gnc-book.h"
 #include "Account.h"
-#include "FreqSpec.h"
 #include "SchedXaction.h"
 #include "SX-book.h"
 #include "dialog-preferences.h"
@@ -948,19 +947,10 @@
 
     /* start date and freq spec */
     {
-        FreqSpec *fs;
         GDate gdate;
         GString *str;
         GList *schedule = NULL;
 
-        fs = xaccSchedXactionGetFreqSpec( sxed->sx );
-        gnc_frequency_save_state( sxed->gncfreq, fs, &gdate );
-
-        str = g_string_new( "" );
-        xaccFreqSpecGetFreqStr( fs, str );
-        g_debug("freq spec: %s", str->str);
-        g_string_free(str, TRUE);
-
         gnc_frequency_save_to_recurrence(sxed->gncfreq, &schedule, &gdate);
         gnc_sx_set_schedule(sxed->sx, schedule);
         {
@@ -1563,8 +1553,8 @@
         g_free(schedule_desc);
     }
 
-    gnc_dense_cal_set_month(sxed->example_cal, g_date_get_month(&first_date));
-    gnc_dense_cal_set_year(sxed->example_cal, g_date_get_year(&first_date));
+    //gnc_dense_cal_set_month(sxed->example_cal, g_date_get_month(&first_date));
+    //gnc_dense_cal_set_year(sxed->example_cal, g_date_get_year(&first_date));
 
     /* figure out the end restriction */
     if (gtk_toggle_button_get_active(sxed->optEndDate))

Modified: gnucash/branches/gda-dev/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/druid-acct-period.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/druid-acct-period.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -473,7 +473,7 @@
   }
 
   /* Load up the GUI for the next closing period. */
-  gnc_frequency_setup (info->period_menu, NULL, &info->closing_date);
+  gnc_frequency_setup_recurrence(info->period_menu, NULL, &info->closing_date);
 
   show_book_details (info);
   return TRUE;

Modified: gnucash/branches/gda-dev/src/gnome/druid-loan.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/druid-loan.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/druid-loan.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -927,8 +927,9 @@
 {
         g_assert( ldd != NULL );
         g_assert( gstr != NULL );
-        g_string_append_printf( gstr, "pmt( %.5f / 12.0 : %0.2f : %0.2f : 0 : 0 )",
+        g_string_append_printf( gstr, "pmt( %.5f / %0.2f : %0.2f : %0.2f : 0 : 0 )",
                                 (ldd->ld.interestRate / 100),
+                                12.0,
                                 ( ldd->ld.numPer
                                   * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
                                 gnc_numeric_to_double(ldd->ld.principal) );
@@ -940,8 +941,9 @@
 {
         g_assert( ldd != NULL );
         g_assert( gstr != NULL );
-        g_string_printf( gstr, "ppmt( %.5f / 12.0 : i : %0.2f : %0.2f : 0 : 0 )",
+        g_string_printf( gstr, "ppmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
                          (ldd->ld.interestRate / 100),
+                         12.0,
                          ( ldd->ld.numPer
                            * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
                          gnc_numeric_to_double(ldd->ld.principal));
@@ -953,8 +955,9 @@
 {
         g_assert( ldd != NULL );
         g_assert( gstr != NULL );
-        g_string_printf( gstr, "ipmt( %.5f / 12.0 : i : %0.2f : %0.2f : 0 : 0 )",
+        g_string_printf( gstr, "ipmt( %.5f / %0.2f : i : %0.2f : %0.2f : 0 : 0 )",
                          (ldd->ld.interestRate / 100),
+                         12.0,
                          ( ldd->ld.numPer
                            * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
                          gnc_numeric_to_double( ldd->ld.principal ) );
@@ -1544,11 +1547,11 @@
         }
         
         /* if ( rb toggled )
-         *   ensure freqspec/startdate setup
+         *   ensure schedule/startdate setup
          *   save
          * else
          *   if (freqspec setup)
-         *     remove freqspec/startdate
+         *     remove schedule/startdate
          */
 
         /* neither of these should happen. */

Modified: gnucash/branches/gda-dev/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/gnc-plugin-basic-commands.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/gnc-plugin-basic-commands.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -142,9 +142,11 @@
   { "ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment..."), NULL,
     N_("Setup scheduled transactions for repayment of a loan"),
     G_CALLBACK (gnc_main_window_cmd_actions_mortgage_loan) },
+#ifdef CLOSE_BOOKS_ACTUALLY_WORKS
   { "ActionsCloseBooksAction", NULL, N_("Close _Books"), NULL,
     N_("Archive old data using accounting periods"),
     G_CALLBACK (gnc_main_window_cmd_actions_close_books) },
+#endif // CLOSE_BOOKS_ACTUALLY_WORKS
 
   /* Tools menu */
 

Modified: gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-account-tree.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-account-tree.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -667,7 +667,7 @@
 		account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(view));
 		sensitive = (account != NULL);
 
-		subaccounts = (gnc_account_n_children(account) != 0);
+		subaccounts = account && (gnc_account_n_children(account) != 0);
 		/* Check here for placeholder accounts, etc. */
 	}
 

Modified: gnucash/branches/gda-dev/src/gnome/window-reconcile.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome/window-reconcile.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome/window-reconcile.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -655,6 +655,7 @@
   /* Create the dialog box */
   xml = gnc_glade_xml_new ("reconcile.glade", "Reconcile Start Dialog");
   dialog = glade_xml_get_widget (xml, "Reconcile Start Dialog");
+  glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func, &data);
   title = gnc_recn_make_window_name (account);
   gtk_window_set_title(GTK_WINDOW(dialog), title);
   g_free (title);
@@ -733,9 +734,6 @@
        gtk_widget_set_sensitive(GTK_WIDGET(interest), FALSE);
     }
 
-    glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func,
-				      &data);
-
     gtk_widget_show_all(dialog);
 
     gtk_widget_grab_focus(gnc_amount_edit_gtk_entry

Modified: gnucash/branches/gda-dev/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/dialog-account.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/dialog-account.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1291,7 +1291,7 @@
 
   parent_account = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT (aw->parent_tree));
 
-  if (!gnc_account_is_root(parent_account))
+  if (parent_account && !gnc_account_is_root(parent_account))
   {
     char *parent_name;
     const gchar *separator;

Modified: gnucash/branches/gda-dev/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/dialog-options.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/dialog-options.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -2879,10 +2879,9 @@
   SCM result;
 
   string = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-  DEBUG("filename %s", string);
+  DEBUG("filename %s", string ? string : "(null)");
   result = scm_makfrom0str(string ? string : "");
-  if (string)
-    g_free(string);
+  g_free(string);
   return result;
 }
 

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -159,7 +159,7 @@
         g_free(model->name);
     }
     model->name = g_strdup(name);
-    g_signal_emit_by_name(model, "update", GUINT_TO_POINTER(1));
+    //g_signal_emit_by_name(model, "update", GUINT_TO_POINTER(1));
 }
 
 void
@@ -170,39 +170,10 @@
         g_free(model->info);
     }
     model->info = g_strdup(info);
-    g_signal_emit_by_name(model, "update", GUINT_TO_POINTER(1));
+    //g_signal_emit_by_name(model, "update", GUINT_TO_POINTER(1));
 }
 
 static void
-gdcs_generic_update(GncDenseCalStore *trans, GDate *start, FreqSpec *fs)
-{
-    int i;
-    GDate date;
-
-    date = *start;
-    /* go one day before what's in the box so we can get the correct start
-     * date. */
-    g_date_subtract_days(&date, 1);
-    xaccFreqSpecGetNextInstance(fs, &date, &date);
-
-    i = 0;
-    while ((i < trans->num_marks)
-           && g_date_valid(&date)
-           /* Do checking against end restriction. */
-           && ((trans->end_type == NEVER_END)
-               || (trans->end_type == END_ON_DATE
-                   && g_date_compare(&date, &trans->end_date) <= 0)
-               || (trans->end_type == END_AFTER_N_OCCS
-                   && i < trans->n_occurrences)))
-    {
-        *trans->cal_marks[i++] = date;
-        xaccFreqSpecGetNextInstance(fs, &date, &date);
-    }
-    trans->num_real_marks = (i == 0 ? 0 : (i-1));
-    g_signal_emit_by_name(trans, "update", GUINT_TO_POINTER(1));
-}
-
-static void
 gdcs_generic_update_recurrences(GncDenseCalStore *trans, GDate *start, GList *recurrences)
 {
     int i;
@@ -233,29 +204,6 @@
 }
 
 void
-gnc_dense_cal_store_update_no_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs)
-{
-    model->end_type = NEVER_END;
-    gdcs_generic_update(model, start, fs);
-}
-
-void
-gnc_dense_cal_store_update_count_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs, int num_occur)
-{
-    model->end_type = END_AFTER_N_OCCS;
-    model->n_occurrences = num_occur;
-    gdcs_generic_update(model, start, fs);
-}
-
-void
-gnc_dense_cal_store_update_date_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs, GDate *end_date)
-{
-    model->end_type = END_ON_DATE;
-    model->end_date = *end_date;
-    gdcs_generic_update(model, start, fs);
-}
-
-void
 gnc_dense_cal_store_update_recurrences_no_end(GncDenseCalStore *model, GDate *start, GList *recurrences)
 {
     model->end_type = NEVER_END;

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.h
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal-store.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include <glib.h>
 #include <glib-object.h>
-#include <FreqSpec.h>
 #include "gnc-dense-cal-model.h"
 #include "gnc-dense-cal.h"
 
@@ -50,10 +49,6 @@
 void gnc_dense_cal_store_update_name(GncDenseCalStore *model, gchar* name);
 void gnc_dense_cal_store_update_info(GncDenseCalStore *model, gchar* info);
 
-void gnc_dense_cal_store_update_no_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs);
-void gnc_dense_cal_store_update_count_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs, int num_occur);
-void gnc_dense_cal_store_update_date_end(GncDenseCalStore *model, GDate *start, FreqSpec *fs, GDate *end_date);
-
 void gnc_dense_cal_store_update_recurrences_no_end(GncDenseCalStore *model, GDate *start, GList *recurrences);
 void gnc_dense_cal_store_update_recurrences_count_end(GncDenseCalStore *model, GDate *start, GList *recurrences, int num_occur);
 void gnc_dense_cal_store_update_recurrences_date_end(GncDenseCalStore *model, GDate *start, GList *recurrences, GDate *end_date);

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-dense-cal.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -112,6 +112,11 @@
 
 static inline int col_height(GncDenseCal *dcal);
 static inline int num_cols(GncDenseCal *dcal);
+
+static void _gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon, gboolean redraw);
+static void _gnc_dense_cal_set_year(GncDenseCal *dcal, guint year, gboolean redraw);
+
+
 /**
  * Returns the total number of weeks to display in the calendar [irrespective
  * of columns/weeks-per-col].
@@ -136,7 +141,7 @@
                        int *x1, int *y1, int *x2, int *y2);
 
 static void gdc_mark_add(GncDenseCal *dcal, guint tag, gchar *name, gchar *info, guint size, GDate **dateArray);
-static void gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove);
+static void gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove, gboolean redraw);
 
 static void gdc_add_tag_markings(GncDenseCal *cal, guint tag);
 static void gdc_add_markings(GncDenseCal *cal);
@@ -282,7 +287,6 @@
         
         gtk_box_pack_start(GTK_BOX(dcal), GTK_WIDGET(hbox), FALSE, FALSE, 0);
     }
-
     dcal->cal_drawing_area = GTK_DRAWING_AREA(gtk_drawing_area_new());
     gtk_widget_add_events(GTK_WIDGET(dcal->cal_drawing_area), (GDK_EXPOSURE_MASK
                                                                | GDK_BUTTON_PRESS_MASK
@@ -395,8 +399,8 @@
     {
         GDate *now = g_date_new();
         g_date_set_time_t(now, time(NULL));
-        gnc_dense_cal_set_month(dcal, g_date_get_month(now));
-        gnc_dense_cal_set_year(dcal, g_date_get_year(now));
+        _gnc_dense_cal_set_month(dcal, g_date_get_month(now), FALSE);
+        _gnc_dense_cal_set_year(dcal, g_date_get_year(now), FALSE);
         g_date_free(now);
     }
 
@@ -491,24 +495,53 @@
 void
 gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon)
 {
+    _gnc_dense_cal_set_month(dcal, mon, TRUE);
+}
+
+static void
+_gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon, gboolean redraw)
+{
+    GTimer *t = g_timer_new();
+    if (dcal->month == mon)
+        return;
     dcal->month = mon;
+    g_timer_start(t);
     recompute_first_of_month_offset(dcal);
+    g_debug("recompute_first_of_month_offset: %f", g_timer_elapsed(t, NULL) * 1000.);
+    g_timer_start(t);
     recompute_extents(dcal);
-    if (GTK_WIDGET_REALIZED(dcal))
+    g_debug("recompute_extents: %f", g_timer_elapsed(t, NULL) * 1000.);
+    if (redraw && GTK_WIDGET_REALIZED(dcal))
     {
+        g_timer_start(t);
         recompute_x_y_scales(dcal);
+        g_debug("recompute_x_y_scales: %f", g_timer_elapsed(t, NULL) * 1000.);
+        g_timer_start(t);
         gnc_dense_cal_draw_to_buffer(dcal);
+        g_debug("draw_to_buffer: %f", g_timer_elapsed(t, NULL) * 1000.);
+        g_timer_start(t);
         gtk_widget_queue_draw(GTK_WIDGET(dcal->cal_drawing_area));
+        g_debug("queue_draw: %f", g_timer_elapsed(t, NULL) * 1000.);
     }
+    g_timer_stop(t);
+    g_timer_destroy(t);
 }
 
 void
 gnc_dense_cal_set_year(GncDenseCal *dcal, guint year)
 {
+    return _gnc_dense_cal_set_year(dcal, year, TRUE);
+}
+
+static void
+_gnc_dense_cal_set_year(GncDenseCal *dcal, guint year, gboolean redraw)
+{
+    if (dcal->year == year)
+        return;
     dcal->year = year;
     recompute_first_of_month_offset(dcal);
     recompute_extents(dcal);
-    if (GTK_WIDGET_REALIZED(dcal))
+    if (redraw && GTK_WIDGET_REALIZED(dcal))
     {
         recompute_x_y_scales(dcal);
         gnc_dense_cal_draw_to_buffer(dcal);
@@ -833,6 +866,8 @@
     return TRUE;
 }
 
+#define LOG_AND_RESET(timer, msg) do { g_debug("%s: %f", msg, g_timer_elapsed(timer, NULL) * 1000.); g_timer_reset(timer); } while (0);
+
 static void
 gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
 {
@@ -840,13 +875,18 @@
     gint i;
     int maxWidth;
     PangoLayout *layout;
+    GTimer *timer;
 
+    timer = g_timer_new();
+    g_debug("drawing");
     widget = GTK_WIDGET(dcal);
 
     if (!dcal->drawbuf)
         return;
 
+    g_timer_start(timer);
     layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
+    LOG_AND_RESET(timer, "create_pango_layout");
 
     gdk_draw_rectangle(dcal->drawbuf,
                        widget->style->white_gc,
@@ -895,6 +935,7 @@
 
         g_object_unref(gc);
     }
+    LOG_AND_RESET(timer, "alternating month colors");
 
     /* Hilight the marked days. */
     {
@@ -944,6 +985,7 @@
         // reset to the previous foreground color.
         gdk_gc_set_foreground(widget->style->fg_gc[widget->state], &current_values.foreground);
     }
+    LOG_AND_RESET(timer, "marked days");
 
     for (i=0; i < num_cols(dcal); i++)
     {
@@ -1013,6 +1055,7 @@
             }
         }
     }
+    LOG_AND_RESET(timer, "lines and labels");
 
     /* Month labels. */
     {
@@ -1041,6 +1084,7 @@
         pango_matrix_rotate(&matrix, -90.);
         pango_context_set_matrix(gtk_widget_get_pango_context(GTK_WIDGET(dcal)), &matrix);
     }
+    LOG_AND_RESET(timer, "month labels");
 
     /* Try the per-day strings [dates] */
     {
@@ -1069,6 +1113,7 @@
                             layout);
         }
     }
+    LOG_AND_RESET(timer, "dates");
 
     gtk_widget_queue_draw_area(GTK_WIDGET(dcal), 
                                widget->allocation.x,
@@ -1076,7 +1121,11 @@
                                widget->allocation.width,
                                widget->allocation.height);
 
+    LOG_AND_RESET(timer, "queue draw");
+
     g_object_unref(layout);
+
+    g_timer_destroy(timer);
 }
 
 static void
@@ -1676,6 +1725,9 @@
         gnc_dense_cal_model_get_instance(cal->model, tag, idx, dates[idx]);
     }
 
+    _gnc_dense_cal_set_month(cal, g_date_get_month(dates[0]), FALSE);
+    _gnc_dense_cal_set_year(cal, g_date_get_year(dates[0]), FALSE);
+
     gdc_mark_add(cal, tag, name, info, num_marks, dates);
 
     for (idx = 0; idx < num_marks; idx++)
@@ -1709,7 +1761,7 @@
     for (; tags != NULL; tags = tags->next)
     {
         guint tag = GPOINTER_TO_UINT(tags->data);
-        gdc_mark_remove(cal, tag);
+        gdc_mark_remove(cal, tag, FALSE);
     }
     g_list_free(tags);
 }
@@ -1727,8 +1779,9 @@
 {
     GncDenseCal *cal = GNC_DENSE_CAL(user_data);
     g_debug("gdc_model_update_cb update for tag [%d]\n", update_tag);
-    gdc_mark_remove(cal, update_tag);
+    gdc_mark_remove(cal, update_tag, FALSE);
     gdc_add_tag_markings(cal, update_tag);
+    
 }
 
 static void
@@ -1736,7 +1789,7 @@
 {
     GncDenseCal *cal = GNC_DENSE_CAL(user_data);
     g_debug("gdc_model_removing_cb update [%d]\n", remove_tag);
-    gdc_mark_remove(cal, remove_tag);
+    gdc_mark_remove(cal, remove_tag, TRUE);
 }
 
 void
@@ -1812,7 +1865,7 @@
 }
 
 static void
-gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove)
+gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove, gboolean redraw)
 {
     GList *iter, *calendar_marks;
     gint day_of_cal;
@@ -1851,6 +1904,10 @@
     g_list_free(mark_data->ourMarks);
     dcal->markData = g_list_remove(dcal->markData, mark_data);
     g_free(mark_data);
-    gnc_dense_cal_draw_to_buffer(dcal);
-    gtk_widget_queue_draw(GTK_WIDGET(dcal->cal_drawing_area));
+
+    if (redraw)
+    {
+        gnc_dense_cal_draw_to_buffer(dcal);
+        gtk_widget_queue_draw(GTK_WIDGET(dcal->cal_drawing_area));
+    }
 }

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-file.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-file.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -191,7 +191,6 @@
   const char *fmt, *label;
   gint response;
 
-  gnc_destroy_splash_screen(); /* Just in case */
   if (NULL == newfile) { newfile = _("(null)"); }
 
   switch (io_error)
@@ -668,8 +667,6 @@
                  );
     int rc;
 
-    gnc_destroy_splash_screen(); /* Just in case */
-
     dialog = gtk_message_dialog_new(NULL,
 				    0,
 				    GTK_MESSAGE_WARNING,

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -31,11 +31,11 @@
 #include <math.h>
 #include <time.h>
 
-#include "FreqSpec.h"
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"
 #include "gnc-engine.h"
 #include "gnc-frequency.h"
+#include "FreqSpec.h"
 #include "gnc-ui-util.h"
 
 #undef G_LOG_DOMAIN
@@ -148,10 +148,10 @@
 void
 gnc_frequency_init(GncFrequency *gf)
 {
-    int    i;
-    GtkVBox  *vb;
-    GtkWidget   *o;
-    GtkAdjustment  *adj;
+    int i;
+    GtkVBox* vb;
+    GtkWidget* o;
+    GtkAdjustment* adj;
 
     static const struct comboBoxTuple {
         char *name;
@@ -230,438 +230,6 @@
 }
 
 static void
-do_frequency_setup(GncFrequency *gf, FreqSpec *fs, time_t *secs)
-{
-        UIFreqType uift;
-
-        /* Set the start date, but only if present. */
-        if (secs)
-        {
-                gnc_date_edit_set_time( gf->startDate, *secs);
-                if (NULL == fs) 
-                {
-                        g_signal_emit_by_name( gf, "changed" );
-                }
-        }
- 
-        /* If freq spec not present, then we are done; 
-         * don't change any other settings.  */
-        if (NULL == fs) return;
-
-        uift = xaccFreqSpecGetUIType(fs);
-        switch ( uift ) 
-        {
-        case UIFREQ_NONE:
-                break;
-        case UIFREQ_ONCE:
-        {
-                GDate theDate;
-                struct tm stm;
-                /* set the date */
-                if ( xaccFreqSpecGetOnce( fs, &theDate ) < 0 ) {
-                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d vs. FreqSpec: %d]",
-                               uift, xaccFreqSpecGetUIType( fs ));
-                     return;
-                }
-                g_date_to_struct_tm( &theDate, &stm );
-                gnc_date_edit_set_time( gf->startDate, mktime(&stm) );
-
-                gtk_notebook_set_current_page( gf->nb, PAGE_ONCE);
-                gtk_combo_box_set_active( gf->freqComboBox, PAGE_ONCE);
-        }
-        break;
-        case UIFREQ_DAILY:
-        { 
-                GtkWidget *o;
-                int dailyMult = -1;
-                if ( xaccFreqSpecGetDaily( fs, &dailyMult ) < 0 ) {
-                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d vs. FreqSpec: %d]",
-                               uift, xaccFreqSpecGetUIType( fs ) );
-                     return;
-                }
-                o = glade_xml_get_widget( gf->gxml, "daily_spin" );
-                gtk_spin_button_set_value( GTK_SPIN_BUTTON( o ), dailyMult );
-
-                gtk_notebook_set_current_page( gf->nb, PAGE_DAILY);
-                gtk_combo_box_set_active( gf->freqComboBox, PAGE_DAILY);
-        }
-        break;
-        case UIFREQ_DAILY_MF:
-        case UIFREQ_WEEKLY:
-        case UIFREQ_BI_WEEKLY:
-        {
-                const char * str;
-                int weeklyMult = -1;
-                int dayOfWeek;
-                GtkWidget *o;
-                FreqSpec *subFS;
-                GList *list;
-
-                for ( list = xaccFreqSpecCompositeGet( fs );
-                      list; list = g_list_next(list) ) {
-                        subFS = (FreqSpec*)(list->data);
-                        if ( weeklyMult == -1 ) {
-                                if ( subFS == NULL ) {
-                                     g_critical("subFS is null");
-                                     return;
-                                }
-                                if ( xaccFreqSpecGetWeekly( subFS,
-                                                            &weeklyMult,
-                                                            &dayOfWeek ) < 0 ) {
-                                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
-                                               uift, xaccFreqSpecGetUIType( fs ) );
-                                     return;
-                                }
-                        } else {
-                                int otherWeeklyMult = -1;
-
-                                if ( subFS == NULL ) {
-                                     g_critical("subFS is null");
-                                     return;
-                                }
-                                if ( xaccFreqSpecGetWeekly( subFS,
-                                                            &otherWeeklyMult,
-                                                            &dayOfWeek ) < 0 ) {
-                                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
-                                               uift, xaccFreqSpecGetUIType( fs ) );
-                                     return;
-                                }
-                                if ( weeklyMult != otherWeeklyMult ) {
-                                     g_warning("Inconsistent weekly FreqSpec multipliers seen [first: %d vs. other: %d]",
-                                               weeklyMult, otherWeeklyMult );
-                                     return;
-                                }
-                        }
-                        if ( dayOfWeek > 6 ) {
-                             g_warning( "dayOfWeek > 6 [%d]", dayOfWeek );
-                             return;
-                        }
-                        str = CHECKBOX_NAMES[dayOfWeek];
-                        o = glade_xml_get_widget( gf->gxml, str );
-                        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(o), TRUE );
-                }
-                o = glade_xml_get_widget( gf->gxml, "weekly_spin" );
-                if (uift == UIFREQ_BI_WEEKLY)
-                    weeklyMult = 2;
-                gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), weeklyMult );
-
-                gtk_notebook_set_current_page( gf->nb, PAGE_WEEKLY);
-                gtk_combo_box_set_active( gf->freqComboBox, PAGE_WEEKLY);
-        }
-        break;
-        case UIFREQ_SEMI_MONTHLY:
-        {
-                GtkWidget *o;
-                GList *list;
-                int monthlyMult;
-                FreqSpec *subFS;
-                int firstDayOfMonth, secondDayOfMonth, monthOffset;
-
-                list = xaccFreqSpecCompositeGet( fs );
-                /*  mult */
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_spin" );
-                subFS = (FreqSpec*)(g_list_nth( list, 0 )->data);
-                if ( xaccFreqSpecGetMonthly( subFS, &monthlyMult,
-                                             &firstDayOfMonth, &monthOffset ) < 0 ) {
-                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
-                               uift, xaccFreqSpecGetUIType( fs ) );
-                     return;
-                }
-                gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), monthlyMult );
-                /*  first date */
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_first" );
-                gtk_combo_box_set_active( GTK_COMBO_BOX(o), firstDayOfMonth-1 );
-                /*  second date */
-                subFS = (FreqSpec*)(g_list_nth( list, 1 )->data);
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
-                if ( xaccFreqSpecGetMonthly( subFS, &monthlyMult,
-                                             &secondDayOfMonth, &monthOffset ) < 0 ) {
-                     g_warning( "Inappropriate FreqSpec type" );
-                     return;
-                }
-                gtk_combo_box_set_active( GTK_COMBO_BOX(o), secondDayOfMonth-1 );
-
-                gtk_notebook_set_current_page( gf->nb, PAGE_SEMI_MONTHLY);
-                gtk_combo_box_set_active( gf->freqComboBox, PAGE_SEMI_MONTHLY);
-        }
-        break;
-        case UIFREQ_MONTHLY:
-        case UIFREQ_QUARTERLY:
-        case UIFREQ_TRI_ANUALLY:
-        case UIFREQ_SEMI_YEARLY:
-        case UIFREQ_YEARLY:
-        {
-                GtkWidget *o;
-                int monthlyMult, dayOfMonth, monthOffset;
-
-                if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
-                                             &dayOfMonth, &monthOffset ) < 0 ) {
-                     g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
-                               uift, xaccFreqSpecGetUIType( fs ) );
-                     return;
-                }
-                o = glade_xml_get_widget( gf->gxml, "monthly_spin" );
-                gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), monthlyMult );
-                o = glade_xml_get_widget( gf->gxml, "monthly_day" );
-                gtk_combo_box_set_active( GTK_COMBO_BOX(o), dayOfMonth-1 );
-                /*  set the day-of-month */
-
-                gtk_notebook_set_current_page( gf->nb, PAGE_MONTHLY);
-                gtk_combo_box_set_active( gf->freqComboBox, PAGE_MONTHLY);
-        }
-        break;
-        default:
-             g_critical( "unknown ui freq type %d", uift);
-             break;
-        }
-
-        g_signal_emit_by_name( gf, "changed" );
-}
-
-static void
-gnc_frequency_setup_default( GncFrequency *gf, FreqSpec *fs, GDate *date )
-{
-    time_t secs;
-
-    /* If no freq-spec, then set the widget to blank */
-    if (NULL == fs)
-    {
-        UIFreqType uift = UIFREQ_NONE;
-        int i, page;
-
-        page = -1;
-        for ( i=0; i < UIFREQ_NUM_UI_FREQSPECS+1; i++ ) 
-        {
-            if ( PAGES[i].uiFTVal == uift ) 
-            {
-                page = PAGES[i].idx;
-                break;
-            }
-        }
-        g_assert( page != -1 );
-   
-        gtk_notebook_set_current_page( gf->nb, page );
-        gtk_combo_box_set_active( gf->freqComboBox, page );
-    }
-
-    /* Setup the start date */
-    if (!date ||  ! g_date_valid(date) ) 
-    {
-        secs = time(NULL);
-    } 
-    else 
-    {
-        struct tm stm;
-        g_date_to_struct_tm( date, &stm);
-        secs = mktime (&stm);
-    }
- 
-    do_frequency_setup(gf, fs, &secs);
-}
-
-void
-gnc_frequency_setup( GncFrequency *gf, FreqSpec *fs, GDate *date )
-{
-    time_t secs;
-
-    if (!gf) return;
-
-    /* Setup the start date */
-    if (!date || !g_date_valid(date)) 
-    {
-        do_frequency_setup(gf, fs, NULL);
-    } 
-    else 
-    {
-        struct tm stm;
-        g_date_to_struct_tm( date, &stm);
-        secs = mktime (&stm);
-        do_frequency_setup(gf, fs, &secs);
-    }
-}
-
-GtkWidget *
-gnc_frequency_new( FreqSpec *fs, GDate *date )
-{
-        GncFrequency  *toRet;
-        toRet = g_object_new( gnc_frequency_get_type(), NULL );
-        gnc_frequency_setup_default( toRet, fs, date );
-        return GTK_WIDGET(toRet);
-}
-
-void
-gnc_frequency_save_state( GncFrequency *gf, FreqSpec *fs, GDate *outDate )
-{
-        gint page;
-        gint day;
-        GtkWidget *o;
-        UIFreqType uift;
-        FreqSpec *tmpFS;
-        gint tmpInt;
-        int i;
-        GDate gd;
-        time_t start_tt;
-
-        start_tt = gnc_date_edit_get_date( gf->startDate );
-        if ( NULL != outDate ) 
-        {
-                g_date_set_time_t( outDate, start_tt );
-        }
-
-        if (NULL == fs) return;
-
-        /* Get the current tab */
-        page = gtk_notebook_get_current_page( gf->nb );
-
-        /* We're going to be creating/destroying FreqSpecs, 
-         * which will cause GUI refreshes. :( */
-        gnc_suspend_gui_refresh();
-
-        g_date_clear (&gd, 1);
-        g_date_set_time_t( &gd, start_tt );
-
-        /*uift = xaccFreqSpecGetUIType( fs );*/
-        uift = PAGES[page].uiFTVal;
-
-        /* Based on value, parse widget values into FreqSpec */
-        switch ( uift ) {
-        case UIFREQ_NONE:
-                xaccFreqSpecSetNone(fs);
-                xaccFreqSpecSetUIType(fs, UIFREQ_NONE);
-                break;
-        case UIFREQ_ONCE:
-                xaccFreqSpecSetOnceDate(fs, &gd);
-                xaccFreqSpecSetUIType( fs, uift );
-                break;
-        case UIFREQ_DAILY:
-                o = glade_xml_get_widget( gf->gxml, "daily_spin" );
-                /* FIXME: initial date should be set correctly. */
-                {
-                        gint foo;
-
-                        foo = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(o) );
-                        xaccFreqSpecSetDaily( fs, &gd, foo );
-                        xaccFreqSpecSetUIType( fs, uift );
-                }
-                break;
-        case UIFREQ_WEEKLY:
-        {
-                struct tm stm;
-                GDate gd2;
-                xaccFreqSpecSetComposite( fs );
-                xaccFreqSpecSetUIType( fs, uift );
-                o = glade_xml_get_widget( gf->gxml, "weekly_spin" );
-                tmpInt = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(o) );
-
-                /*  assume we have a good calendar that allows week selection. */
-                /*  for-now hack: normalize to Sunday. */
-                g_date_to_struct_tm( &gd, &stm);
-                stm.tm_mday -= stm.tm_wday % 7;
-                g_date_set_time_t( &gd, mktime(&stm) );
-
-                /*  now, go through the check boxes and add composites based on that date. */
-                for ( i=0; CHECKBOX_NAMES[i]!=NULL; i++ ) {
-                        o = glade_xml_get_widget( gf->gxml, CHECKBOX_NAMES[i] );
-                        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(o) ) ) {
-
-                                tmpFS = xaccFreqSpecMalloc
-                                        (gnc_get_current_book ());
-                                xaccFreqSpecSetUIType( tmpFS, uift );
-
-                                g_date_clear (&gd2, 1);
-                                gd2 = gd;
-                                /*  Add 'i' days off of Sunday... */
-                                g_date_add_days( &gd2, i );
-                                xaccFreqSpecSetWeekly( tmpFS, &gd2, tmpInt );
-                                xaccFreqSpecCompositeAdd( fs, tmpFS );
-                        }
-                }
-                break;
-        }
-        case UIFREQ_SEMI_MONTHLY:
-        {
-                struct tm stm;
-                /* FIXME: this is b0rken date calculation for mday>28 */
-                xaccFreqSpecSetComposite( fs );
-                xaccFreqSpecSetUIType( fs, uift );
-    
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_spin" );
-                tmpInt = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(o) );
-
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_first" );
-                day = gtk_combo_box_get_active( GTK_COMBO_BOX(o) )+1;
-                if (day > 30)
-                {
-                    g_critical("freq spec doesn't support last-day-of-month");
-                    day = 30;
-                }
-                tmpFS = xaccFreqSpecMalloc(gnc_get_current_book ());
-                g_date_to_struct_tm( &gd, &stm);
-                if ( day >= stm.tm_mday ) {
-                        /* next month */
-                        stm.tm_mon += 1;
-                }
-                /* else, this month */
-                stm.tm_mday = day;
-                g_date_set_time_t( &gd, mktime( &stm) );
-                xaccFreqSpecSetMonthly( tmpFS, &gd, tmpInt );
-                xaccFreqSpecCompositeAdd( fs, tmpFS );
-
-                o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
-                day = gtk_combo_box_get_active( GTK_COMBO_BOX(o) )+1;
-                if (day > 30)
-                {
-                    g_critical("freq spec doesn't support last-day-of-month");
-                    day = 30;
-                }
-                tmpFS = xaccFreqSpecMalloc(gnc_get_current_book ());
-                start_tt = gnc_date_edit_get_date( gf->startDate );
-                g_date_set_time_t( &gd, start_tt );
-                g_date_to_struct_tm( &gd, &stm);
-                if ( day >= stm.tm_mday ) {
-                        /* next month */
-                        stm.tm_mon += 1;
-                }
-                /* else, this month */
-                stm.tm_mday = day;
-                g_date_set_time_t( &gd, mktime( &stm ) );
-                xaccFreqSpecSetMonthly( tmpFS, &gd, tmpInt );
-                xaccFreqSpecCompositeAdd( fs, tmpFS );
-
-                break;
-        }
-        case UIFREQ_MONTHLY:
-        {
-                o = glade_xml_get_widget( gf->gxml, "monthly_spin" );
-                tmpInt = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o));
-
-                o = glade_xml_get_widget( gf->gxml, "monthly_day" );
-                day = gtk_combo_box_get_active( GTK_COMBO_BOX(o) ) + 1;
-                if (day > 30)
-                {
-                    g_critical("freq spec doesn't support last-day-of-month");
-                    day = 30;
-                }
-                g_date_set_time_t(&gd, time(NULL));
-                g_date_set_month(&gd, 1);
-                g_date_set_day(&gd, day);
-                {
-                     gchar buf[128];
-                     g_date_strftime(buf, 127, "%c", &gd);
-                     g_debug("monthly date [%s]\n", buf);
-                }
-                xaccFreqSpecSetMonthly( fs, &gd, tmpInt );
-                xaccFreqSpecSetUIType( fs, uift );
-                break;
-        }
-        default:
-             g_critical("Unknown UIFreqType %d", uift);
-             break;
-        }
-        gnc_resume_gui_refresh();
-}
-
-static void
 spin_changed_helper( GtkAdjustment *adj, gpointer d )
 {
         g_signal_emit_by_name(GNC_FREQUENCY(d), "changed");
@@ -734,10 +302,15 @@
     gtk_label_set_text (lbl, txt);
 }
 
-
 GtkWidget*
 gnc_frequency_new_from_recurrence(GList *recurrences, GDate *start_date)
 {
+    return gnc_frequency_new(recurrences, start_date);
+}
+
+GtkWidget*
+gnc_frequency_new(GList *recurrences, GDate *start_date)
+{
     GncFrequency *toRet;
     toRet = g_object_new(gnc_frequency_get_type(), NULL);
     gnc_frequency_setup_recurrence(toRet, recurrences, start_date);
@@ -788,6 +361,12 @@
 void
 gnc_frequency_setup_recurrence(GncFrequency *gf, GList *recurrences, GDate *start_date)
 {
+    gnc_frequency_setup(gf, recurrences, start_date);
+}
+
+void
+gnc_frequency_setup(GncFrequency *gf, GList *recurrences, GDate *start_date)
+{
      gboolean made_changes = FALSE;
 
      // setup start-date, if present

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.h
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.h	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-frequency.h	2007-09-09 16:25:08 UTC (rev 16513)
@@ -26,8 +26,8 @@
 #define GNC_FREQUENCY_H
 
 #include "gnc-date-edit.h"
-#include "Recurrence.h"
 #include "FreqSpec.h"
+#include "Recurrence.h"
 
 #define GNC_TYPE_FREQUENCY	  (gnc_frequency_get_type())
 #define GNC_FREQUENCY(obj)	  G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_FREQUENCY, GncFrequency)
@@ -67,11 +67,9 @@
 GType gnc_frequency_get_type(void);
 
 /**
- * Create a new GncFrequencey widget, reflecting the given FreqSpec \a fs and
- * starting on \a start_date.  Either or both may be NULL for reasonable
- * defaults.
+ * Either or both param may be NULL for reasonable defaults.
  **/
-GtkWidget* gnc_frequency_new(FreqSpec *fs, GDate *start_date);
+GtkWidget* gnc_frequency_new(GList *recurrences, GDate *start_date);
 GtkWidget* gnc_frequency_new_from_recurrence(GList *recurrences, GDate *start_date);
 
 void gnc_frequency_init(GncFrequency *gf);
@@ -81,7 +79,7 @@
  * If the FreqSpec is NULL, then no change is made to the widget menus.
  * If the date is NULL, then no change is made to the widget date field.
  **/
-void gnc_frequency_setup(GncFrequency *gf, FreqSpec *fs, GDate *date);
+void gnc_frequency_setup(GncFrequency *gf, GList *recurrences, GDate *start_date);
 void gnc_frequency_setup_recurrence(GncFrequency *gf, GList *recurrences, GDate *start_date);
 
 /**
@@ -89,7 +87,6 @@
  * Updates the given FreqSpec if it's not NULL.
  * Places the date in outDate, if it's not NULL.
  **/
-void gnc_frequency_save_state(GncFrequency *gf, FreqSpec *fs, GDate *outDate);
 void gnc_frequency_save_to_recurrence(GncFrequency *gf, GList **recurrences, GDate *out_start_date);
 
 /**

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-html.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-html.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -169,7 +169,7 @@
 gnc_html_parse_url(gnc_html * html, const gchar * url, 
                    char ** url_location, char ** url_label)
 {
-  char        uri_rexp[] = "^(([^:]*):)?([^#]+)?(#(.*))?$";
+  char        uri_rexp[] = "^(([^:][^:]+):)?([^#]+)?(#(.*))?$";
   regex_t     compiled;
   regmatch_t  match[6];
   char        * protocol=NULL, * path=NULL, * label=NULL;
@@ -232,11 +232,12 @@
  
   if (!safe_strcmp (retval, URL_TYPE_FILE)) {
     if(!found_protocol && path && html && html->base_location) {
-      if(path[0] == '/') {
+      if (g_path_is_absolute(path)) {
         *url_location = g_strdup(path);
       }
       else {
-        *url_location = g_strconcat(html->base_location, "/", path, NULL);
+        *url_location =
+          g_build_filename(html->base_location, path, (gchar*)NULL);
       }
       g_free(path);
     }
@@ -253,13 +254,14 @@
     /* case URL_TYPE_OTHER: */
 
     if(!found_protocol && path && html && html->base_location) {
-      if(path[0] == '/') {
-        *url_location = 
-          g_strconcat(extract_machine_name(html->base_location),
-                      "/", path+1, NULL);
+      if (g_path_is_absolute(path)) {
+        *url_location =
+          g_build_filename(extract_machine_name(html->base_location),
+                           path, (gchar*)NULL);
       }
       else {
-        *url_location = g_strconcat(html->base_location, path, NULL);
+        *url_location =
+          g_build_filename(html->base_location, path, (gchar*)NULL);
       }
       g_free(path);
     }

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-splash.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-splash.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-splash.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -108,6 +108,11 @@
   separator = gtk_hseparator_new();
 
   progress = gtk_label_new(NULL);
+  /* the set_max_width avoids "bumping" of the splash screen
+     if a long string is given in gnc_update_splash_screen();
+     presumably it would be better to inhibit size change of the
+     top level container, but I don't know how to do this */
+  gtk_label_set_max_width_chars(GTK_LABEL(progress), 50);
   markup = g_markup_printf_escaped(MARKUP_STRING, _("Loading..."));
   gtk_label_set_markup(GTK_LABEL(progress), markup);
   g_free(markup);
@@ -150,12 +155,15 @@
 
   if (progress)
   {
-    markup = g_markup_printf_escaped(MARKUP_STRING, string);
-    gtk_label_set_markup (GTK_LABEL(progress), markup);
-    g_free (markup);
+    if(string && strcmp(string, ""))
+    {
+      markup = g_markup_printf_escaped(MARKUP_STRING, string);
+      gtk_label_set_markup (GTK_LABEL(progress), markup);
+      g_free (markup);
 
-    /* make sure new text is up */
-    while (gtk_events_pending ())
-      gtk_main_iteration ();
+      /* make sure new text is up */
+      while (gtk_events_pending ())
+       gtk_main_iteration ();
+    }
   }
 }

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-tree-view.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-tree-view.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -936,17 +936,22 @@
   GtkSortType order;
   gint model_column, current;
 
+  s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
   priv = GNC_TREE_VIEW_GET_PRIVATE(view);
   column = gnc_tree_view_find_column_by_name(view, name);
-  if (!column)
+
+  if (!column) {
+    gtk_tree_sortable_set_sort_column_id(
+      GTK_TREE_SORTABLE(s_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+      GTK_SORT_ASCENDING);
     return;
+  }
 
   model_column =
     GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), MODEL_COLUMN));
   if (model_column == GNC_TREE_VIEW_COLUMN_DATA_NONE)
     return;
 
-  s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
   if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
 					    &current, &order))
     order = GTK_SORT_ASCENDING;

Modified: gnucash/branches/gda-dev/src/gnome-utils/gnc-window.c
===================================================================
--- gnucash/branches/gda-dev/src/gnome-utils/gnc-window.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/gnome-utils/gnc-window.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -29,6 +29,7 @@
 #include "gnc-engine.h"
 #include "gnc-plugin-page.h"
 #include "gnc-window.h"
+#include "gnc-splash.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;
 
@@ -174,6 +175,8 @@
     return;
   }
 
+  gnc_update_splash_screen(message);
+
   if (percentage < 0) {
     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar), " ");
     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), 0.0);

Modified: gnucash/branches/gda-dev/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/gda-dev/src/import-export/hbci/druid-hbci-initial.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/import-export/hbci/druid-hbci-initial.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -28,6 +28,9 @@
 #include <glib/gstdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_WAIT_H
+#    include <sys/wait.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
 

Modified: gnucash/branches/gda-dev/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/branches/gda-dev/src/import-export/import-account-matcher.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/import-export/import-account-matcher.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -21,7 +21,7 @@
 /**@internal
 	@file import-account-matcher.c
  * \brief A very generic and flexible account matcher/picker
- \author Copyright (C) 2002 Benoit Grégoire <bock at step.polymtl.ca>
+ \author Copyright (C) 2002 Benoit Grégoire <bock at step.polymtl.ca>
  */
 #include "config.h"
 

Modified: gnucash/branches/gda-dev/src/import-export/import-backend.c
===================================================================
--- gnucash/branches/gda-dev/src/import-export/import-backend.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/import-export/import-backend.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -21,7 +21,7 @@
 /** @internal
     @file import-backend.c
     @brief import-backend.c: Generic importer backend implementation (duplicate matching algorithm, action handling,  etc.)
-    @author Copyright (C) 2002 Benoit Grégoire
+    @author Copyright (C) 2002 Benoit Grégoire
     @author Christian Stimming
     @author Copyright (c) 2006 David Hampton <hampton at employees.org>
 */

Modified: gnucash/branches/gda-dev/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/branches/gda-dev/src/import-export/ofx/gnc-ofx-import.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/import-export/ofx/gnc-ofx-import.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -21,7 +21,7 @@
 /** @internal
      @file gnc-ofx-import.c
      @brief Ofx import module code
-     @author Copyright (c) 2002 Benoit Grégoire <bock at step.polymtl.ca>
+     @author Copyright (c) 2002 Benoit Grégoire <bock at step.polymtl.ca>
  */
 #include "config.h"
 

Modified: gnucash/branches/gda-dev/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/branches/gda-dev/src/import-export/qif-import/druid-qif-import.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/import-export/qif-import/druid-qif-import.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1748,7 +1748,7 @@
   info_label = gtk_label_new("");
   gtk_box_pack_start(GTK_BOX(temp), info_label, TRUE, TRUE, 0);
 
-  next_label = gtk_label_new(_("Click \"Next\" to accept the information "
+  next_label = gtk_label_new(_("Click \"Forward\" to accept the information "
                                "and move on."));
   gtk_label_set_justify (GTK_LABEL(next_label), GTK_JUSTIFY_LEFT);
   gtk_box_pack_end(GTK_BOX(top_vbox), next_label, TRUE, TRUE, 0);

Modified: gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.c	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.c	2007-09-09 16:25:08 UTC (rev 16513)
@@ -1288,8 +1288,6 @@
                         return TRUE;
                 case 3:
                         do_popup = (sheet->popup != NULL);
-			if (!do_popup)
-				return FALSE;
                         break;
                 default:
                         return FALSE;
@@ -1340,7 +1338,7 @@
                         gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL,
 				       sheet->popup_data, event->button, event->time);
 
-                return TRUE;
+                return button_1 || do_popup;
         }
 
         /* and finally...process this as a POINTER_TRAVERSE */
@@ -1368,7 +1366,7 @@
         if (do_popup)
 		gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL,
 			       sheet->popup_data, event->button, event->time);
-        return TRUE;
+        return button_1 || do_popup;
 }
 
 gboolean

Modified: gnucash/branches/gda-dev/src/scm/doc.scm
===================================================================
--- gnucash/branches/gda-dev/src/scm/doc.scm	2007-09-09 12:52:51 UTC (rev 16512)
+++ gnucash/branches/gda-dev/src/scm/doc.scm	2007-09-09 16:25:08 UTC (rev 16513)
@@ -66,33 +66,3 @@
 
 (define (gnc:find-doc-file file)
   (gnc:find-localized-file file (gnc:config-var-value-get gnc:*doc-path*)))
-
-(define (remove-i18n-macros input)
-  (cond ((null? input) input)
-        ((list? input)
-         (cond ((eq? (car input) 'N_) (cadr input))
-               (else (cons (remove-i18n-macros (car input))
-                           (remove-i18n-macros (cdr input))))))
-        (else input)))
-
-(define (fill-out-topics input)
-  (define (first-non-blank-url input)
-    (cond ((null? input) "")
-          ((list? input)
-           (cond ((and (string? (car input)) (not (eq? "" (cadr input))))
-                  (cadr input))
-                 (else (let ((first (first-non-blank-url (car input))))
-                         (if (not (eq? "" first))
-                             first
-                             (first-non-blank-url (cdr input)))))))
-          (else "")))
-
-  (cond ((null? input) input)
-        ((list? input)
-         (cond ((and (string? (car input)) (eq? "" (cadr input)))
-                (cons (car input)
-                      (cons (first-non-blank-url (caddr input))
-                            (fill-out-topics (cddr input)))))
-               (else (cons (fill-out-topics (car input))
-                           (fill-out-topics (cdr input))))))
-        (else input)))



More information about the gnucash-changes mailing list